Backport #2368 (#2420)

microsoft · May 22, 2024 · 312092b · 312092b
1 parent 8b9afec
commit 312092b
Showing 1 changed file with 9 additions and 0 deletions.
diff --git 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);
             }