dprevot/php-sqlsrv
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

More safe guards against anomalous results (#1160)

Browse source
This commit is contained in:
Jenny Tam 2020-07-20 12:58:23 -07:00 committed by GitHub
parent 61f87aacf6
commit 550a7104a4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 20 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
source/shared/core_conn.cpp
View file

@ -813,7 +813,7 @@ void build_connection_string_and_set_conn_attr( _Inout_ sqlsrv_conn* conn, _Inou
option = Z_STRVAL_P(auth_option); option = Z_STRVAL_P(auth_option);
} }
if (!stricmp(option, AzureADOptions::AZURE_AUTH_AD_MSI)) { if (option != NULL && !stricmp(option, AzureADOptions::AZURE_AUTH_AD_MSI)) {
activeDirectoryMSI = true; activeDirectoryMSI = true;
// There are two types of managed identities: // There are two types of managed identities:

3
source/shared/core_sqlsrv.h
View file

@ -397,7 +397,8 @@ inline void* sqlsrv_malloc( _In_ size_t element_count, _In_ size_t element_size,
DIE( "Integer overflow in sqlsrv_malloc" ); DIE( "Integer overflow in sqlsrv_malloc" );
} }
if( element_size * element_count + extra == 0 ) { // safeguard against anomalous calculation or any arithmetic overflow
if( element_size * element_count + extra <= 0 ) {
DIE( "Allocation size must be more than 0" ); DIE( "Allocation size must be more than 0" );
} }

5
test/functional/sqlsrv/sqlsrv_fetch_object.phpt
View file

@ -223,12 +223,11 @@ else {
echo "Past the end of the result set (7)\n"; echo "Past the end of the result set (7)\n";
$obj = sqlsrv_fetch_object( $stmt, "foo" ); $obj = sqlsrv_fetch_object( $stmt, "foo" );
if( $obj === false ) { if( $obj === false ) {
die( print_r( sqlsrv_errors(), true )); print_r( sqlsrv_errors());
} }
if( is_null( $obj )) { if( is_null( $obj )) {
echo "Done fetching objects.\n"; echo "Done fetching objects.\n";
} } elseif ($obj) {
else {
$obj->do_foo(); $obj->do_foo();
print_r( $obj ); print_r( $obj );
} }

5
test/functional/sqlsrv/sqlsrv_fetch_object_2.phpt
View file

@ -227,12 +227,11 @@ else {
echo "Past the end of the result set (7)\n"; echo "Past the end of the result set (7)\n";
$obj = sqlsrv_fetch_object( $stmt, "foo" ); $obj = sqlsrv_fetch_object( $stmt, "foo" );
if( $obj === false ) { if( $obj === false ) {
die( print_r( sqlsrv_errors(), true )); print_r( sqlsrv_errors());
} }
if( is_null( $obj )) { if( is_null( $obj )) {
echo "Done fetching objects.\n"; echo "Done fetching objects.\n";
} } elseif ($obj) {
else {
$obj->do_foo(); $obj->do_foo();
print_r( $obj ); print_r( $obj );
} }

4
test/functional/sqlsrv/sqlsrv_fetch_object_unicode_col_name1.phpt
View file

@ -220,11 +220,11 @@ if (is_null($obj)) {
echo "Past the end of the result set (7)\n"; echo "Past the end of the result set (7)\n";
$obj = sqlsrv_fetch_object($stmt, "foo"); $obj = sqlsrv_fetch_object($stmt, "foo");
if ($obj === false) { if ($obj === false) {
die(print_r(sqlsrv_errors(), true)); print_r( sqlsrv_errors());
} }
if (is_null($obj)) { if (is_null($obj)) {
echo "Done fetching objects.\n"; echo "Done fetching objects.\n";
} else { } elseif ($obj) {
$obj->do_foo(); $obj->do_foo();
print_r($obj); print_r($obj);
} }

19
test/functional/sqlsrv/srv_053_mars_disabled_error_checks.phpt
View file

@ -13,20 +13,22 @@ if (!$conn) {
} }
// Query // Query
$stmt1 = sqlsrv_query($conn, "SELECT 'ONE'") ?: die(print_r(sqlsrv_errors(), true)); $stmt1 = sqlsrv_query($conn, "SELECT 'ONE'");
if (!$stmt1) {
print_r(sqlsrv_errors());
}
sqlsrv_fetch($stmt1); sqlsrv_fetch($stmt1);
// Query. Returns if multiple result sets are disabled // Query. Returns if multiple result sets are disabled
$stmt2 = sqlsrv_query($conn, "SELECT 'TWO'") ?: die(print_r(sqlsrv_errors(), true)); $stmt2 = sqlsrv_query($conn, "SELECT 'TWO'");
sqlsrv_fetch($stmt2); if ($stmt2) {
echo "Expect case 2 to fail\n";
// Print the data } else {
$res = [ sqlsrv_get_field($stmt1, 0), sqlsrv_get_field($stmt2, 0) ]; print_r(sqlsrv_errors());
var_dump($res); }
// Free statement and connection resources // Free statement and connection resources
sqlsrv_free_stmt($stmt1); sqlsrv_free_stmt($stmt1);
sqlsrv_free_stmt($stmt2);
sqlsrv_close($conn); sqlsrv_close($conn);
print "Done" print "Done"
@ -56,3 +58,4 @@ Array
\) \)
\) \)
Done