comparison: libpurple/protocols/zephyr/ZAsyncLocate.c
libpurple/protocols/zephyr/ZAsyncLocate.c
- changeset 31954
- e5631d5590cc
- parent 31294
- 73607ab89c6f
- child 31955
- 384153346831
equal
deleted
inserted
replaced
| 31953:39e3351b5970 | 31954:e5631d5590cc |
|---|---|
| 43 if ((zald->version = (char *) malloc(strlen(notice.z_version)+1)) == NULL) { | 43 if ((zald->version = (char *) malloc(strlen(notice.z_version)+1)) == NULL) { |
| 44 free(zald->user); | 44 free(zald->user); |
| 45 return(ENOMEM); | 45 return(ENOMEM); |
| 46 } | 46 } |
| 47 zald->uid = notice.z_multiuid; | 47 zald->uid = notice.z_multiuid; |
| 48 strcpy(zald->user,user); | 48 g_strlcpy(zald->user,user,strlen(user)+1); |
| 49 strcpy(zald->version,notice.z_version); | 49 g_strlcpy(zald->version,notice.z_version,strlen(notice.z_version)+1); |
| 50 | 50 |
| 51 return(ZERR_NONE); | 51 return(ZERR_NONE); |
| 52 } | 52 } |
| 53 | 53 |
| 54 Code_t ZParseLocations(notice,zald,nlocs,user) | 54 Code_t ZParseLocations(notice,zald,nlocs,user) |
| 107 | 107 |
| 108 len = strlen (ptr) + 1; | 108 len = strlen (ptr) + 1; |
| 109 __locate_list[i].host = (char *) malloc(len); | 109 __locate_list[i].host = (char *) malloc(len); |
| 110 if (!__locate_list[i].host) | 110 if (!__locate_list[i].host) |
| 111 return (ENOMEM); | 111 return (ENOMEM); |
| 112 (void) strcpy(__locate_list[i].host, ptr); | 112 g_strlcpy(__locate_list[i].host, ptr,len); |
| 113 ptr += len; | 113 ptr += len; |
| 114 | 114 |
| 115 len = strlen (ptr) + 1; | 115 len = strlen (ptr) + 1; |
| 116 __locate_list[i].time = (char *) malloc(len); | 116 __locate_list[i].time = (char *) malloc(len); |
| 117 if (!__locate_list[i].time) | 117 if (!__locate_list[i].time) |
| 118 return (ENOMEM); | 118 return (ENOMEM); |
| 119 (void) strcpy(__locate_list[i].time, ptr); | 119 g_strlcpy(__locate_list[i].time, ptr,len); |
| 120 ptr += len; | 120 ptr += len; |
| 121 | 121 |
| 122 len = strlen (ptr) + 1; | 122 len = strlen (ptr) + 1; |
| 123 __locate_list[i].tty = (char *) malloc(len); | 123 __locate_list[i].tty = (char *) malloc(len); |
| 124 if (!__locate_list[i].tty) | 124 if (!__locate_list[i].tty) |
| 125 return (ENOMEM); | 125 return (ENOMEM); |
| 126 (void) strcpy(__locate_list[i].tty, ptr); | 126 g_strlcpy(__locate_list[i].tty, ptr,len); |
| 127 ptr += len; | 127 ptr += len; |
| 128 } | 128 } |
| 129 | 129 |
| 130 __locate_next = 0; | 130 __locate_next = 0; |
| 131 *nlocs = __locate_num; | 131 *nlocs = __locate_num; |
| 132 if (user) { | 132 if (user) { |
| 133 if (zald) { | 133 if (zald) { |
| 134 if ((*user = (char *) malloc(strlen(zald->user)+1)) == NULL) | 134 if ((*user = (char *) malloc(strlen(zald->user)+1)) == NULL) |
| 135 return(ENOMEM); | 135 return(ENOMEM); |
| 136 strcpy(*user,zald->user); | 136 g_strlcpy(*user,zald->user,strlen(zald->user)+1); |
| 137 } else { | 137 } else { |
| 138 if ((*user = (char *) malloc(strlen(notice->z_class_inst)+1)) == NULL) | 138 if ((*user = (char *) malloc(strlen(notice->z_class_inst)+1)) == NULL) |
| 139 return(ENOMEM); | 139 return(ENOMEM); |
| 140 strcpy(*user,notice->z_class_inst); | 140 g_strlcpy(*user,notice->z_class_inst,strlen(notice->z_class_inst)+1); |
| 141 } | 141 } |
| 142 } | 142 } |
| 143 return (ZERR_NONE); | 143 return (ZERR_NONE); |
| 144 } | 144 } |
| 145 | 145 |
