From ca061c98a6bc3215fa740224663e5b0646ddd798 Mon Sep 17 00:00:00 2001
From: rdb <git@rdb.name>
Date: Tue, 26 Oct 2021 13:55:47 +0200
Subject: [PATCH] dcparser: Improve assertion error message for invalid UTF-8
 data

---
 direct/src/dcparser/dcPacker.cxx | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/direct/src/dcparser/dcPacker.cxx b/direct/src/dcparser/dcPacker.cxx
index 2a5a923bc2..4ba255a78c 100644
--- a/direct/src/dcparser/dcPacker.cxx
+++ b/direct/src/dcparser/dcPacker.cxx
@@ -889,6 +889,10 @@ unpack_object() {
       unpack_string(str);
 #if PY_MAJOR_VERSION >= 3
       object = PyUnicode_FromStringAndSize(str.data(), str.size());
+      if (object == nullptr) {
+        nassert_raise("Unable to decode UTF-8 string; use blob type for binary data");
+        return nullptr;
+      }
 #else
       object = PyString_FromStringAndSize(str.data(), str.size());
 #endif