]> granicus.if.org Git - php/commitdiff
- Fix segfault when __CLASS__ was used outside a class definition
authorDerick Rethans <derick@php.net>
Sat, 2 Nov 2002 09:06:23 +0000 (09:06 +0000)
committerDerick Rethans <derick@php.net>
Sat, 2 Nov 2002 09:06:23 +0000 (09:06 +0000)
Zend/zend_language_scanner.l

index 9dce3ec3960c1c48e22b808c93f937e76dcdeece..d0b758e6decc034f4d885c1deb9e0b9e2ce4c79a 100644 (file)
@@ -940,7 +940,11 @@ NEWLINE ("\r"|"\n"|"\r\n")
 }
 
 <ST_IN_SCRIPTING>"__CLASS__" {
-       char *class_name = CG(active_class_entry)->name;
+       char *class_name = NULL;
+
+       if (CG(active_class_entry)) {
+               class_name = CG(active_class_entry)->name;
+       }
        
        if (!class_name) {
                class_name = "";