aboutsummaryrefslogtreecommitdiffstats
path: root/extension
diff options
context:
space:
mode:
authorArnold D. Robbins <arnold@skeeve.com>2022-02-22 20:15:04 +0200
committerArnold D. Robbins <arnold@skeeve.com>2022-02-22 20:15:04 +0200
commitfa4cc1fb8ba39038e7ee1eba3b9d08bfeddb1f37 (patch)
tree8b84a00505dd10d43b4422e66c44a257681e4086 /extension
parent8d9d0c5ba78546704658351d2d8e9aa626bb0383 (diff)
parent80de2f7c9bc519fb820033a530e1657977117a33 (diff)
downloadegawk-fa4cc1fb8ba39038e7ee1eba3b9d08bfeddb1f37.tar.gz
egawk-fa4cc1fb8ba39038e7ee1eba3b9d08bfeddb1f37.tar.bz2
egawk-fa4cc1fb8ba39038e7ee1eba3b9d08bfeddb1f37.zip
Merge branch 'gawk-5.1-stable'
Diffstat (limited to 'extension')
-rw-r--r--extension/ChangeLog7
-rw-r--r--extension/readfile.c4
2 files changed, 10 insertions, 1 deletions
diff --git a/extension/ChangeLog b/extension/ChangeLog
index 5ce63c68..52cc493c 100644
--- a/extension/ChangeLog
+++ b/extension/ChangeLog
@@ -1,3 +1,10 @@
+2022-02-22 Arnold D. Robbins <arnold@skeeve.com>
+
+ Fix resource links found by Coverity. Thanks to
+ Jakub Martisko <jamartis@redhat.com> for the report.
+
+ * readfile.c (do_readfile): Close fd if text == NULL.
+
2021-12-10 Arnold D. Robbins <arnold@skeeve.com>
* rwarray.c (write_number, read_number): Reformat comments a bit.
diff --git a/extension/readfile.c b/extension/readfile.c
index 6c3307cd..def414ee 100644
--- a/extension/readfile.c
+++ b/extension/readfile.c
@@ -121,8 +121,10 @@ do_readfile(int nargs, awk_value_t *result, struct awk_ext_func *unused)
}
text = read_file_to_buffer(fd, & sbuf);
- if (text == NULL)
+ if (text == NULL) {
+ close(fd);
goto done; /* ERRNO already updated */
+ }
close(fd);
make_malloced_string(text, sbuf.st_size, result);