BLAHAJ
/
libsigrok
10
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

resource: Do not require size to stay valid after close 

Chalk one up for uber-correctness, just in case.
This commit is contained in:
Daniel Elstner 2015-10-08 20:51:55 +02:00
parent 0a4549ff18
commit 45d835edc7
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/resource.c
View File

@ -341,6 +341,7 @@ SR_PRIV void *sr_resource_load(struct sr_context *ctx,
{ {
struct sr_resource res; struct sr_resource res;
void *buf; void *buf;
size_t res_size;
ssize_t n_read; ssize_t n_read;
if (sr_resource_open(ctx, &res, type, name) != SR_OK) if (sr_resource_open(ctx, &res, type, name) != SR_OK)
@ -352,17 +353,19 @@ SR_PRIV void *sr_resource_load(struct sr_context *ctx,
sr_resource_close(ctx, &res); sr_resource_close(ctx, &res);
return NULL; return NULL;
} }
buf = g_try_malloc(res.size); res_size = res.size;
buf = g_try_malloc(res_size);
if (!buf) { if (!buf) {
sr_err("Failed to allocate buffer for '%s'.", name); sr_err("Failed to allocate buffer for '%s'.", name);
sr_resource_close(ctx, &res); sr_resource_close(ctx, &res);
return NULL; return NULL;
} }
n_read = sr_resource_read(ctx, &res, buf, res.size); n_read = sr_resource_read(ctx, &res, buf, res_size);
sr_resource_close(ctx, &res); sr_resource_close(ctx, &res);
if (n_read < 0 || (size_t)n_read != res.size) { if (n_read < 0 || (size_t)n_read != res_size) {
if (n_read >= 0) if (n_read >= 0)
sr_err("Failed to read '%s': premature end of file.", sr_err("Failed to read '%s': premature end of file.",
name); name);
@ -370,7 +373,7 @@ SR_PRIV void *sr_resource_load(struct sr_context *ctx,
return NULL; return NULL;
} }
*size = res.size; *size = res_size;
return buf; return buf;
} }