mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-11-27 20:03:40 +08:00
Code Issues Packages Projects Releases Wiki Activity

memory stream: fix [-Wanalyzer-deref-before-check]

Browse Source 
|  732 |                 ts->mode = mode && mode[0] == 'r' && mode[1] != '+' ? TEMP_STREAM_READONLY : 0;
    |      |                            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^~~

Although mode is already dereference on line 723 in the call to strlen()
This commit is contained in:
George Peter Banyard 2023-06-02 17:39:55 +01:00
parent 810507ab1b
commit 13ad8ef40b
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
main/streams/memory.c
View File

@ -349,7 +349,7 @@ static ssize_t php_stream_temp_write(php_stream *stream, const char *buf, size_t
}
if (php_stream_is(ts->innerstream, PHP_STREAM_IS_MEMORY)) {
zend_off_t pos = php_stream_tell(ts->innerstream);
if (pos + count >= ts->smax) {
zend_string *membuf = php_stream_memory_get_buffer(ts->innerstream);
php_stream *file = php_stream_fopen_temporary_file(ts->tmpdir, "php", NULL);
@ -614,6 +614,8 @@ static php_stream * php_stream_url_wrap_rfc2397(php_stream_wrapper *wrapper, con
int base64 = 0;
zend_string *base64_comma = NULL;
ZEND_ASSERT(mode);
ZVAL_NULL(&meta);
if (memcmp(path, "data:", 5)) {
return NULL;
@ -729,7 +731,7 @@ static php_stream * php_stream_url_wrap_rfc2397(php_stream_wrapper *wrapper, con
stream->ops = &php_stream_rfc2397_ops;
ts = (php_stream_temp_data*)stream->abstract;
assert(ts != NULL);
ts->mode = mode && mode[0] == 'r' && mode[1] != '+' ? TEMP_STREAM_READONLY : 0;
ts->mode = mode[0] == 'r' && mode[1] != '+' ? TEMP_STREAM_READONLY : 0;
ZVAL_COPY_VALUE(&ts->meta, &meta);
}
if (base64_comma) {