Index: Zend/zend_alloc.c
===================================================================
RCS file: /repository/ZendEngine2/zend_alloc.c,v
retrieving revision 1.214
diff -u -r1.214 zend_alloc.c
--- Zend/zend_alloc.c	21 Jul 2008 17:06:16 -0000	1.214
+++ Zend/zend_alloc.c	24 Jul 2008 10:40:03 -0000
@@ -2402,6 +2402,23 @@
         return res;
 }
 
+#elif defined(_MSC_VER) && defined(_M_IX86) && 0
+
+/* Assembly version for Windows? */
+
+#elif SIZEOF_LONG == 4 && defined(HAVE_ZEND_LONG64) && !defined(_WIN64)
+
+static inline size_t safe_address(size_t nmemb, size_t size, size_t offset)
+{
+	zend_ulong64 res = (zend_ulong64)nmemb * (zend_ulong64)size + (zend_ulong64)offset;
+
+	if (UNEXPECTED(res > SIZE_MAX)) {
+		zend_error_noreturn(E_ERROR, "Possible integer overflow in memory allocation (%zu * %zu + %zu)", nmemb, size, offset);
+		return 0;
+	}
+	return (size_t) res;
+}
+
 #else
 
 static inline size_t safe_address(size_t nmemb, size_t size, size_t offset) /* {{{ */
Index: Zend/zend_multiply.h
===================================================================
RCS file: /repository/ZendEngine2/zend_multiply.h,v
retrieving revision 1.14
diff -u -r1.14 zend_multiply.h
--- Zend/zend_multiply.h	31 Dec 2007 07:12:07 -0000	1.14
+++ Zend/zend_multiply.h	17 Jul 2008 12:50:10 -0000
@@ -31,6 +31,23 @@
 	else (lval) = __tmpvar;											\
 } while (0)
 
+#elif defined(_MSC_VER) && defined(_M_IX86) && 0
+
+/* Assembly version for Windows? */
+
+#elif SIZEOF_LONG == 4 && defined(HAVE_ZEND_LONG64)
+
+#define ZEND_SIGNED_MULTIPLY_LONG(a, b, lval, dval, usedval) do {	\
+	zend_long64 __result = (zend_long64) (a) * (zend_long64) (b);	\
+	if (__result > LONG_MAX || __result < LONG_MIN) {				\
+		(dval) = (double) __result;									\
+		(usedval) = 1;												\
+	} else {														\
+		(lval) = (long) __result;									\
+		(usedval) = 0;												\
+	}																\
+} while (0)
+
 #else
 
 #define ZEND_SIGNED_MULTIPLY_LONG(a, b, lval, dval, usedval) do {		\
Index: Zend/zend_types.h
===================================================================
RCS file: /repository/ZendEngine2/zend_types.h,v
retrieving revision 1.12
diff -u -r1.12 zend_types.h
--- Zend/zend_types.h	31 Dec 2007 07:12:07 -0000	1.12
+++ Zend/zend_types.h	17 Jul 2008 12:48:51 -0000
@@ -28,6 +28,20 @@
 typedef unsigned long zend_ulong;
 typedef unsigned short zend_ushort;
 
+#define HAVE_ZEND_LONG64
+#ifdef ZEND_WIN32
+typedef __int64 zend_long64;
+typedef unsigned __int64 zend_ulong64;
+#elif SIZEOF_LONG_LONG_INT == 8
+typedef long long int zend_long64;
+typedef unsigned long long int zend_ulong64;
+#elif SIZEOF_LONG_LONG == 8
+typedef long long zend_long64;
+typedef unsigned long long zend_ulong64;
+#else
+#undef HAVE_ZEND_LONG64
+#endif
+
 #ifdef _WIN64
 typedef __int64 zend_intptr_t;
 typedef unsigned __int64 zend_uintptr_t;