mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
* ext/win32ole/win32ole.c (date2time_str): fix the overflow in
some situation. [ruby-bugs-20793] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@17641 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
214bb567f2
commit
e47ebfe518
2 changed files with 7 additions and 4 deletions
|
@ -1,3 +1,8 @@
|
||||||
|
Sun Jun 29 07:53:08 2008 Masaki Suketa <masaki.suketa@nifty.ne.jp>
|
||||||
|
|
||||||
|
* ext/win32ole/win32ole.c (date2time_str): fix the overflow in
|
||||||
|
some situation. [ruby-bugs-20793]
|
||||||
|
|
||||||
Sat Jun 28 21:25:08 2008 Tanaka Akira <akr@fsij.org>
|
Sat Jun 28 21:25:08 2008 Tanaka Akira <akr@fsij.org>
|
||||||
|
|
||||||
* include/ruby/ruby.h (struct RRegexp): new field usecnt. replace
|
* include/ruby/ruby.h (struct RRegexp): new field usecnt. replace
|
||||||
|
|
|
@ -116,7 +116,7 @@
|
||||||
|
|
||||||
#define WC2VSTR(x) ole_wc2vstr((x), TRUE)
|
#define WC2VSTR(x) ole_wc2vstr((x), TRUE)
|
||||||
|
|
||||||
#define WIN32OLE_VERSION "1.1.6"
|
#define WIN32OLE_VERSION "1.1.7"
|
||||||
|
|
||||||
typedef HRESULT (STDAPICALLTYPE FNCOCREATEINSTANCEEX)
|
typedef HRESULT (STDAPICALLTYPE FNCOCREATEINSTANCEEX)
|
||||||
(REFCLSID, IUnknown*, DWORD, COSERVERINFO*, DWORD, MULTI_QI*);
|
(REFCLSID, IUnknown*, DWORD, COSERVERINFO*, DWORD, MULTI_QI*);
|
||||||
|
@ -768,12 +768,10 @@ static VALUE
|
||||||
date2time_str(double date)
|
date2time_str(double date)
|
||||||
{
|
{
|
||||||
int y, m, d, hh, mm, ss;
|
int y, m, d, hh, mm, ss;
|
||||||
char szTime[20];
|
|
||||||
double2time(date, &y, &m, &d, &hh, &mm, &ss);
|
double2time(date, &y, &m, &d, &hh, &mm, &ss);
|
||||||
sprintf(szTime,
|
return rb_sprintf(
|
||||||
"%04d/%02d/%02d %02d:%02d:%02d",
|
"%04d/%02d/%02d %02d:%02d:%02d",
|
||||||
y, m, d, hh, mm, ss);
|
y, m, d, hh, mm, ss);
|
||||||
return rb_str_new2(szTime);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
#define ENC_MACHING_CP(enc,encname,cp) if(strcasecmp(rb_enc_name((enc)),(encname)) == 0) return cp
|
#define ENC_MACHING_CP(enc,encname,cp) if(strcasecmp(rb_enc_name((enc)),(encname)) == 0) return cp
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue