ExternalVendorCode/openwrt
1
0
Fork 0
mirror of https://github.com/openwrt/openwrt.git synced 2025-01-30 08:04:10 +00:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

fritz-tools: fix segfault in caldata-extract

Browse Source 
* Fix incorrect error message in case input file opening fails
 * Don't close files in case the pointers are invalid

Signed-off-by: David Bauer <mail@david-bauer.net>
This commit is contained in:
David Bauer 2023-02-28 19:53:44 +01:00
parent 19817fa3f5
commit 7662700613
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package/utils/fritz-tools/Makefile
View File

@ -1,7 +1,7 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=fritz-tools PKG_NAME:=fritz-tools
PKG_RELEASE:=1 PKG_RELEASE:=2
CMAKE_INSTALL:=1 CMAKE_INSTALL:=1
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk

8
package/utils/fritz-tools/src/fritz_cal_extract.c
View File

@ -210,7 +210,7 @@ int main(int argc, char **argv)
if (argc > 1 && optind <= argc) { if (argc > 1 && optind <= argc) {
in = fopen(argv[optind], "r"); in = fopen(argv[optind], "r");
if (!in) { if (!in) {
perror("Failed to create output file"); perror("Failed to open input file");
goto out_bad; goto out_bad;
} }
} }
@ -253,7 +253,9 @@ out_bad:
ret = EXIT_FAILURE; ret = EXIT_FAILURE;
out: out:
fclose(in); if (in)
fclose(out); fclose(in);
if (out)
fclose(out);
return ret; return ret;
} }