aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimo Teräs <timo.teras@iki.fi>2021-10-25 13:29:41 +0300
committerTimo Teräs <timo.teras@iki.fi>2021-10-25 13:31:41 +0300
commit390b7d1049d4aefb4ead8f4236e406a41536efb9 (patch)
treed5dc26ced4997221a29e19be8eb8033df549ef62
parentff8f5452d7f9e08a6d33713ae76aad573657737e (diff)
downloadapk-tools-2.12-stable.tar.gz
apk-tools-2.12-stable.tar.bz2
apk-tools-2.12-stable.tar.xz
version: increase number of digits supported in version component2.12-stable
Report also version numbers as invalid if there's more than 18 digits. fixes #10774
-rw-r--r--src/version.c9
-rw-r--r--test/version.data1
2 files changed, 7 insertions, 3 deletions
diff --git a/src/version.c b/src/version.c
index dc874a6..4d227d0 100644
--- a/src/version.c
+++ b/src/version.c
@@ -68,11 +68,12 @@ static void next_token(int *type, apk_blob_t *blob)
*type = n;
}
-static int get_token(int *type, apk_blob_t *blob)
+static int64_t get_token(int *type, apk_blob_t *blob)
{
static const char *pre_suffixes[] = { "alpha", "beta", "pre", "rc" };
static const char *post_suffixes[] = { "cvs", "svn", "git", "hg", "p" };
- int v = 0, i = 0, nt = TOKEN_INVALID;
+ int i = 0, nt = TOKEN_INVALID;
+ int64_t v = 0;
if (blob->len <= 0) {
*type = TOKEN_END;
@@ -96,6 +97,7 @@ static int get_token(int *type, apk_blob_t *blob)
v *= 10;
v += blob->ptr[i++] - '0';
}
+ if (i >= 18) goto invalid;
break;
case TOKEN_LETTER:
v = blob->ptr[i++];
@@ -121,6 +123,7 @@ static int get_token(int *type, apk_blob_t *blob)
break;
/* fallthrough: invalid suffix */
default:
+ invalid:
*type = TOKEN_INVALID;
return -1;
}
@@ -190,7 +193,7 @@ int apk_version_validate(apk_blob_t ver)
int apk_version_compare_blob_fuzzy(apk_blob_t a, apk_blob_t b, int fuzzy)
{
int at = TOKEN_DIGIT, bt = TOKEN_DIGIT, tt;
- int av = 0, bv = 0;
+ int64_t av = 0, bv = 0;
if (APK_BLOB_IS_NULL(a) || APK_BLOB_IS_NULL(b)) {
if (APK_BLOB_IS_NULL(a) && APK_BLOB_IS_NULL(b))
diff --git a/test/version.data b/test/version.data
index 59d93cf..bb1aa9e 100644
--- a/test/version.data
+++ b/test/version.data
@@ -726,3 +726,4 @@
1.3_pre1-r1 < 1.3.2
1.0_p10-r0 > 1.0_p9-r0
0.1.0_alpha_pre2 < 0.1.0_alpha
+1.0.0_pre20191002222144-r0 < 1.0.0_pre20210530193627-r0