@ - Make sure that OCI8 outbound variables are always zero-terminated. (Thies)

Thies C. Arntzen · Thies C. Arntzen · commit 423613f4eef3 · 2001-07-08T12:37:08.000Z
diff --git a/ext/oci8/oci8.c b/ext/oci8/oci8.c
@@ -563,7 +563,7 @@ PHP_RSHUTDOWN_FUNCTION(oci)
 {
     oci_debug("START php_rshutdown_oci");
 
-#if 0 
+#if 0
 	/* XXX free all statements, rollback all outstanding transactions */
 
 	zend_hash_apply(OCI(user),(int (*)(void *))_session_cleanup);
@@ -649,8 +649,12 @@ _oci_bind_post_exec(void *data)
 		zval *val = bind->zval;
 		zval_dtor(val);
 		ZVAL_NULL(val);
+	} else if (bind->zval->type == IS_STRING) {
+		bind->zval->value.str.val = realloc(bind->zval->value.str.val, bind->zval->value.str.len+1);
+		bind->zval->value.str.val[ bind->zval->value.str.len ] = '\0';
 	}
 
+
 	return 0;
 }
 
diff --git a/ext/oci8/php_oci8.h b/ext/oci8/php_oci8.h
@@ -181,6 +181,8 @@ typedef struct {
 	HashTable *user;
 
     OCIEnv *pEnv;
+
+	int in_call;
 } php_oci_globals;
 
 extern zend_module_entry oci8_module_entry;

Original file line number	Diff line number	Diff line change
`@@ -563,7 +563,7 @@ PHP_RSHUTDOWN_FUNCTION(oci)`
`563`	`563`	`{`
`564`	`564`	`oci_debug("START php_rshutdown_oci");`
`565`	`565`
`566`		`-#if 0`
	`566`	`+#if 0`
`567`	`567`	`/* XXX free all statements, rollback all outstanding transactions */`
`568`	`568`
`569`	`569`	`zend_hash_apply(OCI(user),(int ()(void ))_session_cleanup);`
`@@ -649,8 +649,12 @@ _oci_bind_post_exec(void *data)`
`649`	`649`	`zval *val = bind->zval;`
`650`	`650`	`zval_dtor(val);`
`651`	`651`	`ZVAL_NULL(val);`
	`652`	`+ } else if (bind->zval->type == IS_STRING) {`
	`653`	`+ bind->zval->value.str.val = realloc(bind->zval->value.str.val, bind->zval->value.str.len+1);`
	`654`	`+ bind->zval->value.str.val[ bind->zval->value.str.len ] = '\0';`
`652`	`655`	`}`
`653`	`656`
	`657`	`+`
`654`	`658`	`return 0;`
`655`	`659`	`}`
`656`	`660`