Skip to content

Commit b6e14b4

Browse files
zsuraskizsuraski
committed
Fix bug #27186
1 parent da36a7c commit b6e14b4

File tree

2 files changed

+122
-94
lines changed

2 files changed

+122
-94
lines changed

‎Zend/zend_default_classes.c

Lines changed: 61 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
#include "zend_builtin_functions.h"
2626
#include "zend_interfaces.h"
2727

28-
static zend_class_entry *default_exception_ptr;
28+
static zend_class_entry *default_exception_ce;
2929
static zend_object_handlers default_exception_handlers;
3030
ZEND_API void zend_throw_exception(zend_class_entry *exception_ce, char *message, long code TSRMLS_DC);
3131

@@ -47,9 +47,9 @@ static zend_object_value zend_default_exception_new(zend_class_entry *class_type
4747
trace->refcount = 0;
4848
zend_fetch_debug_backtrace(trace, 0 TSRMLS_CC);
4949

50-
zend_update_property_string(default_exception_ptr, &obj, "file", sizeof("file")-1, zend_get_executed_filename(TSRMLS_C) TSRMLS_CC);
51-
zend_update_property_long(default_exception_ptr, &obj, "line", sizeof("line")-1, zend_get_executed_lineno(TSRMLS_C) TSRMLS_CC);
52-
zend_update_property(default_exception_ptr, &obj, "trace", sizeof("trace")-1, trace TSRMLS_CC);
50+
zend_update_property_string(default_exception_ce, &obj, "file", sizeof("file")-1, zend_get_executed_filename(TSRMLS_C) TSRMLS_CC);
51+
zend_update_property_long(default_exception_ce, &obj, "line", sizeof("line")-1, zend_get_executed_lineno(TSRMLS_C) TSRMLS_CC);
52+
zend_update_property(default_exception_ce, &obj, "trace", sizeof("trace")-1, trace TSRMLS_CC);
5353

5454
return obj.value.obj;
5555
}
@@ -74,11 +74,11 @@ ZEND_METHOD(exception, __construct)
7474
object = getThis();
7575

7676
if (message) {
77-
zend_update_property_string(default_exception_ptr, object, "message", sizeof("message")-1, message TSRMLS_CC);
77+
zend_update_property_string(default_exception_ce, object, "message", sizeof("message")-1, message TSRMLS_CC);
7878
}
7979

8080
if (code) {
81-
zend_update_property_long(default_exception_ptr, object, "code", sizeof("code")-1, code TSRMLS_CC);
81+
zend_update_property_long(default_exception_ce, object, "code", sizeof("code")-1, code TSRMLS_CC);
8282
}
8383
}
8484

@@ -91,7 +91,7 @@ static void _default_exception_get_entry(zval *object, char *name, int name_len,
9191
{
9292
zval *value;
9393

94-
value = zend_read_property(default_exception_ptr, object, name, name_len, 0 TSRMLS_CC);
94+
value = zend_read_property(default_exception_ce, object, name, name_len, 0 TSRMLS_CC);
9595

9696
*return_value = *value;
9797
zval_copy_ctor(return_value);
@@ -290,7 +290,7 @@ ZEND_METHOD(exception, getTraceAsString)
290290
char *res = estrdup(""), **str = &res, *s_tmp;
291291
int res_len = 0, *len = &res_len, num = 0;
292292

293-
trace = zend_read_property(default_exception_ptr, getThis(), "trace", sizeof("trace")-1, 1 TSRMLS_CC);
293+
trace = zend_read_property(default_exception_ce, getThis(), "trace", sizeof("trace")-1, 1 TSRMLS_CC);
294294
zend_hash_apply_with_arguments(Z_ARRVAL_P(trace), (apply_func_args_t)_build_trace_string, 3, str, len, &num);
295295

296296
s_tmp = emalloc(1 + MAX_LENGTH_OF_LONG + 7 + 1);
@@ -316,15 +316,19 @@ int zend_spprintf(char **message, int max_len, char *format, ...)
316316

317317
ZEND_METHOD(exception, __toString)
318318
{
319-
zval *message, *file, *line, *trace;
319+
zval message, file, line, *trace;
320320
char *str;
321321
int len;
322322
zend_fcall_info fci;
323323
zval fname;
324-
325-
message = zend_read_property(default_exception_ptr, getThis(), "message", sizeof("message")-1, 1 TSRMLS_CC);
326-
file = zend_read_property(default_exception_ptr, getThis(), "file", sizeof("file")-1, 1 TSRMLS_CC);
327-
line = zend_read_property(default_exception_ptr, getThis(), "line", sizeof("line")-1, 1 TSRMLS_CC);
324+
325+
_default_exception_get_entry(getThis(), "message", sizeof("message")-1, &message TSRMLS_CC);
326+
_default_exception_get_entry(getThis(), "file", sizeof("file")-1, &file TSRMLS_CC);
327+
_default_exception_get_entry(getThis(), "line", sizeof("line")-1, &line TSRMLS_CC);
328+
329+
convert_to_string(&message);
330+
convert_to_string(&file);
331+
convert_to_long(&line);
328332

329333
ZVAL_STRINGL(&fname, "gettraceasstring", sizeof("gettraceasstring")-1, 0);
330334

@@ -340,21 +344,31 @@ ZEND_METHOD(exception, __toString)
340344

341345
zend_call_function(&fci, NULL TSRMLS_CC);
342346

343-
if (Z_STRLEN_P(message) > 0) {
347+
if (Z_TYPE_P(trace) != IS_STRING) {
348+
trace = NULL;
349+
}
350+
351+
if (Z_STRLEN(message) > 0) {
344352
len = zend_spprintf(&str, 0, "exception '%s' with message '%s' in %s:%ld\nStack trace:\n%s",
345-
Z_OBJCE_P(getThis())->name, Z_STRVAL_P(message), Z_STRVAL_P(file), Z_LVAL_P(line),
346-
Z_STRLEN_P(trace) ? Z_STRVAL_P(trace) : "#0 {main}\n");
353+
Z_OBJCE_P(getThis())->name, Z_STRVAL(message), Z_STRVAL(file), Z_LVAL(line),
354+
(trace && Z_STRLEN_P(trace)) ? Z_STRVAL_P(trace) : "#0 {main}\n");
347355
} else {
348356
len = zend_spprintf(&str, 0, "exception '%s' in %s:%ld\nStack trace:\n%s",
349-
Z_OBJCE_P(getThis())->name, Z_STRVAL_P(file), Z_LVAL_P(line),
350-
Z_STRLEN_P(trace) ? Z_STRVAL_P(trace) : "#0 {main}\n");
357+
Z_OBJCE_P(getThis())->name, Z_STRVAL(file), Z_LVAL(line),
358+
(trace && Z_STRLEN_P(trace)) ? Z_STRVAL_P(trace) : "#0 {main}\n");
351359
}
352360

353361
/* We store the result in the private property string so we can access
354362
* the result in uncaught exception handlers without memleaks. */
355-
zend_update_property_string(default_exception_ptr, getThis(), "string", sizeof("string")-1, str TSRMLS_CC);
363+
zend_update_property_string(default_exception_ce, getThis(), "string", sizeof("string")-1, str TSRMLS_CC);
364+
365+
if (trace) {
366+
zval_ptr_dtor(&trace);
367+
}
356368

357-
zval_ptr_dtor(&trace);
369+
zval_dtor(&message);
370+
zval_dtor(&file);
371+
zval_dtor(&line);
358372

359373
RETURN_STRINGL(str, len, 0);
360374
}
@@ -386,22 +400,22 @@ static void zend_register_default_exception(TSRMLS_D)
386400
zend_class_entry ce;
387401

388402
INIT_CLASS_ENTRY(ce, "exception", default_exception_functions);
389-
default_exception_ptr = zend_register_internal_class(&ce TSRMLS_CC);
390-
default_exception_ptr->create_object = zend_default_exception_new;
403+
default_exception_ce = zend_register_internal_class(&ce TSRMLS_CC);
404+
default_exception_ce->create_object = zend_default_exception_new;
391405
memcpy(&default_exception_handlers, zend_get_std_object_handlers(), sizeof(zend_object_handlers));
392406
default_exception_handlers.clone_obj = NULL;
393407

394-
zend_declare_property_string(default_exception_ptr, "message", sizeof("message")-1, "", ZEND_ACC_PROTECTED TSRMLS_CC);
395-
zend_declare_property_string(default_exception_ptr, "string", sizeof("string")-1, "", ZEND_ACC_PRIVATE TSRMLS_CC);
396-
zend_declare_property_long(default_exception_ptr, "code", sizeof("code")-1, 0, ZEND_ACC_PROTECTED TSRMLS_CC);
397-
zend_declare_property_null(default_exception_ptr, "file", sizeof("file")-1, ZEND_ACC_PROTECTED TSRMLS_CC);
398-
zend_declare_property_null(default_exception_ptr, "line", sizeof("line")-1, ZEND_ACC_PROTECTED TSRMLS_CC);
399-
zend_declare_property_null(default_exception_ptr, "trace", sizeof("trace")-1, ZEND_ACC_PRIVATE TSRMLS_CC);
408+
zend_declare_property_string(default_exception_ce, "message", sizeof("message")-1, "", ZEND_ACC_PROTECTED TSRMLS_CC);
409+
zend_declare_property_string(default_exception_ce, "string", sizeof("string")-1, "", ZEND_ACC_PRIVATE TSRMLS_CC);
410+
zend_declare_property_long(default_exception_ce, "code", sizeof("code")-1, 0, ZEND_ACC_PROTECTED TSRMLS_CC);
411+
zend_declare_property_null(default_exception_ce, "file", sizeof("file")-1, ZEND_ACC_PROTECTED TSRMLS_CC);
412+
zend_declare_property_null(default_exception_ce, "line", sizeof("line")-1, ZEND_ACC_PROTECTED TSRMLS_CC);
413+
zend_declare_property_null(default_exception_ce, "trace", sizeof("trace")-1, ZEND_ACC_PRIVATE TSRMLS_CC);
400414
}
401415

402416
ZEND_API zend_class_entry *zend_exception_get_default(void)
403417
{
404-
return default_exception_ptr;
418+
return default_exception_ce;
405419
}
406420

407421
ZEND_API void zend_throw_exception_ex(zend_class_entry *exception_ce, long code TSRMLS_DC, char *format, ...)
@@ -416,21 +430,21 @@ ZEND_API void zend_throw_exception_ex(zend_class_entry *exception_ce, long code
416430

417431
MAKE_STD_ZVAL(ex);
418432
if (exception_ce) {
419-
if (!instanceof_function(exception_ce, default_exception_ptr TSRMLS_CC)) {
433+
if (!instanceof_function(exception_ce, default_exception_ce TSRMLS_CC)) {
420434
zend_error(E_NOTICE, "Exceptions must be derived from exception");
421-
exception_ce = default_exception_ptr;
435+
exception_ce = default_exception_ce;
422436
}
423437
} else {
424-
exception_ce = default_exception_ptr;
438+
exception_ce = default_exception_ce;
425439
}
426440
object_init_ex(ex, exception_ce);
427441

428442

429443
if (message) {
430-
zend_update_property_string(default_exception_ptr, ex, "message", sizeof("message")-1, message TSRMLS_CC);
444+
zend_update_property_string(default_exception_ce, ex, "message", sizeof("message")-1, message TSRMLS_CC);
431445
}
432446
if (code) {
433-
zend_update_property_long(default_exception_ptr, ex, "code", sizeof("code")-1, code TSRMLS_CC);
447+
zend_update_property_long(default_exception_ce, ex, "code", sizeof("code")-1, code TSRMLS_CC);
434448
}
435449

436450
efree(message);
@@ -448,21 +462,21 @@ ZEND_API void zend_throw_exception(zend_class_entry *exception_ce, char *message
448462

449463
MAKE_STD_ZVAL(ex);
450464
if (exception_ce) {
451-
if (!instanceof_function(exception_ce, default_exception_ptr TSRMLS_CC)) {
465+
if (!instanceof_function(exception_ce, default_exception_ce TSRMLS_CC)) {
452466
zend_error(E_NOTICE, "Exceptions must be derived from exception");
453-
exception_ce = default_exception_ptr;
467+
exception_ce = default_exception_ce;
454468
}
455469
} else {
456-
exception_ce = default_exception_ptr;
470+
exception_ce = default_exception_ce;
457471
}
458472
object_init_ex(ex, exception_ce);
459473

460474

461475
if (message) {
462-
zend_update_property_string(default_exception_ptr, ex, "message", sizeof("message")-1, message TSRMLS_CC);
476+
zend_update_property_string(default_exception_ce, ex, "message", sizeof("message")-1, message TSRMLS_CC);
463477
}
464478
if (code) {
465-
zend_update_property_long(default_exception_ptr, ex, "code", sizeof("code")-1, code TSRMLS_CC);
479+
zend_update_property_long(default_exception_ce, ex, "code", sizeof("code")-1, code TSRMLS_CC);
466480
}
467481

468482
zend_throw_exception_internal(ex TSRMLS_CC);
@@ -480,7 +494,7 @@ static void zend_error_va(int type, const char *file, uint lineno, const char *f
480494
ZEND_API void zend_exception_error(zval *exception TSRMLS_DC)
481495
{
482496
zend_class_entry *ce_exception = Z_OBJCE_P(exception);
483-
if (instanceof_function(ce_exception, default_exception_ptr TSRMLS_CC)) {
497+
if (instanceof_function(ce_exception, default_exception_ce TSRMLS_CC)) {
484498
zval *str, *file, *line;
485499
zval *old_exception = EG(exception);
486500

@@ -491,26 +505,26 @@ ZEND_API void zend_exception_error(zval *exception TSRMLS_DC)
491505
if (Z_TYPE_P(str) != IS_STRING) {
492506
zend_error(E_WARNING, "%s::__toString() must return a string", ce_exception->name);
493507
} else {
494-
zend_update_property_string(default_exception_ptr, exception, "string", sizeof("string")-1, EG(exception) ? ce_exception->name : Z_STRVAL_P(str) TSRMLS_CC);
508+
zend_update_property_string(default_exception_ce, exception, "string", sizeof("string")-1, EG(exception) ? ce_exception->name : Z_STRVAL_P(str) TSRMLS_CC);
495509
}
496510
}
497511
zval_ptr_dtor(&str);
498512

499513
if (EG(exception)) {
500514
/* do the best we can to inform about the inner exception */
501-
if (instanceof_function(ce_exception, default_exception_ptr TSRMLS_CC)) {
502-
file = zend_read_property(default_exception_ptr, EG(exception), "file", sizeof("file")-1, 1 TSRMLS_CC);
503-
line = zend_read_property(default_exception_ptr, EG(exception), "line", sizeof("line")-1, 1 TSRMLS_CC);
515+
if (instanceof_function(ce_exception, default_exception_ce TSRMLS_CC)) {
516+
file = zend_read_property(default_exception_ce, EG(exception), "file", sizeof("file")-1, 1 TSRMLS_CC);
517+
line = zend_read_property(default_exception_ce, EG(exception), "line", sizeof("line")-1, 1 TSRMLS_CC);
504518
} else {
505519
file = NULL;
506520
line = NULL;
507521
}
508522
zend_error_va(E_WARNING, file ? Z_STRVAL_P(file) : NULL, line ? Z_LVAL_P(line) : 0, "Uncaught %s in exception handling during call to %s::__tostring()", Z_OBJCE_P(EG(exception))->name, ce_exception->name);
509523
}
510524

511-
str = zend_read_property(default_exception_ptr, exception, "string", sizeof("string")-1, 1 TSRMLS_CC);
512-
file = zend_read_property(default_exception_ptr, exception, "file", sizeof("file")-1, 1 TSRMLS_CC);
513-
line = zend_read_property(default_exception_ptr, exception, "line", sizeof("line")-1, 1 TSRMLS_CC);
525+
str = zend_read_property(default_exception_ce, exception, "string", sizeof("string")-1, 1 TSRMLS_CC);
526+
file = zend_read_property(default_exception_ce, exception, "file", sizeof("file")-1, 1 TSRMLS_CC);
527+
line = zend_read_property(default_exception_ce, exception, "line", sizeof("line")-1, 1 TSRMLS_CC);
514528

515529
EG(exception) = old_exception;
516530

0 commit comments

Comments
 (0)