resolved conflicts for merge of 2237ca4c to jb-mr1-dev
Change-Id: I04982ff2b092274b940a621b238c2246349aa85e
diff --git a/sdcard/sdcard.c b/sdcard/sdcard.c
index 877a524..8d87ee9 100644
--- a/sdcard/sdcard.c
+++ b/sdcard/sdcard.c
@@ -1314,11 +1314,23 @@
source_path = arg;
else if (!dest_path)
dest_path = arg;
- else if (!uid)
- uid = strtoul(arg, 0, 10);
- else if (!gid)
- gid = strtoul(arg, 0, 10);
- else {
+ else if (!uid) {
+ char* endptr = NULL;
+ errno = 0;
+ uid = strtoul(arg, &endptr, 10);
+ if (*endptr != '\0' || errno != 0) {
+ ERROR("Invalid uid");
+ return usage();
+ }
+ } else if (!gid) {
+ char* endptr = NULL;
+ errno = 0;
+ gid = strtoul(arg, &endptr, 10);
+ if (*endptr != '\0' || errno != 0) {
+ ERROR("Invalid gid");
+ return usage();
+ }
+ } else {
ERROR("too many arguments\n");
return usage();
}