cvs: pecl /memcache memcache.c /memcache/tests 029.phpt

mikl            Thu Jan 26 17:57:51 2006 UTC

  Added files:                 
    /pecl/memcache/tests        029.phpt 

  Modified files:              
    /pecl/memcache      memcache.c 
  Log:
  Fixed lack of multiplier in size argument to emalloc in mmc_pool_add (bug 
#6595)
  
http://cvs.php.net/viewcvs.cgi/pecl/memcache/memcache.c?r1=1.36&r2=1.37&diff_format=u
Index: pecl/memcache/memcache.c
diff -u pecl/memcache/memcache.c:1.36 pecl/memcache/memcache.c:1.37
--- pecl/memcache/memcache.c:1.36       Fri Jan 13 16:49:52 2006
+++ pecl/memcache/memcache.c    Thu Jan 26 17:57:51 2006
@@ -17,7 +17,7 @@
   +----------------------------------------------------------------------+
 */
 
-/* $Id: memcache.c,v 1.36 2006/01/13 16:49:52 mikl Exp $ */
+/* $Id: memcache.c,v 1.37 2006/01/26 17:57:51 mikl Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -246,7 +246,7 @@
        php_info_print_table_start();
        php_info_print_table_header(2, "memcache support", "enabled");
        php_info_print_table_row(2, "Active persistent connections", buf);
-       php_info_print_table_row(2, "Revision", "$Revision: 1.36 $");
+       php_info_print_table_row(2, "Revision", "$Revision: 1.37 $");
        php_info_print_table_end();
 }
 /* }}} */
@@ -367,7 +367,7 @@
                pool->buckets = erealloc(pool->buckets, sizeof(mmc_t *) * 
(pool->num_buckets + weight));
        }
        else {
-               pool->buckets = emalloc(sizeof(mmc_t *));
+               pool->buckets = emalloc(sizeof(mmc_t *) * (pool->num_buckets + 
weight));
        }
 
        for (i=0; i<weight; i++) {

http://cvs.php.net/viewcvs.cgi/pecl/memcache/tests/029.phpt?view=markup&rev=1.1
Index: pecl/memcache/tests/029.phpt
+++ pecl/memcache/tests/029.phpt
--TEST--
memcache->addServer() and memcache->close()
--SKIPIF--
<?php if(!extension_loaded("memcache")) print "skip"; ?>
--FILE--
<?php

// Test for bug #6595

include 'connect.inc';

$memcache2 = new Memcache();

$result1 = $memcache2->addServer($host, $port, true, 50);
$result2 = $memcache2->close();

var_dump($result1);
var_dump($result2);

?>
--EXPECTF--
bool(true)
bool(true)