]> granicus.if.org Git - php/commitdiff
Fixed if() condition.
authorIlia Alshanetsky <iliaa@php.net>
Fri, 17 Oct 2003 02:29:06 +0000 (02:29 +0000)
committerIlia Alshanetsky <iliaa@php.net>
Fri, 17 Oct 2003 02:29:06 +0000 (02:29 +0000)
Zend/zend_alloc.c

index f2d6a44f535cb28b7943535e7efe89ec8c7bc15b..960be1dd62d1e1db951e6590f7acb389521fa866 100644 (file)
@@ -78,9 +78,9 @@ static long mem_block_end_magic = MEM_BLOCK_END_MAGIC;
                                                                        if (AG(memory_limit)+1048576 > AG(allocated_memory) - rs) { \
                                                                                AG(memory_limit) = AG(allocated_memory) + 1048576; \
                                                                                if (file) { \
-                                                                                       zend_error(E_ERROR,"Allowed memory size of %d bytes exhausted (tried to allocate %d bytes)", php_mem_limit, s); \
-                                                                               } else { \
                                                                                        zend_error(E_ERROR,"Allowed memory size of %d bytes exhausted at %s:%d (tried to allocate %d bytes)", php_mem_limit, file, lineno, s); \
+                                                                               } else { \
+                                                                                       zend_error(E_ERROR,"Allowed memory size of %d bytes exhausted (tried to allocate %d bytes)", php_mem_limit, s); \
                                                                                } \
                                                                        } else { \
                                                                                if (file) { \