Patch fix_bug_69156v2.diff for solr Bug #69156

Patch version 2015-03-02 14:24 UTC

Obsolete patches:

• fix_bug_69156.diff, revision 2015-03-02 12:35 UTC

• 2015-03-02 14:24 UTC [diff to current]

Developer: pomyk@go2.pl

commit d7021d16c9584922110a53e35f23962b21f305bc
Author: Patryk Pomykalski <pomyks@gmail.com>
Date:   Mon Mar 2 13:27:43 2015 +0100

    Fix bug #69156 segfault on 500 response from Solr
    
    add missing result check for php_var_unserialize in solr_get_phpnative_error

diff --git a/solr_functions_client.c b/solr_functions_client.c
index 945fe05..44ee23e 100644
--- a/solr_functions_client.c
+++ b/solr_functions_client.c
@@ -705,7 +705,10 @@ PHP_SOLR_API int solr_get_phpnative_error(solr_string_t buffer, solr_exception_t
     ALLOC_INIT_ZVAL(response_obj);
     PHP_VAR_UNSERIALIZE_INIT(var_hash);
 
-    php_var_unserialize(&response_obj, &raw_resp, str_end, &var_hash TSRMLS_CC);
+    if (!php_var_unserialize(&response_obj, &raw_resp, str_end, &var_hash TSRMLS_CC)) {
+        PHP_VAR_UNSERIALIZE_DESTROY(var_hash);
+        return 1;
+    }
     hydrate_error_zval(response_obj, exceptionData TSRMLS_CC);
     PHP_VAR_UNSERIALIZE_DESTROY(var_hash);
     zval_ptr_dtor(&response_obj);