From 02f6f8fdd32ec94ae1bcc5f9ba01540e50d7e024 Mon Sep 17 00:00:00 2001
From: dmiller <dmiller@e0a8ed71-7df4-0310-8962-fdc924857419>
Date: Mon, 6 Jul 2026 19:32:05 +0000
Subject: [PATCH] Check for null after backslash.

---
 CHANGELOG | 3 +++
 utils.cc  | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/CHANGELOG b/CHANGELOG
index 58f008e30..f6f4d79e5 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,5 +1,8 @@
 #Nmap Changelog ($Id$); -*-text-*-
 
+o Fixed an issue with parsing nmap-service-probes that could cause a corrupted
+  file to crash Nmap. Reported by Muhammed Hussein.
+
 o [NSE][GH#2016] Removed hostmap-bfk.nse, since the service it used shut down.
 
 o Fixed several issues reported by Himanshu Anand: infinite loop in TCP options
diff --git a/utils.cc b/utils.cc
index b96d10df0..4494021cf 100644
--- a/utils.cc
+++ b/utils.cc
@@ -349,6 +349,9 @@ char *cstring_unescape(char *str, unsigned int *newlen) {
     if (*src == '\\' ) {
       src++;
       switch (*src) {
+      case '\0':
+        return NULL;
+        break;
       case '0':
         newchar = '\0';
         src++;