2 files changed, 16 insertions, 3 deletions
diff --git a/src/org/traccar/helper/BitBuffer.java b/src/org/traccar/helper/BitBuffer.java
index 7626988cc..ac307efdf 100644
--- a/src/org/traccar/helper/BitBuffer.java
+++ b/src/org/traccar/helper/BitBuffer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Anton Tananaev (anton@traccar.org)
+ * Copyright 2016 - 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.
@@ -20,7 +20,7 @@ import org.jboss.netty.buffer.ChannelBuffers;
 
 public class BitBuffer {
 
-    private ChannelBuffer buffer = ChannelBuffers.dynamicBuffer();
+    private final ChannelBuffer buffer;
 
     private int writeByte;
     private int writeCount;
@@ -28,6 +28,14 @@ public class BitBuffer {
     private int readByte;
     private int readCount;
 
+    public BitBuffer() {
+        buffer = ChannelBuffers.dynamicBuffer();
+    }
+
+    public BitBuffer(ChannelBuffer buffer) {
+        this.buffer = buffer;
+    }
+
     public void writeEncoded(byte[] bytes) {
         for (byte b : bytes) {
             b -= 48;
diff --git a/src/org/traccar/helper/PatternUtil.java b/src/org/traccar/helper/PatternUtil.java
index 12536eaef..1bbb166a6 100644
--- a/src/org/traccar/helper/PatternUtil.java
+++ b/src/org/traccar/helper/PatternUtil.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 - 2016 Anton Tananaev (anton@traccar.org)
+ * Copyright 2015 - 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.
@@ -15,6 +15,7 @@
  */
 package org.traccar.helper;
 
+import java.lang.management.ManagementFactory;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import java.util.regex.PatternSyntaxException;
@@ -49,6 +50,10 @@ public final class PatternUtil {
 
     public static MatchResult checkPattern(String pattern, String input) {
 
+        if (!ManagementFactory.getRuntimeMXBean().getInputArguments().toString().contains("-agentlib:jdwp")) {
+            throw new RuntimeException("PatternUtil usage detected");
+        }
+
         MatchResult result = new MatchResult();
 
         for (int i = 0; i < pattern.length(); i++) {