return address for unset properties

krakjoe · Jan 23, 2013 · 01ceeac · 01ceeac
1 parent 6a0b4fd
commit 01ceeac
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/src/store.c b/src/store.c
@@ -142,11 +142,11 @@ int pthreads_store_read(pthreads_store store, char *key, int keyl, zval **read T
 		if (pthreads_lock_acquire(store->lock, &locked TSRMLS_CC)) {
 			pthreads_storage *storage = NULL;
 			if (zend_ts_hash_find(&store->table, key, keyl, (void**)&storage)==SUCCESS && storage) {
-				ALLOC_INIT_ZVAL(*read);
+				MAKE_STD_ZVAL(*read);
 				if ((result = pthreads_store_convert((*storage), *read TSRMLS_CC))!=SUCCESS) {
 					FREE_ZVAL(*read);
 				} else Z_SET_REFCOUNT_PP(read, 0);
-			}
+			} else MAKE_STD_ZVAL(*read);
 			pthreads_lock_release(store->lock, locked TSRMLS_CC);
 		}
 	}

diff --git a/tests/corrupted-resources.phpt b/tests/corrupted-resources.phpt
@@ -31,7 +31,7 @@ $test->start();
 Work Object
 (
 )
-object(Work)#3 (0) {
+object(Work)#4 (0) {
 }
 resource(2) of type (stream)
 resource(2) of type (stream)

diff --git a/tests/unset-defaults.phpt b/tests/unset-defaults.phpt
@@ -16,3 +16,4 @@ $thread = new TestThread();
 $thread->start();
 ?>
 --EXPECT--
+NULL