[Pkg-running-devel] [openambit] 124/131: Keep all activity name bytes and `0` terminate it everywhere

Christian Perrier bubulle at moszumanska.debian.org
Thu Jul 17 20:19:17 UTC 2014


This is an automated email from the git hooks/post-receive script.

bubulle pushed a commit to branch master
in repository openambit.

commit a81bca57e375eb7de1d56d9824178d25fcdbcf1b
Author: Olaf Meeuwissen <paddy-hack at member.fsf.org>
Date:   Thu Jun 5 21:03:24 2014 +0900

    Keep all activity name bytes and `0` terminate it everywhere
---
 src/libambit/libambit.h    | 2 +-
 src/libambit/pmem20.c      | 2 +-
 src/openambit/logstore.cpp | 1 +
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/libambit/libambit.h b/src/libambit/libambit.h
index d5dc139..28d7ef2 100644
--- a/src/libambit/libambit.h
+++ b/src/libambit/libambit.h
@@ -310,7 +310,7 @@ typedef struct ambit_log_header_s {
     uint32_t heartrate_min_time;    /* ms */
     uint8_t  peak_training_effect;  /* effect scale 0.1 */
     uint8_t  activity_type;
-    char     activity_name[16];
+    char     activity_name[16+1];
     int16_t  temperature_max;       /* degree celsius scale 0.1 */
     int16_t  temperature_min;       /* degree celsius scale 0.1 */
     uint32_t temperature_max_time;  /* ms */
diff --git a/src/libambit/pmem20.c b/src/libambit/pmem20.c
index 929b071..5cd0e5d 100644
--- a/src/libambit/pmem20.c
+++ b/src/libambit/pmem20.c
@@ -379,7 +379,7 @@ int libambit_pmem20_log_parse_header(uint8_t *data, size_t datalen, ambit_log_he
     log_header->peak_training_effect = read8inc(data, &offset);
     log_header->activity_type = read8inc(data, &offset);
     memcpy(log_header->activity_name, data + offset, 16);
-    log_header->activity_name[15] = 0;
+    log_header->activity_name[16] = 0;
     offset += 16;
     log_header->heartrate_min = read8inc(data, &offset);
 
diff --git a/src/openambit/logstore.cpp b/src/openambit/logstore.cpp
index 502ad2e..12eb85d 100644
--- a/src/openambit/logstore.cpp
+++ b/src/openambit/logstore.cpp
@@ -629,6 +629,7 @@ void LogStore::XMLReader::readLogHeader()
             QByteArray ba = xml.readElementText().toLocal8Bit();
             const char *c_str = ba.data();
             strncpy(logEntry->logEntry->header.activity_name, c_str, 16);
+            logEntry->logEntry->header.activity_name[16] = 0;
         }
         else if (xml.name() == "Temperature") {
             while (xml.readNextStartElement()) {

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-running/openambit.git



More information about the Pkg-running-devel mailing list