From 6abe198226c44d1ee76c1ef8865239fef01eba18 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dario=20R=C3=B6thlisberger?=
<dario.roethlisberger@gmail.com>
Date: Mon, 9 Oct 2017 11:19:07 +0200
Subject: [PATCH] versioning: tag must contain patch, minor & major
---
src/lib/version/version.c | 14 +++++++++++---
1 file changed, 11 insertions(+), 3 deletions(-)
diff --git a/src/lib/version/version.c b/src/lib/version/version.c
index d5c82d9cc0..a47c3b6e57 100644
--- a/src/lib/version/version.c
+++ b/src/lib/version/version.c
@@ -119,11 +119,19 @@ uint32_t version_tag_to_number(const char *tag)
if (buffer >= 0) {
version[buffer_counter] = buffer;
buffer_counter++;
+ }
+
+ if (buffer_counter <= 0) {
+ firmware_type = 0x00;
}
- version_number = ((uint8_t)version[0] << 8 * 3) |
- ((uint8_t)version[1] << 8 * 2) |
- ((uint8_t)version[2] << 8 * 1) | firmware_type;
+ if (buffer_counter == 3 || buffer_counter == 6) {
+ version_number = ((uint8_t)version[0] << 8 * 3) |
+ ((uint8_t)version[1] << 8 * 2) |
+ ((uint8_t)version[2] << 8 * 1) | firmware_type;
+ } else {
+ version_number = 0;
+ }
return version_number;
}
--
GitLab