summaryrefslogtreecommitdiff
path: root/ext/tidy/tidy.c
diff options
context:
space:
mode:
authorNikita Popov <nikita.ppv@gmail.com>2019-06-19 17:27:29 +0200
committerNikita Popov <nikita.ppv@gmail.com>2019-06-19 17:27:29 +0200
commit452076de44b43c2b426ef3171f8f2fb8f38b3b8a (patch)
treede0e3e662b0f077cc192b87f0ed9fc6e6156f321 /ext/tidy/tidy.c
parentc7e5699c42f49ef632d84bd1fdac21094a6b3e82 (diff)
parent8743d5e99acd59504bdf34e65d2ba25f20d76970 (diff)
downloadphp-git-452076de44b43c2b426ef3171f8f2fb8f38b3b8a.tar.gz
Merge branch 'PHP-7.4'
Diffstat (limited to 'ext/tidy/tidy.c')
-rw-r--r--ext/tidy/tidy.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/ext/tidy/tidy.c b/ext/tidy/tidy.c
index 656af8b4f0..9da7037b71 100644
--- a/ext/tidy/tidy.c
+++ b/ext/tidy/tidy.c
@@ -786,7 +786,11 @@ static int tidy_doc_cast_handler(zend_object *in, zval *out, int type)
obj = php_tidy_fetch_object(in);
tidyBufInit(&output);
tidySaveBuffer (obj->ptdoc->doc, &output);
- ZVAL_STRINGL(out, (char *) output.bp, output.size ? output.size-1 : 0);
+ if (output.size) {
+ ZVAL_STRINGL(out, (char *) output.bp, output.size-1);
+ } else {
+ ZVAL_EMPTY_STRING(out);
+ }
tidyBufFree(&output);
break;