Skip to content

[pull] master from php:master #584

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Feb 1, 2025
Merged

[pull] master from php:master #584

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f1702d2
Suppress MSVC C4995 warnings (deprecations)
cmb69 Feb 1, 2025
e306a2e
Add missing NULL checks in dbstmt_get_gc
ndossche Feb 1, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions ext/pdo/pdo_stmt.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1965,9 +1965,13 @@ static HashTable *dbstmt_get_gc(zend_object *object, zval **gc_data, int *gc_cou
enum pdo_fetch_type default_fetch_mode = stmt->default_fetch_type & ~PDO_FETCH_FLAGS;

zend_get_gc_buffer *gc_buffer = zend_get_gc_buffer_create();
zend_get_gc_buffer_add_obj(gc_buffer, stmt->database_object_handle);
if (stmt->database_object_handle) {
zend_get_gc_buffer_add_obj(gc_buffer, stmt->database_object_handle);
}
if (default_fetch_mode == PDO_FETCH_INTO) {
zend_get_gc_buffer_add_obj(gc_buffer, stmt->fetch.into);
if (stmt->fetch.into) {
zend_get_gc_buffer_add_obj(gc_buffer, stmt->fetch.into);
}
} else if (default_fetch_mode == PDO_FETCH_CLASS && stmt->fetch.cls.ctor_args != NULL) {
zend_get_gc_buffer_add_ht(gc_buffer, stmt->fetch.cls.ctor_args);
}
Expand Down
4 changes: 2 additions & 2 deletions win32/build/confutils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3269,9 +3269,9 @@ function toolset_setup_common_cflags()
// disable annoying warnings. In addition, time_t defaults
// to 64-bit. Ask for 32-bit.
if (TARGET_ARCH == 'x86') {
ADD_FLAG('CFLAGS', ' /wd4996 /D_USE_32BIT_TIME_T=1 ');
ADD_FLAG('CFLAGS', ' /wd4995 /wd4996 /D_USE_32BIT_TIME_T=1 ');
} else {
ADD_FLAG('CFLAGS', ' /wd4996 ');
ADD_FLAG('CFLAGS', ' /wd4995 /wd4996 ');
}

if (PHP_DEBUG == "yes") {
Expand Down