Changeset 136 for trunk/src/common.c
- Timestamp:
- 01/23/09 12:29:51 (16 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/common.c
r134 r136 52 52 53 53 unsigned int buf_len = sizeof(char)*(len+1); 54 char* ret_val = malloc(buf_len);54 char* ret_val = NULL; 55 55 char* tmp_buf; 56 56 57 if(buf_len > 0) 58 ret_val = malloc(buf_len); 57 59 if(ret_val == NULL) 58 60 return NULL; … … 155 157 { 156 158 char* ret_val; 157 char* ascii ;159 char* ascii = NULL; 158 160 char* tmp_err; 159 161 int ret_err; 160 162 *error_msg = NULL; 161 163 162 ascii = malloc(length+1); 164 if(length+1 > 0) 165 ascii = malloc(length+1); 163 166 if(ascii == NULL) 164 167 { … … 175 178 free(ascii); 176 179 tmp_err = strerror(-ret_err); 177 *error_msg = (char*)malloc( 54+strlen(tmp_err));180 *error_msg = (char*)malloc(61+strlen(tmp_err)); 178 181 if(*error_msg == NULL) 179 { 180 free(ascii); 181 return NULL; 182 } 182 return NULL; 183 183 184 184 sprintf(*error_msg, … … 305 305 { 306 306 tmp_err = strerror(-ret_err); 307 *error_msg = (char*)malloc( 54+strlen(tmp_err));307 *error_msg = (char*)malloc(61+strlen(tmp_err)); 308 308 if(*error_msg == NULL) 309 { 310 free(ascii_tmp); 309 311 return NULL; 312 } 313 310 314 sprintf(*error_msg, "MULTI_SZ unicode conversion" 311 315 " failed with '%s'. Quoting as binary.", tmp_err);
Note: See TracChangeset
for help on using the changeset viewer.