Index: src/libical/icallangbind.c
===================================================================
--- src/libical/icallangbind.c	(revision 928)
+++ src/libical/icallangbind.c	(working copy)
@@ -160,8 +160,8 @@
 {
     char tmp[25];
     size_t buf_size = 1024;
-    char* buf = icalmemory_new_buffer(buf_size);
-    char* buf_ptr = buf;
+    char* buf; 
+    char* buf_ptr; 
     icalparameter *param;
     
     icalvalue* value;
@@ -169,6 +169,9 @@
     if( prop == 0){
 	return 0;
     }
+  
+    buf = icalmemory_new_buffer(buf_size);
+    buf_ptr = buf;
 
     APPENDS("{ ");
 
Index: src/libical/icalvalue.c
===================================================================
--- src/libical/icalvalue.c	(revision 928)
+++ src/libical/icalvalue.c	(working copy)
@@ -766,9 +766,10 @@
     
 static char* icalvalue_int_as_ical_string_r(const icalvalue* value) {
     int data;
-    char* str = (char*)icalmemory_new_buffer(MAX_INT_DIGITS); 
+    char* str;
 
     icalerror_check_arg_rz( (value!=0),"value");
+    str = (char*)icalmemory_new_buffer(MAX_INT_DIGITS); 
 
     data = icalvalue_get_integer(value);
 	
@@ -782,10 +783,11 @@
 {    
     int data,h,m,s;
     char sign;
-    char* str = (char*)icalmemory_new_buffer(9);
+    char* str;
 
     icalerror_check_arg_rz( (value!=0),"value");
 
+    str = (char*)icalmemory_new_buffer(9);
     data = icalvalue_get_utcoffset(value);
 
     if (abs(data) == data){
Index: src/libical/icalproperty.c
===================================================================
--- src/libical/icalproperty.c	(revision 928)
+++ src/libical/icalproperty.c	(working copy)
@@ -174,14 +174,17 @@
 {
 
     size_t buf_size = 1024;
-    char* buf = icalmemory_new_buffer(buf_size);
-    char* buf_ptr = buf;  
+    char* buf;
+    char* buf_ptr;
     icalproperty *prop;
     icalcomponent *comp;
     int errors  = 0;
 
     icalerror_check_arg_rz( (str!=0),"str");
 
+    buf = icalmemory_new_buffer(buf_size);
+    buf_ptr = buf;
+
     /* Is this a HACK or a crafty reuse of code? */
 
     icalmemory_append_string(&buf, &buf_ptr, &buf_size, "BEGIN:VCALENDAR\r\n");
@@ -432,8 +435,8 @@
 
     const char* property_name = 0; 
     size_t buf_size = 1024;
-    char* buf = icalmemory_new_buffer(buf_size);
-    char* buf_ptr = buf;
+    char* buf;
+    char* buf_ptr;
     icalvalue* value;
     char *out_buf;
     const char* kind_string = 0;
@@ -442,6 +445,8 @@
     
     icalerror_check_arg_rz( (prop!=0),"prop");
 
+    buf = icalmemory_new_buffer(buf_size);
+    buf_ptr = buf;
 
     /* Append property name */
 
@@ -999,10 +1004,13 @@
 
     const char* property_name = 0;
     size_t buf_size = 256;
-    char* buf = icalmemory_new_buffer(buf_size);
-    char* buf_ptr = buf;  
+    char* buf;
+    char* buf_ptr;
 
     icalerror_check_arg_rz( (prop!=0),"prop");
+
+    buf = icalmemory_new_buffer(buf_size);
+    buf_ptr = buf;
  
     if (prop->kind == ICAL_X_PROPERTY && prop->x_name != 0){
         property_name = prop->x_name;