com php-src: Fix possible stack buffer overflow: ext/fileinfo/libmagic/funcs.c

From: Date: Sat, 04 Aug 2018 14:56:08 +0000
Subject: com php-src: Fix possible stack buffer overflow: ext/fileinfo/libmagic/funcs.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-102812@lists.php.net to get a copy of this message
Commit: e1af7a794a25949a7929e7e77bfc215900b4e2a0 Author: Anatol Belski <ab@php.net> Sat, 4 Aug 2018 16:56:08 +0200 Parents: 655658bbfa91cfc96569c85109577358c43db5e1 Branches: PHP-7.3 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=e1af7a794a25949a7929e7e77bfc215900b4e2a0 Log: Fix possible stack buffer overflow Changed paths: M ext/fileinfo/libmagic/funcs.c Diff: diff --git a/ext/fileinfo/libmagic/funcs.c b/ext/fileinfo/libmagic/funcs.c index 972d8d6..651fc15 100644 --- a/ext/fileinfo/libmagic/funcs.c +++ b/ext/fileinfo/libmagic/funcs.c @@ -239,8 +239,15 @@ file_buffer(struct magic_set *ms, php_stream *stream, const char *inname, const } /* Check if we have a CDF file */ - if ((ms->flags & MAGIC_NO_CHECK_CDF) == 0) { - if (stream && SUCCESS == php_stream_cast(stream, PHP_STREAM_AS_FD, (void **)&fd, 0)) { + if ((ms->flags & MAGIC_NO_CHECK_CDF) == 0 && stream) { +#ifdef _WIN64 + php_socket_t _fd = fd; + int _ret = php_stream_cast(stream, PHP_STREAM_AS_FD, (void **)&_fd, 0); + fd = (int)_fd; +#else + int _ret = php_stream_cast(stream, PHP_STREAM_AS_FD, (void **)&fd, 0); +#endif + if (SUCCESS == _ret) { m = file_trycdf(ms, &b); if ((ms->flags & MAGIC_DEBUG) != 0) (void)fprintf(stderr, "[try cdf %d]\n", m);

« previous php.cvs (#102812) next »