diff options
| -rw-r--r-- | ext/rpc/com/com.c | 2 | ||||
| -rwxr-xr-x | main/streams/streams.c | 14 |
2 files changed, 7 insertions, 9 deletions
diff --git a/ext/rpc/com/com.c b/ext/rpc/com/com.c index 9a8e40587b..7e53392917 100644 --- a/ext/rpc/com/com.c +++ b/ext/rpc/com/com.c @@ -841,7 +841,7 @@ static ZEND_FUNCTION(com_create_guid) ZEND_WRONG_PARAM_COUNT(); } - if (CoCreateGuid(&retval) && StringFromCLSID(&retval, &guid_string)) { + if (CoCreateGuid(&retval) == S_OK && StringFromCLSID(&retval, &guid_string) == S_OK) { Z_TYPE_P(return_value) = IS_STRING; Z_STRVAL_P(return_value) = php_OLECHAR_to_char(guid_string, &Z_STRLEN_P(return_value), CP_ACP, 0); diff --git a/main/streams/streams.c b/main/streams/streams.c index bb72a4f801..d2ef95dda8 100755 --- a/main/streams/streams.c +++ b/main/streams/streams.c @@ -1198,6 +1198,7 @@ PHPAPI size_t _php_stream_copy_to_stream(php_stream *src, php_stream *dest, size size_t readchunk; size_t haveread = 0; size_t didread; + php_stream_statbuf ssbuf; #if HAVE_MMAP int srcfd; #endif @@ -1243,14 +1244,11 @@ PHPAPI size_t _php_stream_copy_to_stream(php_stream *src, php_stream *dest, size } #endif - { - php_stream_statbuf sbuf; - if (php_stream_stat(src, &sbuf TSRMLS_CC) == 0) { - /* in the event that the source file is 0 bytes, return 1 to indicate success - * because opening the file to write had already created a copy */ - if (sbuf.sb.st_size == 0) { - return 1; - } + if (php_stream_stat(src, &ssbuf) == 0) { + /* in the event that the source file is 0 bytes, return 1 to indicate success + * because opening the file to write had already created a copy */ + if (ssbuf.sb.st_size == 0) { + return 1; } } |