cvs: php-src /ext/mysql php_mysql.c

tony2001 Fri Mar 27 22:22:02 2009 UTC Modified files: /php-src/ext/mysql php_mysql.c Log: fix segfault http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/php_mysql.c?r1=1.275&r2=1.276&diff_format=u Index: php-src/ext/mysql/php_mysql.c diff -u php-src/ext/mysql/php_mysql.c:1.275 php-src/ext/mysql/php_mysql.c:1.276 --- php-src/ext/mysql/php_mysql.c:1.275 Fri Mar 27 19:28:26 2009 +++ php-src/ext/mysql/php_mysql.c Fri Mar 27 22:22:02 2009 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_mysql.c,v 1.275 2009/03/27 19:28:26 felipe Exp $ */ +/* $Id: php_mysql.c,v 1.276 2009/03/27 22:22:02 tony2001 Exp $ */ /* TODO: * @@ -625,7 +625,7 @@ int hashed_details_length, port = MYSQL_PORT; long client_flags = 0; php_mysql_conn *mysql=NULL; - char *encoding = mysql_character_set_name(mysql->conn); + char *encoding; #if MYSQL_VERSION_ID <= 32230 void (*handler) (int); #endif @@ -789,6 +789,7 @@ #ifdef MYSQL_HAS_SET_CHARSET mysql_set_character_set(mysql->conn, "utf8"); #else + encoding = mysql_character_set_name(mysql->conn); if (strcasecmp((char*)encoding, "utf8")) { php_error_docref(NULL TSRMLS_CC, E_WARNING, "Can't connect in Unicode mode. Client library was compiled with default charset %s", encoding); MYSQL_DO_CONNECT_RETURN_FALSE();