davidg Fri Feb 23 16:48:44 2001 EDT
Modified files:
/php4/ext/midgard mgd_preparser.h
Log:
Fixed some potential and real segfaults.
Index: php4/ext/midgard/mgd_preparser.h
diff -u php4/ext/midgard/mgd_preparser.h:1.4 php4/ext/midgard/mgd_preparser.h:1.5
--- php4/ext/midgard/mgd_preparser.h:1.4 Tue Feb 20 03:29:52 2001
+++ php4/ext/midgard/mgd_preparser.h Fri Feb 23 16:48:43 2001
@@ -1,4 +1,4 @@
-/* $Id: mgd_preparser.h,v 1.4 2001/02/20 11:29:52 emile Exp $
+/* $Id: mgd_preparser.h,v 1.5 2001/02/24 00:48:43 davidg Exp $
Copyright (C) 1999 Jukka Zitting <[EMAIL PROTECTED]>
Copyright (C) 2000 The Midgard Project ry
Copyright (C) 2000 Emile Heyns, Aurora SA <[EMAIL PROTECTED]>
@@ -43,15 +43,15 @@
} \
}
-#define mgd_free_buffer(buffer) g_byte_array_free((buffer), TRUE)
-#define mgd_append_buffer(buffer, str) if(strlen(str) > 0 )\
- g_byte_array_append((buffer), (str), strlen(str));
-#define mgd_append_output_buffer_const(str) if(sizeof(str) > 0 )\
- g_byte_array_append(mgd_output_buffer, (str), (sizeof(str) == 1) ? 1 :
sizeof(str)-1 );
-#define mgd_append_output_buffer(str) if(strlen(str) > 0 )\
- g_byte_array_append(mgd_output_buffer, (str), strlen(str));
-#define mgd_append_output_buffer_data(gstr) if((gstr)->len > 0 )\
- g_byte_array_append(mgd_output_buffer, (gstr)->data, (gstr)->len);
+#define mgd_free_buffer(buffer) {if(buffer) g_byte_array_free((buffer), TRUE);}
+#define mgd_append_buffer(buffer, str) { if(str && strlen(str) > 0 )\
+ g_byte_array_append((buffer), (str), strlen(str)); }
+#define mgd_append_output_buffer_const(str) { if(sizeof(str) > 0 )\
+ g_byte_array_append(mgd_output_buffer, (str), (sizeof(str) == 1) ? 1 :
+sizeof(str)-1 ); }
+#define mgd_append_output_buffer(str) { if(str && strlen(str) > 0 )\
+ g_byte_array_append(mgd_output_buffer, (str), strlen(str)); }
+#define mgd_append_output_buffer_data(gstr) { if(gstr && (gstr)->len > 0 )\
+ g_byte_array_append(mgd_output_buffer, (gstr)->data, (gstr)->len); }
//#define MGD_PREPARSER_LOG
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
To contact the list administrators, e-mail: [EMAIL PROTECTED]
