--- embedaddon/php/ext/intl/spoofchecker/spoofchecker_class.h	2012/05/29 12:34:40	1.1.1.1
+++ embedaddon/php/ext/intl/spoofchecker/spoofchecker_class.h	2013/07/22 01:31:52	1.1.1.2
@@ -22,6 +22,7 @@
 #include "intl_common.h"
 #include "spoofchecker_create.h"
 #include "intl_error.h"
+#include "intl_data.h"
 
 #include <unicode/uspoof.h>
 
@@ -55,9 +56,14 @@ extern zend_class_entry *Spoofchecker_ce_ptr;
     Spoofchecker_object*  co  = NULL;   \
     intl_error_reset(NULL TSRMLS_CC); \
 
-#define SPOOFCHECKER_METHOD_FETCH_OBJECT                                           \
-    co = (Spoofchecker_object *) zend_object_store_get_object(object TSRMLS_CC); \
-    intl_error_reset(SPOOFCHECKER_ERROR_P(co) TSRMLS_CC);                      \
+#define SPOOFCHECKER_METHOD_FETCH_OBJECT_NO_CHECK	INTL_METHOD_FETCH_OBJECT(Spoofchecker, co)
+#define SPOOFCHECKER_METHOD_FETCH_OBJECT							\
+	SPOOFCHECKER_METHOD_FETCH_OBJECT_NO_CHECK;						\
+	if (co->uspoof == NULL)	{										\
+		intl_errors_set(&co->err, U_ILLEGAL_ARGUMENT_ERROR,			\
+				"Found unconstructed Spoofchecker", 0 TSRMLS_CC);	\
+		RETURN_FALSE;												\
+	}
 
 // Macro to check return value of a ucol_* function call.
 #define SPOOFCHECKER_CHECK_STATUS(co, msg)                                        \