diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2019-06-19 16:53:42 +0200 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2019-06-19 17:27:09 +0200 |
| commit | 608097a901fb28d3b1ed0ff4ea2bb76ae9bb1272 (patch) | |
| tree | 174f5aaef20f50315a0a666c93cfdefe3c3b7e82 /ext/tidy/tidy.c | |
| parent | 7cbd4f31c413919d0c985f6de170b89d7bfdbf75 (diff) | |
| download | php-git-608097a901fb28d3b1ed0ff4ea2bb76ae9bb1272.tar.gz | |
Fix various instances of memcpy null ub
Diffstat (limited to 'ext/tidy/tidy.c')
| -rw-r--r-- | ext/tidy/tidy.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/ext/tidy/tidy.c b/ext/tidy/tidy.c index ee7defeac4..295ca8d8f0 100644 --- a/ext/tidy/tidy.c +++ b/ext/tidy/tidy.c @@ -783,7 +783,11 @@ static int tidy_doc_cast_handler(zval *in, zval *out, int type) obj = Z_TIDY_P(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; |