Properly return the result of __call() handler.

diff --git a/NEWS b/NEWS
index 0f43dc871aac53f44e60ed5612361fca3a1df8eb..a241f66b9658b1caf1c79d416f58bbae84c23dac 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,8 +1,10 @@
 PHP 4                                                                      NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 ?? ??? 2002, Version 4.3.0
-- Impelemented timeout functionality, and fixed error handling of fsockopen() on win32
-- Add --with-mysql-sock option (James Cox)
+- Fixed a memory corruption bug in overload extension. (Andrei)
+- Impelemented timeout functionality, and fixed error handling of fsockopen()
+  on win32.
+- Add --with-mysql-sock option. (James Cox)
 - Fixed shuffle() to provide equal distribution of values. (Andrei)
 - Added --with-mysql-sock configure option which can be used to override
   the unix socket location. (e.g. NFS compiles, etc.) (James Cox)

diff --git a/ext/overload/overload.c b/ext/overload/overload.c
index 6b234437fb335412b9f257cec24d299af3eb5a81..41b1e2f6d8d6dc4ccf147b38ee6c4138fb0491ed 100644 (file)
--- a/ext/overload/overload.c
+++ b/ext/overload/overload.c
@@ -601,9 +601,9 @@ static void overload_call_method(INTERNAL_FUNCTION_PARAMETERS, zend_property_ref
                        return;
                }
 
-               *return_value = *retval;
-               INIT_PZVAL(return_value);
-               FREE_ZVAL(retval);
+               return_value->value = retval->value;
+               zval_copy_ctor(return_value);
+               zval_ptr_dtor(&retval);
        }
        
        efree(args);