jaiden
/
apk-tools
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

version: fix comparison against empty version

cute-signatures
Timo Teras 2009-08-17 14:24:13 +03:00
parent 7695ed82be
commit 0b9bfa8d52
1 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/version.c
View File

@ -4,7 +4,7 @@
* Copyright (C) 2008 Timo Teräs <timo.teras@iki.fi> * Copyright (C) 2008 Timo Teräs <timo.teras@iki.fi>
* All rights reserved. * All rights reserved.
* *
* This program is free software; you can redistribute it and/or modify it * This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 as published * under the terms of the GNU General Public License version 2 as published
* by the Free Software Foundation. See http://www.gnu.org/ for details. * by the Free Software Foundation. See http://www.gnu.org/ for details.
*/ */
@ -75,6 +75,11 @@ static int get_token(int *type, apk_blob_t *blob)
static const char *pre_suffixes[] = { "alpha", "beta", "pre", "rc" }; static const char *pre_suffixes[] = { "alpha", "beta", "pre", "rc" };
int v = 0, i = 0, nt = TOKEN_INVALID; int v = 0, i = 0, nt = TOKEN_INVALID;
if (blob->len <= 0) {
*type = TOKEN_END;
return 0;
}
switch (*type) { switch (*type) {
case TOKEN_DIGIT_OR_ZERO: case TOKEN_DIGIT_OR_ZERO:
/* Leading zero digits get a special treatment */ /* Leading zero digits get a special treatment */
@ -162,7 +167,7 @@ int apk_version_result_mask(const char *str)
if (*str == '=') if (*str == '=')
r |= APK_VERSION_EQUAL; r |= APK_VERSION_EQUAL;
return r; return r;
} }
int apk_version_validate(apk_blob_t ver) int apk_version_validate(apk_blob_t ver)
{ {
@ -201,13 +206,13 @@ int apk_version_compare_blob(apk_blob_t a, apk_blob_t b)
return APK_VERSION_LESS; return APK_VERSION_LESS;
if (av > bv) if (av > bv)
return APK_VERSION_GREATER; return APK_VERSION_GREATER;
if (at < bt)
return get_token(&at, &a) < 0 ? /* at and bt are the next expected token type */
APK_VERSION_LESS : APK_VERSION_GREATER; if (at == bt)
if (bt < at) return APK_VERSION_EQUAL;
return get_token(&bt, &b) > 0 ? if (at < bt || bt == TOKEN_INVALID)
APK_VERSION_LESS : APK_VERSION_GREATER; return APK_VERSION_GREATER;
return APK_VERSION_EQUAL; return APK_VERSION_LESS;
} }
int apk_version_compare(const char *str1, const char *str2) int apk_version_compare(const char *str1, const char *str2)