X-Git-Url: https://git.kernel.dk/?a=blobdiff_plain;f=parse.c;h=c4fd4626df9f581eb100894a8380d1fef61a0ca8;hb=998baa29f571df9d2e4b626bedd317a2fd28c68a;hp=84d112dceb9efc3d433e13b39693aee3de46a6e1;hpb=b6c019832ebb67143da7c4880873572e008563e8;p=fio.git diff --git a/parse.c b/parse.c index 84d112dc..c4fd4626 100644 --- a/parse.c +++ b/parse.c @@ -512,8 +512,11 @@ static bool val_too_large(const struct fio_option *o, unsigned long long val, if (!o->maxval) return false; - if (is_uint) + if (is_uint) { + if ((int) val < 0) + return (int) val > (int) o->maxval; return (unsigned int) val > o->maxval; + } return val > o->maxval; } @@ -599,8 +602,7 @@ static int __handle_option(const struct fio_option *o, const char *ptr, if (!is_time && o->is_time) is_time = o->is_time; - tmp[sizeof(tmp) - 1] = '\0'; - strncpy(tmp, ptr, sizeof(tmp) - 1); + snprintf(tmp, sizeof(tmp), "%s", ptr); p = strchr(tmp, ','); if (p) *p = '\0'; @@ -826,8 +828,7 @@ static int __handle_option(const struct fio_option *o, const char *ptr, char tmp[128]; char *p1, *p2; - tmp[sizeof(tmp) - 1] = '\0'; - strncpy(tmp, ptr, sizeof(tmp) - 1); + snprintf(tmp, sizeof(tmp), "%s", ptr); /* Handle bsrange with separate read,write values: */ p1 = strchr(tmp, ',');