[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/sybase_ct/php_sybase_ct.c branches/PHP_5_4/ext/sybase_ct/php_sybase_ct.c trunk/ext/sybase_ct/php_sybase_ct.c

2011-07-28 Thread Pierre Joye 
pajoye   Thu, 28 Jul 2011 21:16:51 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=313903

Log:
- Fix #55301 (sybase part, take #2) check if malloc succeded

Bugs: https://bugs.php.net/55301 (Open) multiple null pointer
  https://bugs.php.net/2 (Closed) hash_environment
  
Changed paths:
U   php/php-src/branches/PHP_5_3/ext/sybase_ct/php_sybase_ct.c
U   php/php-src/branches/PHP_5_4/ext/sybase_ct/php_sybase_ct.c
U   php/php-src/trunk/ext/sybase_ct/php_sybase_ct.c

Modified: php/php-src/branches/PHP_5_3/ext/sybase_ct/php_sybase_ct.c
===
--- php/php-src/branches/PHP_5_3/ext/sybase_ct/php_sybase_ct.c  2011-07-28 
20:16:09 UTC (rev 313902)
+++ php/php-src/branches/PHP_5_3/ext/sybase_ct/php_sybase_ct.c  2011-07-28 
21:16:51 UTC (rev 313903)
@@ -777,7 +777,7 @@
}

sybase_ptr = (sybase_link *) 
malloc(sizeof(sybase_link));
-   if (sybase_ptr) {
+   if (!sybase_ptr) {
efree(hashed_details);
RETURN_FALSE;
}

Modified: php/php-src/branches/PHP_5_4/ext/sybase_ct/php_sybase_ct.c
===
--- php/php-src/branches/PHP_5_4/ext/sybase_ct/php_sybase_ct.c  2011-07-28 
20:16:09 UTC (rev 313902)
+++ php/php-src/branches/PHP_5_4/ext/sybase_ct/php_sybase_ct.c  2011-07-28 
21:16:51 UTC (rev 313903)
@@ -777,7 +777,7 @@
}

sybase_ptr = (sybase_link *) 
malloc(sizeof(sybase_link));
-   if (sybase_ptr) {
+   if (!sybase_ptr) {
efree(hashed_details);
RETURN_FALSE;
}

Modified: php/php-src/trunk/ext/sybase_ct/php_sybase_ct.c
===
--- php/php-src/trunk/ext/sybase_ct/php_sybase_ct.c 2011-07-28 20:16:09 UTC 
(rev 313902)
+++ php/php-src/trunk/ext/sybase_ct/php_sybase_ct.c 2011-07-28 21:16:51 UTC 
(rev 313903)
@@ -777,7 +777,7 @@
}

sybase_ptr = (sybase_link *) 
malloc(sizeof(sybase_link));
-   if (sybase_ptr) {
+   if (!sybase_ptr) {
efree(hashed_details);
RETURN_FALSE;
}

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/sybase_ct/php_sybase_ct.c branches/PHP_5_4/ext/sybase_ct/php_sybase_ct.c trunk/ext/sybase_ct/php_sybase_ct.c

2011-06-10 Thread Felipe Pena 
felipe   Sat, 11 Jun 2011 01:15:14 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=312044

Log:
- Possible fix for bug #55022 (memory_limit exhausted when set charset in 
sybase_connect)

Bug: http://bugs.php.net/55022 (Open) memory_limit exhausted when set charset 
in sybase_connect
  
Changed paths:
U   php/php-src/branches/PHP_5_3/ext/sybase_ct/php_sybase_ct.c
U   php/php-src/branches/PHP_5_4/ext/sybase_ct/php_sybase_ct.c
U   php/php-src/trunk/ext/sybase_ct/php_sybase_ct.c

Modified: php/php-src/branches/PHP_5_3/ext/sybase_ct/php_sybase_ct.c
===
--- php/php-src/branches/PHP_5_3/ext/sybase_ct/php_sybase_ct.c  2011-06-11 
00:34:53 UTC (rev 312043)
+++ php/php-src/branches/PHP_5_3/ext/sybase_ct/php_sybase_ct.c  2011-06-11 
01:15:14 UTC (rev 312044)
@@ -728,7 +728,7 @@

 static void php_sybase_do_connect(INTERNAL_FUNCTION_PARAMETERS, int persistent)
 {
-   char *user, *passwd, *host, *charset, *appname;
+   char *user = NULL, *passwd = NULL, *host = NULL, *charset = NULL, 
*appname = NULL;
char *hashed_details;
int hashed_details_length, len;
zend_bool new = 0;

Modified: php/php-src/branches/PHP_5_4/ext/sybase_ct/php_sybase_ct.c
===
--- php/php-src/branches/PHP_5_4/ext/sybase_ct/php_sybase_ct.c  2011-06-11 
00:34:53 UTC (rev 312043)
+++ php/php-src/branches/PHP_5_4/ext/sybase_ct/php_sybase_ct.c  2011-06-11 
01:15:14 UTC (rev 312044)
@@ -728,7 +728,7 @@

 static void php_sybase_do_connect(INTERNAL_FUNCTION_PARAMETERS, int persistent)
 {
-   char *user, *passwd, *host, *charset, *appname;
+   char *user = NULL, *passwd = NULL, *host = NULL, *charset = NULL, 
*appname = NULL;
char *hashed_details;
int hashed_details_length, len;
zend_bool new = 0;

Modified: php/php-src/trunk/ext/sybase_ct/php_sybase_ct.c
===
--- php/php-src/trunk/ext/sybase_ct/php_sybase_ct.c 2011-06-11 00:34:53 UTC 
(rev 312043)
+++ php/php-src/trunk/ext/sybase_ct/php_sybase_ct.c 2011-06-11 01:15:14 UTC 
(rev 312044)
@@ -728,7 +728,7 @@

 static void php_sybase_do_connect(INTERNAL_FUNCTION_PARAMETERS, int persistent)
 {
-   char *user, *passwd, *host, *charset, *appname;
+   char *user = NULL, *passwd = NULL, *host = NULL, *charset = NULL, 
*appname = NULL;
char *hashed_details;
int hashed_details_length, len;
zend_bool new = 0;

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php