[binaryphp-cvs] binaryphp/functions/arrays array.cpp,1.2,1.3

[<he...@us...>]

Update of /cvsroot/binaryphp/binaryphp/functions/arrays
In directory sc8-pr-cvs1:/tmp/cvs-serv31764/functions/arrays

Modified Files:
	array.cpp 
Log Message:
Segfault fixed in mysql_fetch_array(), and argument list fixed in array().

Index: array.cpp
===================================================================
RCS file: /cvsroot/binaryphp/binaryphp/functions/arrays/array.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** array.cpp	4 Aug 2003 23:46:24 -0000	1.2
--- array.cpp	7 Aug 2003 05:39:03 -0000	1.3
***************
*** 9,13 ****
  	for(int i = 0; i < key / 2; ++i)
  	{
! 		php_var key2 = va_arg(ap, php_var);
  		if(key2 == -1)
  		{
--- 9,13 ----
  	for(int i = 0; i < key / 2; ++i)
  	{
! 		php_var key2 = *(va_arg(ap, php_var*));
  		if(key2 == -1)
  		{
***************
*** 27,34 ****
  			key2 = i;
  		}
! 		php_var val = va_arg(ap, php_var);
  		arr.keys.push_back(key2);
  		arr.data.push_back(val);
! 	};
  	va_end(ap);
  	return arr;
--- 27,34 ----
  			key2 = i;
  		}
! 		php_var val = *(va_arg(ap, php_var*));
  		arr.keys.push_back(key2);
  		arr.data.push_back(val);
! 	}
  	va_end(ap);
  	return arr;