diff options
| author | Anton Tananaev <anton.tananaev@gmail.com> | 2017-11-22 22:46:13 +1300 |
|---|---|---|
| committer | Anton Tananaev <anton.tananaev@gmail.com> | 2017-11-22 22:46:13 +1300 |
| commit | 6c0fe165f72a998d447d0983c94e234681a6b680 (patch) | |
| tree | 73a951e7743aa43d79531511b96011e1b4946ec8 /src/org | |
| parent | 43ffaf8c3bb0c4937f8d9185f47a95530d118931 (diff) | |
| download | traccar-server-6c0fe165f72a998d447d0983c94e234681a6b680.tar.gz traccar-server-6c0fe165f72a998d447d0983c94e234681a6b680.tar.bz2 traccar-server-6c0fe165f72a998d447d0983c94e234681a6b680.zip | |
Fix JT600 frame decoder
Diffstat (limited to 'src/org')
| -rw-r--r-- | src/org/traccar/protocol/Jt600FrameDecoder.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/org/traccar/protocol/Jt600FrameDecoder.java b/src/org/traccar/protocol/Jt600FrameDecoder.java index 5606ae1fc..261f46fe8 100644 --- a/src/org/traccar/protocol/Jt600FrameDecoder.java +++ b/src/org/traccar/protocol/Jt600FrameDecoder.java @@ -1,5 +1,5 @@ /* - * Copyright 2012 - 2016 Anton Tananaev (anton@traccar.org) + * Copyright 2012 - 2017 Anton Tananaev (anton@traccar.org) * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -37,7 +37,7 @@ public class Jt600FrameDecoder extends FrameDecoder { if (type == '$') { boolean longFormat = buf.getUnsignedByte(buf.readerIndex() + 1) == 0x75; int length = buf.getUnsignedShort(buf.readerIndex() + (longFormat ? 8 : 7)) + 10; - if (length >= buf.readableBytes()) { + if (length <= buf.readableBytes()) { return buf.readBytes(length); } } else if (type == '(') { |