cvs: php-src(PHP_4_3) /ext/fbsql php_fbsql.c
| From: | Frank M. Kromann | Date: | Tue, 24 Aug 2004 18:00:06 +0000 |
| Subject: | cvs: php-src(PHP_4_3) /ext/fbsql php_fbsql.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-28426@lists.php.net to get a copy of this message | ||
fmk Tue Aug 24 14:00:06 2004 EDT
Modified files: (Branch: PHP_4_3)
/php-src/ext/fbsql php_fbsql.c
Log:
Fix a possible crash in fbsql_database() if the function was called before a connection was made.
http://cvs.php.net/diff.php/php-src/ext/fbsql/php_fbsql.c?r1=1.86.2.8&r2=1.86.2.9&ty=u
Index: php-src/ext/fbsql/php_fbsql.c
diff -u php-src/ext/fbsql/php_fbsql.c:1.86.2.8 php-src/ext/fbsql/php_fbsql.c:1.86.2.9
--- php-src/ext/fbsql/php_fbsql.c:1.86.2.8 Mon Feb 9 12:58:24 2004
+++ php-src/ext/fbsql/php_fbsql.c Tue Aug 24 14:00:05 2004
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_fbsql.c,v 1.86.2.8 2004/02/09 17:58:24 fmk Exp $ */
+/* $Id: php_fbsql.c,v 1.86.2.9 2004/08/24 18:00:05 fmk Exp $ */
/* TODO:
*
@@ -1213,7 +1213,12 @@
if (phpLink->databaseName) free(phpLink->databaseName);
phpLink->databaseName = strdup(Z_STRVAL_PP(dbname));
}
- RETURN_STRING(phpLink->databaseName, 1);
+ if (phpLink->databaseName) {
+ RETURN_STRING(phpLink->databaseName, 1);
+ }
+ else {
+ RETURN_FALSE;
+ }
}
/* }}} */