]> granicus.if.org Git - php/commitdiff
MFB: Fix a possible memory leak
authorIlia Alshanetsky <iliaa@php.net>
Thu, 21 Dec 2006 02:11:12 +0000 (02:11 +0000)
committerIlia Alshanetsky <iliaa@php.net>
Thu, 21 Dec 2006 02:11:12 +0000 (02:11 +0000)
Zend/zend_compile.c

index 8c15ad379e435c6e79f8da5783a569951719386e..67c3a40a40cc961cf0f565a38868f5cbf5fbaff6 100644 (file)
@@ -2877,15 +2877,17 @@ void zend_do_begin_class_declaration(znode *class_token, znode *class_name, znod
 {
        zend_op *opline;
        int doing_inheritance = 0;
-       zend_class_entry *new_class_entry = emalloc(sizeof(zend_class_entry));
+       zend_class_entry *new_class_entry;
        unsigned int lcname_len;
-       zstr lcname = zend_u_str_case_fold(Z_TYPE(class_name->u.constant), Z_UNIVAL(class_name->u.constant), Z_UNILEN(class_name->u.constant), 0, &lcname_len);
+       zstr lcname;
 
        if (CG(active_class_entry)) {
                zend_error(E_COMPILE_ERROR, "Class declarations may not be nested");
                return;
        }
 
+       lcname = zend_u_str_case_fold(Z_TYPE(class_name->u.constant), Z_UNIVAL(class_name->u.constant), Z_UNILEN(class_name->u.constant), 0, &lcname_len);
+
        if ((lcname_len == sizeof("self")-1 &&
             ZEND_U_EQUAL(Z_TYPE(class_name->u.constant), lcname, lcname_len, "self", sizeof("self")-1)) ||
            (lcname_len == sizeof("parent")-1 &&
@@ -2894,6 +2896,7 @@ void zend_do_begin_class_declaration(znode *class_token, znode *class_name, znod
                zend_error(E_COMPILE_ERROR, "Cannot use '%R' as class name as it is reserved", Z_TYPE(class_name->u.constant), Z_UNIVAL(class_name->u.constant));
        }
 
+       new_class_entry = emalloc(sizeof(zend_class_entry));
        new_class_entry->type = ZEND_USER_CLASS;
        new_class_entry->name = Z_UNIVAL(class_name->u.constant);
        new_class_entry->name_length = Z_UNILEN(class_name->u.constant);