diff --git a/ext/pdo/pdo_stmt.c b/ext/pdo/pdo_stmt.c
index bf7936f94521d..0b779f6562781 100644
--- a/ext/pdo/pdo_stmt.c
+++ b/ext/pdo/pdo_stmt.c
@@ -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);
 	}
diff --git a/win32/build/confutils.js b/win32/build/confutils.js
index 5a03ea1020594..0f97a1a2d29c6 100644
--- a/win32/build/confutils.js
+++ b/win32/build/confutils.js
@@ -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") {