com php-src: ensure the flag doesn't overflow: main/php_strea ms.h
| From: | Anatol Belski | Date: | Thu, 06 Oct 2016 08:18:31 +0000 |
| Subject: | com php-src: ensure the flag doesn't overflow: main/php_strea ms.h | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-94850@lists.php.net to get a copy of this message | ||
Commit: 46f4470e0d53be1b99d5a154006fb0a847e0b72d
Author: Anatol Belski <ab@php.net> Thu, 6 Oct 2016 10:15:38 +0200
Parents: f924893ab9a6cd8ceeecb0f54e0fb8a7e17019c0
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=46f4470e0d53be1b99d5a154006fb0a847e0b72d
Log:
ensure the flag doesn't overflow
In certain case, it could take more than just 0/1, but 2 bits should
be enough.
Changed paths:
M main/php_streams.h
Diff:
diff --git a/main/php_streams.h b/main/php_streams.h
index 8246616..2f65d6e 100644
--- a/main/php_streams.h
+++ b/main/php_streams.h
@@ -198,7 +198,7 @@ struct _php_stream {
zval wrapperdata; /* fgetwrapperdata retrieves this */
uint8_t is_persistent:1;
- uint8_t in_free:1; /* to prevent recursion during free */
+ uint8_t in_free:2; /* to prevent recursion during free */
uint8_t eof:1;
uint8_t __exposed:1; /* non-zero if exposed as a zval somewhere */