]> granicus.if.org Git - php/commitdiff
fix wrong string length for registry values
authorStanislav Malyshev <stas@php.net>
Sun, 19 Oct 2003 13:47:35 +0000 (13:47 +0000)
committerStanislav Malyshev <stas@php.net>
Sun, 19 Oct 2003 13:47:35 +0000 (13:47 +0000)
win32/registry.c

index c9a324b628df43762fd99c5fb75f6232b758da33..6eda0f9fffa3be7c032e1d4b06897670057a301b 100644 (file)
@@ -72,7 +72,8 @@ void UpdateIniFromRegistry(char *path TSRMLS_DC)
                                RegEnumValue(hKey, i, namebuf, &namebuf_len, NULL, &lType, valuebuf, &valuebuf_len);
 
                                if ((lType == REG_SZ) || (lType == REG_EXPAND_SZ)) {
-                                       zend_alter_ini_entry(namebuf, namebuf_len + 1, valuebuf, valuebuf_len, PHP_INI_SYSTEM, PHP_INI_STAGE_ACTIVATE);
+                                       /* valuebuf_len includes trailing 0 */
+                                       zend_alter_ini_entry(namebuf, namebuf_len + 1, valuebuf, valuebuf_len?valuebuf_len-1:0, PHP_INI_SYSTEM, PHP_INI_STAGE_ACTIVATE);
                                }
 
                                i++;