diff --git a/AUTHORS b/AUTHORS index 172648e515..074dace720 100644 --- a/AUTHORS +++ b/AUTHORS @@ -179,6 +179,7 @@ Patches have also been contributed by: Daniel Gollub David S. Wang Ruben Kerkhof + Scott Moser [....send patches to get your name here....] diff --git a/src/util/util.c b/src/util/util.c index 463d2b8eaa..da2485998a 100644 --- a/src/util/util.c +++ b/src/util/util.c @@ -1598,16 +1598,16 @@ virParseNumber(const char **str) int virParseVersionString(const char *str, unsigned long *version) { - unsigned int major, minor, micro; + unsigned int major, minor = 0, micro = 0; char *tmp; - if (virStrToLong_ui(str, &tmp, 10, &major) < 0 || *tmp != '.') + if (virStrToLong_ui(str, &tmp, 10, &major) < 0) return -1; - if (virStrToLong_ui(tmp + 1, &tmp, 10, &minor) < 0 || *tmp != '.') + if ((*tmp == '.') && virStrToLong_ui(tmp + 1, &tmp, 10, &minor) < 0) return -1; - if (virStrToLong_ui(tmp + 1, &tmp, 10, µ) < 0) + if ((*tmp == '.') && virStrToLong_ui(tmp + 1, &tmp, 10, µ) < 0) return -1; *version = 1000000 * major + 1000 * minor + micro;