iliaa Wed Nov 29 15:47:41 2006 UTC
Modified files:
/php-src/ext/pgsql pgsql.c
/php-src/ext/pdo_pgsql pgsql_driver.c
Log:
MFB: Fixed bug #39663 (Memory leak in pg_get_notify() and a possible memory
corruption on Windows in pgsql and pdo_pgsql extensions).
http://cvs.php.net/viewvc.cgi/php-src/ext/pgsql/pgsql.c?r1=1.359&r2=1.360&diff_format=u
Index: php-src/ext/pgsql/pgsql.c
diff -u php-src/ext/pgsql/pgsql.c:1.359 php-src/ext/pgsql/pgsql.c:1.360
--- php-src/ext/pgsql/pgsql.c:1.359 Mon Nov 13 22:11:02 2006
+++ php-src/ext/pgsql/pgsql.c Wed Nov 29 15:47:41 2006
@@ -20,7 +20,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: pgsql.c,v 1.359 2006/11/13 22:11:02 iliaa Exp $ */
+/* $Id: pgsql.c,v 1.360 2006/11/29 15:47:41 iliaa Exp $ */
#include <stdlib.h>
@@ -3597,7 +3597,7 @@
to = (char *)PQescapeBytea((unsigned char*)from, from_len,
&to_len);
RETVAL_STRINGL(to, to_len-1, 1); /* to_len includes addtional '\0' */
- free(to);
+ PQfreemem(to);
}
/* }}} */
@@ -4335,6 +4335,7 @@
add_assoc_string(return_value, "message",
pgsql_notify->relname, 1);
add_assoc_long(return_value, "pid", pgsql_notify->be_pid);
}
+ PQfreemem(pgsql_notify);
}
/* }}} */
@@ -5140,7 +5141,7 @@
Z_STRLEN_P(new_val) =
to_len-1; /* PQescapeBytea's to_len includes additional '\0' */
Z_STRVAL_P(new_val) =
emalloc(to_len);
memcpy(Z_STRVAL_P(new_val), tmp, to_len);
- free(tmp);
+ PQfreemem(tmp);
php_pgsql_add_quotes(new_val, 1 TSRMLS_CC);
}
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_pgsql/pgsql_driver.c?r1=1.62&r2=1.63&diff_format=u
Index: php-src/ext/pdo_pgsql/pgsql_driver.c
diff -u php-src/ext/pdo_pgsql/pgsql_driver.c:1.62
php-src/ext/pdo_pgsql/pgsql_driver.c:1.63
--- php-src/ext/pdo_pgsql/pgsql_driver.c:1.62 Fri Oct 6 22:34:29 2006
+++ php-src/ext/pdo_pgsql/pgsql_driver.c Wed Nov 29 15:47:41 2006
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: pgsql_driver.c,v 1.62 2006/10/06 22:34:29 iliaa Exp $ */
+/* $Id: pgsql_driver.c,v 1.63 2006/11/29 15:47:41 iliaa Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -267,7 +267,7 @@
(*quoted)[0] = '\'';
(*quoted)[*quotedlen-1] = '\'';
(*quoted)[*quotedlen] = '\0';
- free(escaped);
+ PQfreemem(escaped);
break;
default:
*quoted = safe_emalloc(2, unquotedlen, 3);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
