[gentoo-commits] proj/pax-utils:master commit in: /

[Mike Frysinger]

commit:     6be48eb30663e52678a26e303a29842ca15dadca
Author:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 25 02:19:37 2024 +0000
Commit:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Thu Jan 25 02:19:37 2024 +0000
URL:        https://gitweb.gentoo.org/proj/pax-utils.git/commit/?id=6be48eb3

pspax: fix error handling when reading attr or ipaddr fail

If these functions weren't able to read data from the files, they'd
return the previous buffer contents which would be pretty confusing.
Fix it to return NULL instead like other get helpers in here.

Signed-off-by: Mike Frysinger <vapier <AT> gentoo.org>

 pspax.c | 22 ++++++++++++++++------
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/pspax.c b/pspax.c
index f1644a3..04cae79 100644
--- a/pspax.c
+++ b/pspax.c
@@ -230,9 +230,14 @@ static const char *get_pid_attr(int pfd)
        if ((fp = fopenat_r(pfd, "attr/current")) == NULL)
                return NULL;
 
-       if (fgets(buf, sizeof(buf), fp) != NULL)
-               if ((p = strchr(buf, '\n')) != NULL)
-                       *p = 0;
+       if (fgets(buf, sizeof(buf), fp) == NULL) {
+               fclose(fp);
+               return NULL;
+       }
+
+       if ((p = strchr(buf, '\n')) != NULL)
+               *p = 0;
+
        fclose(fp);
 
        return buf;
@@ -247,9 +252,14 @@ static const char *get_pid_addr(int pfd)
        if ((fp = fopenat_r(pfd, "ipaddr")) == NULL)
                return NULL;
 
-       if (fgets(buf, sizeof(buf), fp) != NULL)
-               if ((p = strchr(buf, '\n')) != NULL)
-                       *p = 0;
+       if (fgets(buf, sizeof(buf), fp) == NULL) {
+               fclose(fp);
+               return NULL;
+       }
+
+       if ((p = strchr(buf, '\n')) != NULL)
+               *p = 0;
+
        fclose(fp);
 
        return buf;