From efce1eb17192f46bf01e77f244c76add3061f8f6 Mon Sep 17 00:00:00 2001 From: "Matthias P. Braendli" Date: Mon, 27 Jul 2015 20:35:29 +0200 Subject: Fix segmentation fault in short label check --- src/MuxElements.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/MuxElements.cpp b/src/MuxElements.cpp index e8871d1..ac6ee32 100644 --- a/src/MuxElements.cpp +++ b/src/MuxElements.cpp @@ -104,10 +104,10 @@ int DabLabel::setShortLabel(const std::string& slabel) /* Iterate over the label and set the bits in the flag * according to the characters in the slabel */ - for (int i = 0; i < 32; ++i) { + for (int i = 0; i < 16; ++i) { if (*slab == this->m_text[i]) { flag |= 0x8000 >> i; - if (*(++slab) == 0) { + if (*(++slab) == '\0') { break; } } -- cgit v1.2.3 From 2de969d95030c75b9167d145536ee12ac52eadbf Mon Sep 17 00:00:00 2001 From: "Matthias P. Braendli" Date: Mon, 27 Jul 2015 20:41:27 +0200 Subject: Prepare release v0.7.5 --- ChangeLog | 4 ++++ configure.ac | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 516c4f2..5e7430e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,10 @@ This file contains information about the changes done to the ODR-DabMux in this repository +2015-07-27: Matthias P. Braendli + (v0.7.5): + Fix segmentation fault in short label check logic. + 2015-07-03: Matthias P. Braendli (v0.7.4): Allow empty component labels diff --git a/configure.ac b/configure.ac index 20ddeaf..cc8ce7a 100644 --- a/configure.ac +++ b/configure.ac @@ -17,7 +17,7 @@ # along with ODR-DabMux. If not, see . AC_PREREQ(2.61) -AC_INIT([ODR-DabMux], [0.7.4], [matthias.braendli@mpb.li]) +AC_INIT([ODR-DabMux], [0.7.5], [matthias.braendli@mpb.li]) AC_CONFIG_AUX_DIR([build-aux]) AC_CANONICAL_SYSTEM AM_INIT_AUTOMAKE([-Wall subdir-objects foreign]) -- cgit v1.2.3