PHP-1195: Error out on 32bit platforms if we cannot represent the int

Author: bjori

php_phongo.c

@@ -349,8 +349,13 @@ void phongo_writeresult_init(zval *return_value, const bson_t *bson, int server_
 				php_phongo_objectid_new_from_oid(zid, bson_iter_oid(&outer) TSRMLS_CC);
 				add_index_zval(writeresult->upsertedIds, index, zid);
 			} else if (BSON_ITER_HOLDS_INT64(&outer)) {
-				int val = bson_iter_int64(&outer);
+				int64_t val = bson_iter_int64(&outer);
 
+#if SIZEOF_LONG == 4
+				if (val > INT_MAX) {
+					add_index_long(writeresult->upsertedIds, index, (double)val);
+				} else
+#endif
 				add_index_long(writeresult->upsertedIds, index, val);
 			}
 		}

src/bson.c

@@ -40,7 +40,11 @@
 
 #if SIZEOF_LONG == 8
 #	define BSON_APPEND_INT(b, key, keylen, val) \
-	bson_append_int64(b, key, keylen, val);
+	if (val > INT_MAX || val < INT_MIN) { \
+		bson_append_int64(b, key, keylen, val); \
+	} else { \
+		bson_append_int32(b, key, keylen, val); \
+	}
 #elif SIZEOF_LONG == 4
 #	define BSON_APPEND_INT(b, key, keylen, val) \
 	bson_append_int32(b, key, keylen, val);
@@ -425,6 +429,13 @@ bool php_phongo_bson_visit_int64(const bson_iter_t *iter __attribute__((unused))
 	zval *retval = *(zval **)data;
 	TSRMLS_FETCH();
 
+#if SIZEOF_LONG == 4
+	if (v_int64 > INT_MAX) {
+		mongoc_log(MONGOC_LOG_LEVEL_ERROR, MONGOC_LOG_DOMAIN, "Integer overflow detected on your platform: %lld", v_int64);
+		return false
+	}
+#endif
+
 	if (Z_TYPE_P(retval) == IS_ARRAY) {
 		add_assoc_long(retval, key, v_int64);
 	} else if (Z_TYPE_P(retval) == IS_OBJECT) {