1999-12-06
1999-12-06 16:02:42 by Henrik Grubbström (Grubba) <grubba@grubba.org>
-
c69e41aa77e53d7442211bf7e07124665581f6d7
(16 lines)
(+9/-7)
[
Show
| Annotate
]
Branch: 7.9
Some fixes for mktime().
Rev: src/builtin_functions.c:1.216
5:
\*/
/**/
#include "global.h"
- RCSID("$Id: builtin_functions.c,v 1.215 1999/12/05 22:28:55 grubba Exp $");
+ RCSID("$Id: builtin_functions.c,v 1.216 1999/12/06 16:02:42 grubba Exp $");
#include "interpret.h"
#include "svalue.h"
#include "pike_macros.h"
2462: Inside #if defined(HAVE_MKTIME)
date.tm_mday=mday;
date.tm_mon=mon;
date.tm_year=year;
- if(sp[6-args].subtype == NUMBER_NUMBER)
+
+ if ((args > 6) && (sp[6-args].subtype == NUMBER_NUMBER))
{
date.tm_isdst = sp[6-args].u.integer;
- }else{
+ } else {
date.tm_isdst = -1;
}
#if STRUCT_TM_HAS_GMTOFF
- if(sp[7-args].subtype == NUMBER_NUMBER)
+ if((args > 7) && (sp[7-args].subtype == NUMBER_NUMBER))
{
date.tm_gmtoff=sp[7-args].u.intger;
}else{
2480: Inside #if defined(HAVE_MKTIME)
retval=mktime(&date);
#else
#ifdef HAVE_EXTERNAL_TIMEZONE
- if(sp[7-args].subtype == NUMBER_NUMBER)
+ if((args > 7) && (sp[7-args].subtype == NUMBER_NUMBER))
{
retval=mktime(&date) + sp[7-args].u.integer - timezone;
}else{