svn: /php/php-src/ branches/PHP_5_3/NEWS branches/PHP_5_3/ext/interbase/ibase_service.c branches/PHP_5_4/NEWS
branches/PHP_5_4/ext/interbase/ibase_service.c trunk/ext/interbase/ibase_service.c
| From: | Ilia Alshanetsky | Date: | Thu, 15 Mar 2012 19:59:26 +0000 |
| Subject: | svn: /php/php-src/ branches/PHP_5_3/NEWS branches/PHP_5_3/ext/interbase/ibase_service.c branches/PHP_5_4/NEWS branches/PHP_5_4/ext/interbase/ibase_service.c trunk/ext/interbase/ibase_service.c |
||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-67921@lists.php.net to get a copy of this message | ||
iliaa Thu, 15 Mar 2012 19:59:26 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=324281
Log:
Fixed bug #60947 (Segmentation fault while executing ibase_db_info)
Bug: https://bugs.php.net/60947 (Assigned) Segmentation
fault while executing ibase_db_info
Changed paths:
U php/php-src/branches/PHP_5_3/NEWS
U php/php-src/branches/PHP_5_3/ext/interbase/ibase_service.c
U php/php-src/branches/PHP_5_4/NEWS
U php/php-src/branches/PHP_5_4/ext/interbase/ibase_service.c
U php/php-src/trunk/ext/interbase/ibase_service.c
Modified: php/php-src/branches/PHP_5_3/NEWS
===================================================================
--- php/php-src/branches/PHP_5_3/NEWS 2012-03-15 16:04:07 UTC (rev 324280)
+++ php/php-src/branches/PHP_5_3/NEWS 2012-03-15 19:59:26 UTC (rev 324281)
@@ -29,6 +29,10 @@
function is by reference). (Nikita Popov)
. Fixed bug #51860 (Include fails with toplevel symlink to /). (Dmitry)
+- Ibase
+ . Fixed bug #60947 (Segmentation fault while executing ibase_db_info).
+ (Ilia)
+
- Installation
. Fixed bug #61172 (Add Apache 2.4 support). (Chris Jones)
Modified: php/php-src/branches/PHP_5_3/ext/interbase/ibase_service.c
===================================================================
--- php/php-src/branches/PHP_5_3/ext/interbase/ibase_service.c 2012-03-15 16:04:07 UTC (rev 324280)
+++ php/php-src/branches/PHP_5_3/ext/interbase/ibase_service.c 2012-03-15 19:59:26 UTC (rev 324281)
@@ -321,6 +321,7 @@
heap_p = heap_buf + res_size;
}
result += 2;
+ *(result+line_len) = 0;
snprintf(heap_p, heap_buf_size - (heap_buf - heap_p), "%s\n", result);
heap_p += line_len +2;
goto query_loop; /* repeat until result is exhausted */
Modified: php/php-src/branches/PHP_5_4/NEWS
===================================================================
--- php/php-src/branches/PHP_5_4/NEWS 2012-03-15 16:04:07 UTC (rev 324280)
+++ php/php-src/branches/PHP_5_4/NEWS 2012-03-15 19:59:26 UTC (rev 324281)
@@ -38,6 +38,10 @@
. Fixed bug #52719 (array_walk_recursive crashes if third param of the
function is by reference). (Nikita Popov)
+- Ibase
+ . Fixed bug #60947 (Segmentation fault while executing ibase_db_info).
+ (Ilia)
+
- Installation
. Fixed bug #61172 (Add Apache 2.4 support). (Chris Jones)
Modified: php/php-src/branches/PHP_5_4/ext/interbase/ibase_service.c
===================================================================
--- php/php-src/branches/PHP_5_4/ext/interbase/ibase_service.c 2012-03-15 16:04:07 UTC (rev 324280)
+++ php/php-src/branches/PHP_5_4/ext/interbase/ibase_service.c 2012-03-15 19:59:26 UTC (rev 324281)
@@ -321,6 +321,7 @@
heap_p = heap_buf + res_size;
}
result += 2;
+ *(result+line_len) = 0;
snprintf(heap_p, heap_buf_size - (heap_buf - heap_p), "%s\n", result);
heap_p += line_len +2;
goto query_loop; /* repeat until result is exhausted */
Modified: php/php-src/trunk/ext/interbase/ibase_service.c
===================================================================
--- php/php-src/trunk/ext/interbase/ibase_service.c 2012-03-15 16:04:07 UTC (rev 324280)
+++ php/php-src/trunk/ext/interbase/ibase_service.c 2012-03-15 19:59:26 UTC (rev 324281)
@@ -321,6 +321,7 @@
heap_p = heap_buf + res_size;
}
result += 2;
+ *(result+line_len) = 0;
snprintf(heap_p, heap_buf_size - (heap_buf - heap_p), "%s\n", result);
heap_p += line_len +2;
goto query_loop; /* repeat until result is exhausted */