phanto Thu Feb 20 06:34:27 2003 EDT
Modified files: (Branch: PHP_4_3)
/php4/ext/com variant.h
Log:
fixing bugs #22295, #22218 and #22162 (duplicates)
Index: php4/ext/com/variant.h
diff -u php4/ext/com/variant.h:1.4.4.1 php4/ext/com/variant.h:1.4.4.2
--- php4/ext/com/variant.h:1.4.4.1 Tue Jan 28 19:10:01 2003
+++ php4/ext/com/variant.h Thu Feb 20 06:34:26 2003
@@ -12,15 +12,19 @@
#define IS_VARIANT php_VARIANT_get_le_variant()
-#define ZVAL_VARIANT(z, v) if (V_VT(v) == VT_DISPATCH) {
\
- comval *obj;
\
-
ALLOC_COM(obj);
\
-
php_COM_set(obj, &V_DISPATCH(v), TRUE TSRMLS_CC); \
- ZVAL_COM((z),
obj); \
- efree(v);
\
- } else {
\
-
php_variant_to_pval((v), (z), codepage TSRMLS_CC); \
-
FREE_VARIANT(v);
\
+#define ZVAL_VARIANT(z, v) if (V_VT(v) == VT_DISPATCH) { \
+ if
+(V_DISPATCH(v)) { \
+ comval
+*obj; \
+
+ALLOC_COM(obj); \
+
+php_COM_set(obj, &V_DISPATCH(v), TRUE TSRMLS_CC); \
+
+ZVAL_COM((z), obj); \
+
+efree(v); \
+ } else { \
+
+ZVAL_NULL(z); \
+ } \
+ } else { \
+
+php_variant_to_pval((v), (z), codepage TSRMLS_CC); \
+
+FREE_VARIANT(v); \
}
#define RETVAL_VARIANT(v) ZVAL_VARIANT(return_value, (v));-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
