Fixed extra byte allocation for STD* constants and replace magic numbers

with sizeof().

diff --git a/sapi/cli/php_cli.c b/sapi/cli/php_cli.c
index a2b89a27beff80e9f1cd6981d27401821ca889f4..306e143f2c09558e3deb160f2842100b6a63714d 100644 (file)
--- a/sapi/cli/php_cli.c
+++ b/sapi/cli/php_cli.c
@@ -448,22 +448,22 @@ static void cli_register_file_handles(TSRMLS_D)
        
        ic.value = *zin;
        ic.flags = CONST_CS;
-       ic.name = zend_strndup("STDIN", 6);
-       ic.name_len = 6;
+       ic.name = zend_strndup(ZEND_STRS("STDIN"));
+       ic.name_len = sizeof("STDIN");
        ic.module_number = 0;
        zend_register_constant(&ic TSRMLS_CC);
 
        oc.value = *zout;
        oc.flags = CONST_CS;
-       oc.name = zend_strndup("STDOUT", 7);
-       oc.name_len = 7;
+       oc.name = zend_strndup(ZEND_STRS("STDOUT"));
+       oc.name_len = sizeof("STDOUT");
        oc.module_number = 0;
        zend_register_constant(&oc TSRMLS_CC);
 
        ec.value = *zerr;
        ec.flags = CONST_CS;
-       ec.name = zend_strndup("STDERR", 7);
-       ec.name_len = 7;
+       ec.name = zend_strndup(ZEND_STRS("STDERR"));
+       ec.name_len = sizeof("STDERR");
        ec.module_number = 0;
        zend_register_constant(&ec TSRMLS_CC);