|
 |
b12e4c |
From 34b7778028ab60dd3079a2ad3e1df23e87c8708f Mon Sep 17 00:00:00 2001
|
|
|
b12e4c |
From: Ernestas Kulik <ekulik@redhat.com>
|
|
|
b12e4c |
Date: Wed, 29 May 2019 09:17:02 +0200
|
|
|
b12e4c |
Subject: [PATCH] =?UTF-8?q?lib:=20file=5Fobj:=20Don=E2=80=99t=20dereferenc?=
|
|
|
b12e4c |
=?UTF-8?q?e=20null=20pointers?=
|
|
|
b12e4c |
MIME-Version: 1.0
|
|
|
b12e4c |
Content-Type: text/plain; charset=UTF-8
|
|
|
b12e4c |
Content-Transfer-Encoding: 8bit
|
|
|
b12e4c |
|
|
|
b12e4c |
And, amazingly, someone forgot a semicolon after a return statement in
|
|
|
b12e4c |
such a fix.
|
|
|
b12e4c |
|
|
|
b12e4c |
Signed-off-by: Ernestas Kulik <ekulik@redhat.com>
|
|
|
b12e4c |
---
|
|
|
b12e4c |
src/lib/file_obj.c | 8 ++++++--
|
|
|
b12e4c |
1 file changed, 6 insertions(+), 2 deletions(-)
|
|
|
b12e4c |
|
|
|
b12e4c |
diff --git a/src/lib/file_obj.c b/src/lib/file_obj.c
|
|
|
b12e4c |
index bbb5b9f..aa973b1 100644
|
|
|
b12e4c |
--- a/src/lib/file_obj.c
|
|
|
b12e4c |
+++ b/src/lib/file_obj.c
|
|
|
b12e4c |
@@ -30,7 +30,7 @@ file_obj_t *new_file_obj(const char* fullpath, const char* filename)
|
|
|
b12e4c |
void free_file_obj(file_obj_t *f)
|
|
|
b12e4c |
{
|
|
|
b12e4c |
if (f == NULL)
|
|
|
b12e4c |
- return
|
|
|
b12e4c |
+ return;
|
|
|
b12e4c |
|
|
|
b12e4c |
free(f->fullpath);
|
|
|
b12e4c |
free(f->filename);
|
|
|
b12e4c |
@@ -39,10 +39,14 @@ void free_file_obj(file_obj_t *f)
|
|
|
b12e4c |
|
|
|
b12e4c |
const char *fo_get_fullpath(file_obj_t *fo)
|
|
|
b12e4c |
{
|
|
|
b12e4c |
+ g_return_val_if_fail(NULL != fo, NULL);
|
|
|
b12e4c |
+
|
|
|
b12e4c |
return fo->fullpath;
|
|
|
b12e4c |
}
|
|
|
b12e4c |
|
|
|
b12e4c |
const char *fo_get_filename(file_obj_t *fo)
|
|
|
b12e4c |
{
|
|
|
b12e4c |
+ g_return_val_if_fail(NULL != fo, NULL);
|
|
|
b12e4c |
+
|
|
|
b12e4c |
return fo->filename;
|
|
|
b12e4c |
-}
|
|
|
b12e4c |
\ No newline at end of file
|
|
|
b12e4c |
+}
|
|
|
b12e4c |
--
|
|
|
b12e4c |
2.21.0
|
|
|
b12e4c |
|