tony2001 Thu Jun 29 09:03:27 2006 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/sysvshm sysvshm.c
Log:
MFH: make sure we won't get into endless loop
http://cvs.php.net/viewvc.cgi/php-src/ext/sysvshm/sysvshm.c?r1=1.70.2.2&r2=1.70.2.2.2.1&diff_format=u
Index: php-src/ext/sysvshm/sysvshm.c
diff -u php-src/ext/sysvshm/sysvshm.c:1.70.2.2
php-src/ext/sysvshm/sysvshm.c:1.70.2.2.2.1
--- php-src/ext/sysvshm/sysvshm.c:1.70.2.2 Sun Jan 1 12:50:16 2006
+++ php-src/ext/sysvshm/sysvshm.c Thu Jun 29 09:03:27 2006
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: sysvshm.c,v 1.70.2.2 2006/01/01 12:50:16 sniper Exp $ */
+/* $Id: sysvshm.c,v 1.70.2.2.2.1 2006/06/29 09:03:27 tony2001 Exp $ */
/* This has been built and tested on Linux 2.2.14
*
@@ -408,6 +408,10 @@
return pos;
}
pos += shm_var->next;
+
+ if (shm_var->next <= 0 || pos < ptr->start) {
+ return -1;
+ }
}
return -1;
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
