chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
cgroup-show: remove duplicated check
[elogind.git]
/
src
/
shared
/
fstab-util.c
diff --git
a/src/shared/fstab-util.c
b/src/shared/fstab-util.c
index 546c81b80ff68bb4c9057ce8e71c4f143f3cfeb2..cf317e17bda65759c5ff7ac8fe59181dec85625d 100644
(file)
--- a/
src/shared/fstab-util.c
+++ b/
src/shared/fstab-util.c
@@
-133,13
+133,18
@@
int fstab_find_pri(const char *options, int *ret) {
assert(ret);
r = fstab_filter_options(options, "pri\0", NULL, &opt, NULL);
assert(ret);
r = fstab_filter_options(options, "pri\0", NULL, &opt, NULL);
- if (r <
=
0)
+ if (r < 0)
return r;
return r;
+ if (r == 0 || !opt)
+ return 0;
r = safe_atou(opt, &pri);
if (r < 0)
return r;
r = safe_atou(opt, &pri);
if (r < 0)
return r;
- *ret = (int) r;
+ if ((int) pri < 0)
+ return -ERANGE;
+
+ *ret = (int) pri;
return 1;
}
return 1;
}