Fix Bug #17806 Segmentation fault when passing invalid url to http_get()

[m6w6/ext-http] / http_message_object.c

diff --git a/http_message_object.c b/http_message_object.c
index c3585c14eee57a43474744c4544a383294fa1716..e7a564f2ba58349720d4a8a2336fb40e3e39091d 100644 (file)
--- a/http_message_object.c
+++ b/http_message_object.c
@@ -513,14 +513,9 @@ zend_object_value _http_message_object_new_ex(zend_class_entry *ce, http_message
                }
        }
 
-#if PHP_VERSION_ID < 50399
        ALLOC_HASHTABLE(OBJ_PROP(o));
        zend_hash_init(OBJ_PROP(o), zend_hash_num_elements(&ce->default_properties), NULL, ZVAL_PTR_DTOR, 0);
        zend_hash_copy(OBJ_PROP(o), &ce->default_properties, (copy_ctor_func_t) zval_add_ref, NULL, sizeof(zval *));
-#else
-       zend_object_std_init(&o->zo, ce TSRMLS_CC);
-       object_properties_init(&o->zo, ce);
-#endif
 
        ov.handle = putObject(http_message_object, o);
        ov.handlers = &http_message_object_handlers;
@@ -622,11 +617,7 @@ static HashTable *_http_message_object_get_props(zval *object TSRMLS_DC)
        zval *headers;
        getObjectEx(http_message_object, obj, object);
        http_message *msg = obj->message;
-#if PHP_VERSION_ID < 50399
        HashTable *props = OBJ_PROP(obj);
-#else
-       HashTable *props = zend_std_get_properties(object TSRMLS_CC);
-#endif
        zval array, *parent;
        
        INIT_ZARR(array, props);
@@ -1009,7 +1000,7 @@ PHP_METHOD(HttpMessage, setResponseStatus)
        
        HTTP_CHECK_MESSAGE_TYPE_RESPONSE(obj->message, RETURN_FALSE);
        
-       if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &status, &status_len)) {
+       if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &status, &status_len)) {
                RETURN_FALSE;
        }
        STR_SET(obj->message->http.info.response.status, estrndup(status, status_len));