cvs: /php4/ext/mysql php_mysql.c
| From: | Zeev Suraski | Date: | Sun, 26 Mar 2000 02:01:42 +0000 |
| Subject: | cvs: /php4/ext/mysql php_mysql.c | ||
| Groups: | php.version4 | ||
| Request: | Send a blank email to php-version4+get-12611@lists.php.net to get a copy of this message | ||
zeev Sat Mar 25 18:01:42 2000 EDT
Modified files:
/php4/ext/mysql php_mysql.c
Log:
@- Fix a data corruption bug in mysql_result(), if used in table.fieldname mode (Zeev)
Hopefully that settles this one.
Index: php4/ext/mysql/php_mysql.c
diff -u php4/ext/mysql/php_mysql.c:1.36 php4/ext/mysql/php_mysql.c:1.37
--- php4/ext/mysql/php_mysql.c:1.36 Sun Mar 19 23:40:56 2000
+++ php4/ext/mysql/php_mysql.c Sat Mar 25 18:01:11 2000
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_mysql.c,v 1.36 2000/03/20 07:40:56 rasmus Exp $ */
+/* $Id: php_mysql.c,v 1.37 2000/03/26 02:01:11 zeev Exp $ */
/* TODO:
@@ -400,7 +400,7 @@
tmp++;
if (tmp[0] != '/') {
port = atoi(tmp);
- if(tmp=strchr(tmp,':')) {
+ if ((tmp=strchr(tmp, ':'))) {
*tmp=0;
tmp++;
socket=tmp;
@@ -1163,8 +1163,7 @@
char *table_name, *field_name, *tmp;
if ((tmp=strchr((*field)->value.str.val,'.'))) {
- *tmp = 0;
- table_name = estrdup((*field)->value.str.val);
+ table_name = estrndup((*field)->value.str.val, tmp-(*field)->value.str.val);
field_name = estrdup(tmp+1);
} else {
table_name = NULL;