Raspberries/mraa
Private
Public Access
2
0
Fork 0
Code Activity

mraa.c: Fix error handing resource leaks in mraa_file_contains_*

Browse Source 
Signed-off-by: Brendan Le Foll <brendan.le.foll@intel.com>
This commit is contained in:
Brendan Le Foll
2015-08-14 15:36:50 +01:00
parent 8390c5cfb7
commit 0ad753689e
1 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/mraa.c
View File

@@ -355,8 +355,14 @@ mraa_file_contains(const char* filename, const char* content)
if (file != NULL) { if (file != NULL) {
size_t len = 1024; size_t len = 1024;
char* line = malloc(len); char* line = malloc(len);
if (line == NULL) {
close(file);
return 0;
}
FILE* fh = fopen(file, "r"); FILE* fh = fopen(file, "r");
if (fh == NULL) { if (fh == NULL) {
close(file);
free(line);
return 0; return 0;
} }
while ((getline(&line, &len, fh) != -1) && (found == 0)) { while ((getline(&line, &len, fh) != -1) && (found == 0)) {
@@ -384,8 +390,14 @@ mraa_file_contains_both(const char* filename, const char* content, const char* c
if (file != NULL) { if (file != NULL) {
size_t len = 1024; size_t len = 1024;
char* line = malloc(len); char* line = malloc(len);
if (line == NULL) {
close(file);
return 0;
}
FILE* fh = fopen(file, "r"); FILE* fh = fopen(file, "r");
if (fh == NULL) { if (fh == NULL) {
close(file);
free(line);
return 0; return 0;
} }
while ((getline(&line, &len, fh) != -1) && (found == 0)) { while ((getline(&line, &len, fh) != -1) && (found == 0)) {