Fixed bug #60947 (Segmentation fault while executing ibase_db_info)

Ilia Alshanetsky · Ilia Alshanetsky · commit 2dee9ec9f034 · 2012-03-15T19:59:26.000Z
diff --git a/NEWS b/NEWS
@@ -38,6 +38,10 @@ PHP                                                                        NEWS
   . 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)
 
diff --git a/ext/interbase/ibase_service.c b/ext/interbase/ibase_service.c
@@ -321,6 +321,7 @@ static void _php_ibase_service_query(INTERNAL_FUNCTION_PARAMETERS, /* {{{ */
 					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 */

Original file line number	Diff line number	Diff line change
`@@ -321,6 +321,7 @@ static void _php_ibase_service_query(INTERNAL_FUNCTION_PARAMETERS, /* {{{ */`
`321`	`321`	`heap_p = heap_buf + res_size;`
`322`	`322`	`}`
`323`	`323`	`result += 2;`
	`324`	`+ *(result+line_len) = 0;`
`324`	`325`	`snprintf(heap_p, heap_buf_size - (heap_buf - heap_p), "%s\n", result);`
`325`	`326`	`heap_p += line_len +2;`
`326`	`327`	`goto query_loop; /* repeat until result is exhausted */`