From 73407e12acce8061cc1aa3d18517569368707864 Mon Sep 17 00:00:00 2001
From: Anton Tananaev <anton@traccar.org>
Date: Fri, 16 Sep 2022 17:55:45 -0700
Subject: Safer Teltonika IO decoding

---
 src/main/java/org/traccar/protocol/TeltonikaProtocolDecoder.java | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'src/main/java/org')

diff --git a/src/main/java/org/traccar/protocol/TeltonikaProtocolDecoder.java b/src/main/java/org/traccar/protocol/TeltonikaProtocolDecoder.java
index 89124cb22..ff1f52eb1 100644
--- a/src/main/java/org/traccar/protocol/TeltonikaProtocolDecoder.java
+++ b/src/main/java/org/traccar/protocol/TeltonikaProtocolDecoder.java
@@ -325,6 +325,7 @@ public class TeltonikaProtocolDecoder extends BaseProtocolDecoder {
         if (codec == CODEC_GH3000) {
             decodeGh3000Parameter(position, id, buf, length);
         } else {
+            int index = buf.readerIndex();
             boolean decoded = false;
             for (var entry : PARAMETERS.getOrDefault(id, new HashMap<>()).entrySet()) {
                 if (entry.getKey() == null || model != null && entry.getKey().contains(model)) {
@@ -333,7 +334,9 @@ public class TeltonikaProtocolDecoder extends BaseProtocolDecoder {
                     break;
                 }
             }
-            if (!decoded) {
+            if (decoded) {
+                buf.readerIndex(index + length);
+            } else {
                 position.set(Position.PREFIX_IO + id, readValue(buf, length));
             }
         }
-- 
cgit v1.2.3