Merge branch 'master' into next

3 files changed, 6 insertions, 2 deletions

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 <matthias@mpb.li>
+	(v0.7.5):
+		Fix segmentation fault in short label check logic.
+
 2015-07-03: Matthias P. Braendli <matthias@mpb.li>
 	(v0.7.4):
 		Allow empty component labels
diff --git a/configure.ac b/configure.ac
index a24258b..bdc7328 100644
--- a/configure.ac
+++ b/configure.ac
@@ -17,7 +17,7 @@
 # along with ODR-DabMux.  If not, see <http://www.gnu.org/licenses/>.
 
 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])
diff --git a/src/MuxElements.cpp b/src/MuxElements.cpp
index 4bd82cd..3170fe1 100644
--- a/src/MuxElements.cpp
+++ b/src/MuxElements.cpp
@@ -105,7 +105,7 @@ int DabLabel::setShortLabel(const std::string& slabel)
     for (size_t i = 0; i < m_label.size(); ++i) {
         if (*slab == m_label[i]) {
             flag |= 0x8000 >> i;
-            if (*(++slab) == 0) {
+            if (*(++slab) == '\0') {
                 break;
             }
         }