Browse Source

Make sure these are initialized to NULL

PHP-4.0.5
Rasmus Lerdorf 26 years ago
parent
commit
16ca32d057
  1. 6
      ext/sybase/php_sybase_db.c

6
ext/sybase/php_sybase_db.c

@ -257,14 +257,13 @@ PHP_RSHUTDOWN_FUNCTION(sybase)
static void php_sybase_do_connect(INTERNAL_FUNCTION_PARAMETERS,int persistent)
{
char *user,*passwd,*host,*charset;
char *user=NULL,*passwd=NULL,*host=NULL,*charset=NULL;
char *hashed_details;
int hashed_details_length;
sybase_link sybase,*sybase_ptr;
switch(ZEND_NUM_ARGS()) {
case 0: /* defaults */
host=user=passwd=NULL;
hashed_details_length=6+3;
hashed_details = (char *) emalloc(hashed_details_length+1);
strcpy(hashed_details,"sybase___");
@ -277,7 +276,6 @@ static void php_sybase_do_connect(INTERNAL_FUNCTION_PARAMETERS,int persistent)
}
convert_to_string(yyhost);
host = yyhost->value.str.val;
user=passwd=charset=NULL;
hashed_details_length = yyhost->value.str.len+6+3;
hashed_details = (char *) emalloc(hashed_details_length+1);
sprintf(hashed_details,"sybase_%s__",yyhost->value.str.val);
@ -293,7 +291,6 @@ static void php_sybase_do_connect(INTERNAL_FUNCTION_PARAMETERS,int persistent)
convert_to_string(yyuser);
host = yyhost->value.str.val;
user = yyuser->value.str.val;
passwd=charset=NULL;
hashed_details_length = yyhost->value.str.len+yyuser->value.str.len+6+3;
hashed_details = (char *) emalloc(hashed_details_length+1);
sprintf(hashed_details,"sybase_%s_%s_",yyhost->value.str.val,yyuser->value.str.val);
@ -311,7 +308,6 @@ static void php_sybase_do_connect(INTERNAL_FUNCTION_PARAMETERS,int persistent)
host = yyhost->value.str.val;
user = yyuser->value.str.val;
passwd = yypasswd->value.str.val;
charset = NULL;
hashed_details_length = yyhost->value.str.len+yyuser->value.str.len+yypasswd->value.str.len+6+3;
hashed_details = (char *) emalloc(hashed_details_length+1);
sprintf(hashed_details,"sybase_%s_%s_%s",yyhost->value.str.val,yyuser->value.str.val,yypasswd->value.str.val); /* SAFE */

Loading…
Cancel
Save