From 312092b0e74fe5a9aaa6b772fc46b53e1182f276 Mon Sep 17 00:00:00 2001
From: Jeff Wasty <v-jeffwasty@microsoft.com>
Date: Wed, 22 May 2024 11:35:04 -0700
Subject: [PATCH] Backport #2368 (#2420)

---
 src/main/java/com/microsoft/sqlserver/jdbc/IOBuffer.java | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/src/main/java/com/microsoft/sqlserver/jdbc/IOBuffer.java b/src/main/java/com/microsoft/sqlserver/jdbc/IOBuffer.java
index e5e175b9e..1597d0cd3 100644
--- a/src/main/java/com/microsoft/sqlserver/jdbc/IOBuffer.java
+++ b/src/main/java/com/microsoft/sqlserver/jdbc/IOBuffer.java
@@ -6912,6 +6912,15 @@ final boolean readPacket() throws SQLServerException {
 
             // if messageType is RPC or QUERY, then increment Counter's state
             if (tdsChannel.getWriter().checkIfTdsMessageTypeIsBatchOrRPC() && null != command) {
+                if (logger.isLoggable(Level.FINER)) {
+                    logger.warning(toString() + ": increasing state of counter for TDS Command: " + command.toString());
+                }
+
+                if (null == command.getCounter()) {
+                    MessageFormat form = new MessageFormat(SQLServerException.getErrString("R_NullValue"));
+                    Object[] msgArgs1 = {"TDS command counter"};
+                    throw new SQLServerException(form.format(msgArgs1), null);
+                }
                 command.getCounter().increaseCounter(packetLength);
             }