diff --git a/CHANGES.md b/CHANGES.md
index df4803f6f..4ab2946c8 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -14,6 +14,7 @@ v3.0.4 - YYYY-MM-DD
 - Updated `ippeveprinter` to support OAuth/OpenID authorization.
 - Updated `ippeveprinter` to add a date/time stamp when logging to a file.
 - Now explicitly validate IPP attribute names as keyword strings.
+- Fixed a potential buffer overflow in `cupsDNSSDAssembleFullName` on Windows.
 - Fixed `httpGetDateString` with bad date/time values (Issue #167)
 - Fixed an issue with `cupsGetCredentialsTrust` for credentials that are signed
   by an unknown CA.
diff --git a/cups/dnssd.c b/cups/dnssd.c
index d024f5997..d58807ad8 100644
--- a/cups/dnssd.c
+++ b/cups/dnssd.c
@@ -271,6 +271,9 @@ cupsDNSSDAssembleFullName(
     }
     else
     {
+      if (fullptr >= fullend)
+        return (false);
+
       *fullptr++ = *name;
     }
   }