aboutsummaryrefslogtreecommitdiffstats
path: root/extension/readfile.c
diff options
context:
space:
mode:
authorAndrew J. Schorr <aschorr@telemetry-investments.com>2017-06-22 11:02:08 -0400
committerAndrew J. Schorr <aschorr@telemetry-investments.com>2017-06-22 11:02:08 -0400
commit0ac746db72a0879bbd44325fe15b3ae33c63ecef (patch)
treeaf8cd0d741b92fc279a59ea885182e95db7baa5c /extension/readfile.c
parent288b15d0793936fa14b51ed860056f6ce6200c52 (diff)
downloadegawk-0ac746db72a0879bbd44325fe15b3ae33c63ecef.tar.gz
egawk-0ac746db72a0879bbd44325fe15b3ae33c63ecef.tar.bz2
egawk-0ac746db72a0879bbd44325fe15b3ae33c63ecef.zip
In readfile extension, no need to zero out the buffer before overwriting it.
Diffstat (limited to 'extension/readfile.c')
-rw-r--r--extension/readfile.c14
1 files changed, 6 insertions, 8 deletions
diff --git a/extension/readfile.c b/extension/readfile.c
index f470237b..b600f27a 100644
--- a/extension/readfile.c
+++ b/extension/readfile.c
@@ -73,24 +73,22 @@ int plugin_is_GPL_compatible;
static char *
read_file_to_buffer(int fd, const struct stat *sbuf)
{
- char *text = NULL;
- int ret;
+ char *text;
if ((sbuf->st_mode & S_IFMT) != S_IFREG) {
errno = EINVAL;
update_ERRNO_int(errno);
- goto done;
+ return NULL;
}
- ezalloc(text, char *, sbuf->st_size + 1, "do_readfile");
+ emalloc(text, char *, sbuf->st_size + 1, "do_readfile");
- if ((ret = read(fd, text, sbuf->st_size)) != sbuf->st_size) {
+ if (read(fd, text, sbuf->st_size) != sbuf->st_size) {
update_ERRNO_int(errno);
gawk_free(text);
- text = NULL;
- /* fall through to return */
+ return NULL;
}
-done:
+ text[sbuf->st_size] = '\0';
return text;
}