From b5ecd0a0778ad8e1d0de49b4f49271b458acefda Mon Sep 17 00:00:00 2001
From: Philipp Andreas <github@smurfy.de>
Date: Tue, 28 Oct 2014 23:36:32 +0100
Subject: Segfault fix.

---
 daemon/watchconnector.cpp | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'daemon/watchconnector.cpp')

diff --git a/daemon/watchconnector.cpp b/daemon/watchconnector.cpp
index d91d183..a240b04 100644
--- a/daemon/watchconnector.cpp
+++ b/daemon/watchconnector.cpp
@@ -90,6 +90,16 @@ QString WatchConnector::decodeEndpoint(uint val)
 
 void WatchConnector::decodeMsg(QByteArray data)
 {
+    //Sometimes pebble sends a "00", we ignore it without future action
+    if (data.length() == 1 && data.at(0) == 0) {
+        return;
+    }
+
+    if (data.length() < 4) {
+        logger()->error() << "Can not decode message data length invalid: " << data.toHex();
+        return;
+    }
+
     unsigned int datalen = 0;
     int index = 0;
     datalen = (data.at(index) << 8) + data.at(index+1);
-- 
cgit v1.2.3