diff options
Diffstat (limited to 'shared.patch')
| -rw-r--r-- | shared.patch | 33 |
1 files changed, 33 insertions, 0 deletions
diff --git a/shared.patch b/shared.patch new file mode 100644 index 0000000..4090070 --- /dev/null +++ b/shared.patch @@ -0,0 +1,33 @@ +diff --git a/source/shared/core_sqlsrv.h b/source/shared/core_sqlsrv.h +index 39e53b1..2d6a357 100644 +--- a/source/shared/core_sqlsrv.h ++++ b/source/shared/core_sqlsrv.h +@@ -2381,10 +2381,7 @@ namespace core { + + inline void sqlsrv_array_init( _Inout_ sqlsrv_context& ctx, _Out_ zval* new_array TSRMLS_DC) + { +- int zr = ::array_init(new_array); +- CHECK_ZEND_ERROR( zr, ctx, SQLSRV_ERROR_ZEND_HASH ) { +- throw CoreException(); +- } ++ array_init(new_array); + } + + inline void sqlsrv_php_stream_from_zval_no_verify( _Inout_ sqlsrv_context& ctx, _Outref_result_maybenull_ php_stream*& stream, _In_opt_ zval* stream_z TSRMLS_DC ) +diff --git a/source/shared/core_util.cpp b/source/shared/core_util.cpp +index c537f76..1f6af42 100644 +--- a/source/shared/core_util.cpp ++++ b/source/shared/core_util.cpp +@@ -353,10 +353,10 @@ void die( _In_opt_ const char* msg, ... ) + DWORD rc = FormatMessage( FORMAT_MESSAGE_FROM_STRING, msg, 0, 0, last_err_msg, sizeof( last_err_msg ), &format_args ); + va_end( format_args ); + if( rc == 0 ) { +- php_error( E_ERROR, reinterpret_cast<const char*>( INTERNAL_FORMAT_ERROR )); ++ php_error( E_ERROR, "%s", reinterpret_cast<const char*>( INTERNAL_FORMAT_ERROR )); + } + +- php_error( E_ERROR, last_err_msg ); ++ php_error( E_ERROR, "%s", last_err_msg ); + } + + namespace { |