[PHP-DEV] Patch for bug #19566

2002-11-15 Thread Marcus Börger 
The following patch for bug #19566 is open but should make it into 4.3.

cvs -z3 -q diff zend_hash.c (in directory S:\php4-HEAD\Zend\)
Index: zend_hash.c
===
RCS file: /repository/ZendEngine2/zend_hash.c,v
retrieving revision 1.93
diff -u -r1.93 zend_hash.c
--- zend_hash.c 5 Nov 2002 18:22:02 -   1.93
+++ zend_hash.c 15 Nov 2002 10:49:12 -
 -722,9 +722,9 

HASH_PROTECT_RECURSION(ht);

-   va_start(args, num_args);
p = ht-pListHead;
while (p != NULL) {
+   va_start(args, num_args);
hash_key.arKey = p-arKey;
hash_key.nKeyLength = p-nKeyLength;
hash_key.h = p-h;
 -733,8 +733,8 
} else {
p = p-pListNext;
}
+   va_end(args);
}
-   va_end(args);

HASH_UNPROTECT_RECURSION(ht);
 }

Re: [PHP-DEV] Patch for bug #19566

2002-11-15 Thread Moriyoshi Koizumi 
Hmm, your patch is a bit less sexy because of replaced white spaces.

Moriyoshi

[EMAIL PROTECTED] (Marcus Börger) wrote:

 The following patch for bug #19566 is open but should make it into 4.3.
 
 cvs -z3 -q diff zend_hash.c (in directory S:\php4-HEAD\Zend\)
 Index: zend_hash.c
 ===
 RCS file: /repository/ZendEngine2/zend_hash.c,v
 retrieving revision 1.93
 diff -u -r1.93 zend_hash.c
 --- zend_hash.c 5 Nov 2002 18:22:02 -   1.93
 +++ zend_hash.c 15 Nov 2002 10:49:12 -
 @@ -722,9 +722,9 @@
 
  HASH_PROTECT_RECURSION(ht);
 
 -   va_start(args, num_args);
  p = ht-pListHead;
  while (p != NULL) {
 +   va_start(args, num_args);
  hash_key.arKey = p-arKey;
  hash_key.nKeyLength = p-nKeyLength;
  hash_key.h = p-h;
 @@ -733,8 +733,8 @@
  } else {
  p = p-pListNext;
  }
 +   va_end(args);
  }
 -   va_end(args);
 
  HASH_UNPROTECT_RECURSION(ht);
   }
 
 
 


-- 
PHP Development Mailing List http://www.php.net/
To unsubscribe, visit: http://www.php.net/unsub.php

Re: [PHP-DEV] Patch for bug #19566

2002-11-15 Thread Andi Gutmans 
Wasn't this commited a while ago?

Andi

At 11:58 AM 11/15/2002 +0100, Marcus Börger wrote:

The following patch for bug #19566 is open but should make it into 4.3.

cvs -z3 -q diff zend_hash.c (in directory S:\php4-HEAD\Zend\)
Index: zend_hash.c
===
RCS file: /repository/ZendEngine2/zend_hash.c,v
retrieving revision 1.93
diff -u -r1.93 zend_hash.c
--- zend_hash.c 5 Nov 2002 18:22:02 -   1.93
+++ zend_hash.c 15 Nov 2002 10:49:12 -
 -722,9 +722,9 

HASH_PROTECT_RECURSION(ht);

-   va_start(args, num_args);
p = ht-pListHead;
while (p != NULL) {
+   va_start(args, num_args);
hash_key.arKey = p-arKey;
hash_key.nKeyLength = p-nKeyLength;
hash_key.h = p-h;
 -733,8 +733,8 
} else {
p = p-pListNext;
}
+   va_end(args);
}
-   va_end(args);

HASH_UNPROTECT_RECURSION(ht);
 }






--
PHP Development Mailing List http://www.php.net/
To unsubscribe, visit: http://www.php.net/unsub.php

Re: [PHP-DEV] Patch for bug #19566

2002-11-15 Thread Moriyoshi Koizumi 
No, it's not committed yet.
Both Marcus and me doesn't have access to Zend module.

Moriyoshi

Andi Gutmans [EMAIL PROTECTED] wrote:

 Wasn't this commited a while ago?
 
 Andi
 
 At 11:58 AM 11/15/2002 +0100, Marcus Börger wrote:
 The following patch for bug #19566 is open but should make it into 4.3.
 
 cvs -z3 -q diff zend_hash.c (in directory S:\php4-HEAD\Zend\)
 Index: zend_hash.c
 ===
 RCS file: /repository/ZendEngine2/zend_hash.c,v
 retrieving revision 1.93
 diff -u -r1.93 zend_hash.c
 --- zend_hash.c 5 Nov 2002 18:22:02 -   1.93
 +++ zend_hash.c 15 Nov 2002 10:49:12 -
 @@ -722,9 +722,9 @@
 
  HASH_PROTECT_RECURSION(ht);
 
 -   va_start(args, num_args);
  p = ht-pListHead;
  while (p != NULL) {
 +   va_start(args, num_args);
  hash_key.arKey = p-arKey;
  hash_key.nKeyLength = p-nKeyLength;
  hash_key.h = p-h;
 @@ -733,8 +733,8 @@
  } else {
  p = p-pListNext;
  }
 +   va_end(args);
  }
 -   va_end(args);
 
  HASH_UNPROTECT_RECURSION(ht);
   }
 
 
 
 
 
 -- 
 PHP Development Mailing List http://www.php.net/
 To unsubscribe, visit: http://www.php.net/unsub.php
 
 


-- 
PHP Development Mailing List http://www.php.net/
To unsubscribe, visit: http://www.php.net/unsub.php

Re: [PHP-DEV] Patch for bug #19566

2002-11-15 Thread Andi Gutmans 
Commited.

Andi

At 11:22 PM 11/15/2002 +0900, Moriyoshi Koizumi wrote:

No, it's not committed yet.
Both Marcus and me doesn't have access to Zend module.

Moriyoshi

Andi Gutmans [EMAIL PROTECTED] wrote:

 Wasn't this commited a while ago?

 Andi

 At 11:58 AM 11/15/2002 +0100, Marcus Börger wrote:
 The following patch for bug #19566 is open but should make it into 4.3.
 
 cvs -z3 -q diff zend_hash.c (in directory S:\php4-HEAD\Zend\)
 Index: zend_hash.c
 ===
 RCS file: /repository/ZendEngine2/zend_hash.c,v
 retrieving revision 1.93
 diff -u -r1.93 zend_hash.c
 --- zend_hash.c 5 Nov 2002 18:22:02 -   1.93
 +++ zend_hash.c 15 Nov 2002 10:49:12 -
 @@ -722,9 +722,9 @@
 
  HASH_PROTECT_RECURSION(ht);
 
 -   va_start(args, num_args);
  p = ht-pListHead;
  while (p != NULL) {
 +   va_start(args, num_args);
  hash_key.arKey = p-arKey;
  hash_key.nKeyLength = p-nKeyLength;
  hash_key.h = p-h;
 @@ -733,8 +733,8 @@
  } else {
  p = p-pListNext;
  }
 +   va_end(args);
  }
 -   va_end(args);
 
  HASH_UNPROTECT_RECURSION(ht);
   }
 
 
 


 --
 PHP Development Mailing List http://www.php.net/
 To unsubscribe, visit: http://www.php.net/unsub.php





--
PHP Development Mailing List http://www.php.net/
To unsubscribe, visit: http://www.php.net/unsub.php

Re: [PHP-DEV] Patch for bug #19566

2002-11-15 Thread Moriyoshi Koizumi 
Thanks.
Could you merge the patch into ZE1 also?

Moriyoshi

Andi Gutmans [EMAIL PROTECTED] wrote:

 Commited.
 
 Andi
 
 At 11:22 PM 11/15/2002 +0900, Moriyoshi Koizumi wrote:
 No, it's not committed yet.
 Both Marcus and me doesn't have access to Zend module.
 
 Moriyoshi
 
 Andi Gutmans [EMAIL PROTECTED] wrote:
 
   Wasn't this commited a while ago?
  
   Andi
  
   At 11:58 AM 11/15/2002 +0100, Marcus Börger wrote:
   The following patch for bug #19566 is open but should make it into 4.3.
   
   cvs -z3 -q diff zend_hash.c (in directory S:\php4-HEAD\Zend\)
   Index: zend_hash.c
   ===
   RCS file: /repository/ZendEngine2/zend_hash.c,v
   retrieving revision 1.93
   diff -u -r1.93 zend_hash.c
   --- zend_hash.c 5 Nov 2002 18:22:02 -   1.93
   +++ zend_hash.c 15 Nov 2002 10:49:12 -
   @@ -722,9 +722,9 @@
   
HASH_PROTECT_RECURSION(ht);
   
   -   va_start(args, num_args);
p = ht-pListHead;
while (p != NULL) {
   +   va_start(args, num_args);
hash_key.arKey = p-arKey;
hash_key.nKeyLength = p-nKeyLength;
hash_key.h = p-h;
   @@ -733,8 +733,8 @@
} else {
p = p-pListNext;
}
   +   va_end(args);
}
   -   va_end(args);
   
HASH_UNPROTECT_RECURSION(ht);
 }
   
   
   
  
  
   --
   PHP Development Mailing List http://www.php.net/
   To unsubscribe, visit: http://www.php.net/unsub.php
  
  
 
 
 -- 
 PHP Development Mailing List http://www.php.net/
 To unsubscribe, visit: http://www.php.net/unsub.php
 
 


-- 
PHP Development Mailing List http://www.php.net/
To unsubscribe, visit: http://www.php.net/unsub.php