projects
/
platform
/
upstream
/
systemd.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
c5f4488
)
fileio: get_status_field() don't clobber arg on OOM
author
Lennart Poettering
<lennart@poettering.net>
Thu, 23 Jul 2015 21:36:34 +0000
(23:36 +0200)
committer
Lennart 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
patch
|
blob
|
history
diff --git
a/src/basic/fileio.c
b/src/basic/fileio.c
index
d592bf5
..
2216853
100644
(file)
--- a/
src/basic/fileio.c
+++ b/
src/basic/fileio.c
@@
-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;
}