mirrors/netsurf
1
0
Fork 0
mirror of https://github.com/netsurf-browser/netsurf synced 2025-02-16 22:43:58 +03:00
Code Issues Packages Projects Releases Wiki Activity

ensure correct cleanup of user list sentinal in content clone

Browse Source
This commit is contained in:
Vincent Sanders 2013-05-04 16:50:59 +01:00
parent c3530a0c39
commit 7e2a93bb72
1 changed files with 14 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
content/content.c
View File

@ -1328,40 +1328,33 @@ struct content *content_clone(struct content *c)
*/ */
nserror content__clone(const struct content *c, struct content *nc) nserror content__clone(const struct content *c, struct content *nc)
{ {
struct content_user *user_sentinel;
nserror error; nserror error;
user_sentinel = calloc(1, sizeof(struct content_user));
if (user_sentinel == NULL) {
return NSERROR_NOMEM;
}
error = llcache_handle_clone(c->llcache, &(nc->llcache)); error = llcache_handle_clone(c->llcache, &(nc->llcache));
if (error != NSERROR_OK) { if (error != NSERROR_OK) {
free(user_sentinel);
return error; return error;
} }
llcache_handle_change_callback(nc->llcache, llcache_handle_change_callback(nc->llcache,
content_llcache_callback, nc); content_llcache_callback, nc);
nc->mime_type = lwc_string_ref(c->mime_type); nc->mime_type = lwc_string_ref(c->mime_type);
nc->handler = c->handler; nc->handler = c->handler;
nc->status = c->status; nc->status = c->status;
nc->width = c->width; nc->width = c->width;
nc->height = c->height; nc->height = c->height;
nc->available_width = c->available_width; nc->available_width = c->available_width;
nc->quirks = c->quirks; nc->quirks = c->quirks;
if (c->fallback_charset != NULL) { if (c->fallback_charset != NULL) {
nc->fallback_charset = strdup(c->fallback_charset); nc->fallback_charset = strdup(c->fallback_charset);
if (nc->fallback_charset == NULL) { if (nc->fallback_charset == NULL) {
return NSERROR_NOMEM; return NSERROR_NOMEM;
} }
} }
if (c->refresh != NULL) { if (c->refresh != NULL) {
nc->refresh = nsurl_ref(c->refresh); nc->refresh = nsurl_ref(c->refresh);
if (nc->refresh == NULL) { if (nc->refresh == NULL) {
@ -1372,21 +1365,24 @@ nserror content__clone(const struct content *c, struct content *nc)
nc->time = c->time; nc->time = c->time;
nc->reformat_time = c->reformat_time; nc->reformat_time = c->reformat_time;
nc->size = c->size; nc->size = c->size;
if (c->title != NULL) { if (c->title != NULL) {
nc->title = strdup(c->title); nc->title = strdup(c->title);
if (nc->title == NULL) { if (nc->title == NULL) {
return NSERROR_NOMEM; return NSERROR_NOMEM;
} }
} }
nc->active = c->active; nc->active = c->active;
nc->user_list = user_sentinel; nc->user_list = calloc(1, sizeof(struct content_user));
if (nc->user_list == NULL) {
return NSERROR_NOMEM;
}
memcpy(&(nc->status_message), &(c->status_message), 120); memcpy(&(nc->status_message), &(c->status_message), 120);
memcpy(&(nc->sub_status), &(c->sub_status), 80); memcpy(&(nc->sub_status), &(c->sub_status), 80);
nc->locked = c->locked; nc->locked = c->locked;
nc->total_size = c->total_size; nc->total_size = c->total_size;
nc->http_code = c->http_code; nc->http_code = c->http_code;