cvs: php4 /ext/sybase php_sybase_db.c
| From: | Joey Smith | Date: | Thu, 19 Oct 2000 16:09:30 +0000 |
| Subject: | cvs: php4 /ext/sybase php_sybase_db.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-2133@lists.php.net to get a copy of this message | ||
joey Thu Oct 19 09:09:30 2000 EDT
Modified files:
/php4/ext/sybase php_sybase_db.c
Log:
Fix #7338.
Index: php4/ext/sybase/php_sybase_db.c
diff -u php4/ext/sybase/php_sybase_db.c:1.4 php4/ext/sybase/php_sybase_db.c:1.5
--- php4/ext/sybase/php_sybase_db.c:1.4 Sun Sep 3 10:43:09 2000
+++ php4/ext/sybase/php_sybase_db.c Thu Oct 19 09:09:29 2000
@@ -20,7 +20,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_sybase_db.c,v 1.4 2000/09/03 17:43:09 derick Exp $ */
+/* $Id: php_sybase_db.c,v 1.5 2000/10/19 16:09:29 joey Exp $ */
#include "php.h"
@@ -274,7 +274,7 @@
}
convert_to_string(yyhost);
host = yyhost->value.str.val;
- user=passwd=NULL;
+ 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);
@@ -290,7 +290,7 @@
convert_to_string(yyuser);
host = yyhost->value.str.val;
user = yyuser->value.str.val;
- passwd=NULL;
+ 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);
@@ -308,6 +308,7 @@
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 */