]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
fileio: get_status_field() don't clobber arg on OOM
authorLennart Poettering <lennart@poettering.net>
Thu, 23 Jul 2015 21:36:34 +0000 (23:36 +0200)
committerLennart Poettering <lennart@poettering.net>
Thu, 23 Jul 2015 21:36:36 +0000 (23:36 +0200)
According to our coding style guidelines we shouldn't clobber
pass-by-ref arguments on failure, hence don't do so here either.

src/basic/fileio.c

index d592bf5ac9c2f5126fd9e01f5ef878c905abc86a..2216853777d164646dc32c6f01c899556fc7cce1 100644 (file)
@@ -786,7 +786,7 @@ int executable_is_script(const char *path, char **interpreter) {
  */
 int get_status_field(const char *filename, const char *pattern, char **field) {
         _cleanup_free_ char *status = NULL;
-        char *t;
+        char *t, *f;
         size_t len;
         int r;
 
@@ -820,9 +820,10 @@ int get_status_field(const char *filename, const char *pattern, char **field) {
 
         len = strcspn(t, WHITESPACE);
 
-        *field = strndup(t, len);
-        if (!*field)
+        f = strndup(t, len);
+        if (!f)
                 return -ENOMEM;
 
+        *field = f;
         return 0;
 }