Merge pull request #1011 from newrelic/jedis-fix

Prevent ArrayIndexOutOfBoundsException
newrelic · Sep 19, 2022 · 16840a8 · 16840a8
2 parents b3c2b3b + b9faa66
commit 16840a8
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 9 deletions.
diff --git a/...rumentation/jedis-3.0.0/src/main/java/redis/clients/jedis/Connection_Instrumentation.java b/...rumentation/jedis-3.0.0/src/main/java/redis/clients/jedis/Connection_Instrumentation.java
@@ -41,16 +41,18 @@ public void disconnect() {
     @Trace(leaf = true)
     public void sendCommand(final ProtocolCommand cmd, final byte[]... args) {
         Weaver.callOriginal();
-
-        updateDbIndex(cmd, new String(args[0], StandardCharsets.UTF_8));
+        if (args != null && args.length > 0) {
+            updateDbIndex(cmd, new String(args[0], StandardCharsets.UTF_8));
+        }
         reportMethodAsExternal(cmd, getHost(), getPort());
     }
 
     @Trace(leaf = true)
     public void sendCommand(final ProtocolCommand cmd, final String... args) {
         Weaver.callOriginal();
-
-        updateDbIndex(cmd, args[0]);
+        if (args != null && args.length > 0) {
+            updateDbIndex(cmd, args[0]);
+        }
         reportMethodAsExternal(cmd, getHost(), getPort());
     }
 

diff --git a/...rumentation/jedis-4.0.0/src/main/java/redis/clients/jedis/Connection_Instrumentation.java b/...rumentation/jedis-4.0.0/src/main/java/redis/clients/jedis/Connection_Instrumentation.java
@@ -38,16 +38,17 @@ public void disconnect() {
     @Trace
     public void sendCommand(final ProtocolCommand cmd, final byte[]... args) {
         Weaver.callOriginal();
-
-        updateDbIndex(cmd, new String(args[0], StandardCharsets.UTF_8));
-
+        if (args != null && args.length > 0) {
+            updateDbIndex(cmd, new String(args[0], StandardCharsets.UTF_8));
+        }
     }
 
     @Trace
     public void sendCommand(final ProtocolCommand cmd, final String... args) {
         Weaver.callOriginal();
-
-        updateDbIndex(cmd, args[0]);
+        if (args != null && args.length > 0) {
+            updateDbIndex(cmd, args[0]);
+        }
     }
 
     @Trace(leaf = true)