Move shared demangler type nodes out of GNU3 and

plafosse · plafosse · commit 2eb0f364420f · 2026-06-10T10:18:20.000-04:00
add MAX_DEMANGLE_NODE_LENGTH
diff --git a/demangler/demangled_type_node.cpp b/demangler/demangled_type_node.cpp
diff --git a/demangler/demangled_type_node.h b/demangler/demangled_type_node.h
diff --git a/demangler/gnu3/CMakeLists.txt b/demangler/gnu3/CMakeLists.txt
@@ -5,7 +5,9 @@ project(demangle_gnu3)
 file(GLOB SOURCES CONFIGURE_DEPENDS
 	*.cpp
 	*.c
-	*.h)
+	*.h
+	../demangled_type_node.cpp
+	../demangled_type_node.h)
 
 if(DEMO)
 	add_library(${PROJECT_NAME} STATIC ${SOURCES})
diff --git a/demangler/gnu3/demangle_gnu3.cpp b/demangler/gnu3/demangle_gnu3.cpp
@@ -30,6 +30,7 @@ using namespace std;
 
 
 static constexpr size_t MAX_DEMANGLE_NESTING_DEPTH = 1024;
+static constexpr size_t MAX_DEMANGLE_NODE_LENGTH = 8192;
 
 static BNTypeClass GetFinalizedTypeClass(const Ref<Type>& type)
 {
@@ -343,6 +344,8 @@ string DemangleGNU3Reader::ReadString(size_t count)
 {
 	if (count > Length())
 		throw DemangleException();
+	if (count > MAX_DEMANGLE_NODE_LENGTH)
+		throw DemangleException("Demangled node exceeds maximum length");
 
 	const string out = m_data.substr(m_offset, count);
 	m_offset += count;
diff --git a/demangler/gnu3/demangle_gnu3.h b/demangler/gnu3/demangle_gnu3.h
@@ -35,7 +35,7 @@
 #define _STD_VECTOR std::vector
 #endif
 
-#include "demangled_type_node.h"
+#include "demangler/demangled_type_node.h"
 
 class DemangleException: public std::exception
 {
diff --git a/demangler/msvc/CMakeLists.txt b/demangler/msvc/CMakeLists.txt
@@ -6,8 +6,8 @@ file(GLOB SOURCES CONFIGURE_DEPENDS
 	*.cpp
 	*.c
 	*.h
-	../gnu3/demangled_type_node.cpp
-	../gnu3/demangled_type_node.h)
+	../demangled_type_node.cpp
+	../demangled_type_node.h)
 
 if(DEMO)
 	add_library(${PROJECT_NAME} STATIC ${SOURCES})
diff --git a/demangler/msvc/demangle_msvc.h b/demangler/msvc/demangle_msvc.h
@@ -36,11 +36,7 @@
 #define _STD_VECTOR std::vector
 #endif
 
-#ifdef BINARYNINJACORE_LIBRARY
-#include "demangler/gnu3/demangled_type_node.h"
-#else
-#include "../gnu3/demangled_type_node.h"
-#endif
+#include "demangler/demangled_type_node.h"
 
 class DemangleException: public std::exception
 {

Original file line number	Diff line number	Diff line change
`@@ -30,6 +30,7 @@ using namespace std;`
`30`	`30`
`31`	`31`
`32`	`32`	`static constexpr size_t MAX_DEMANGLE_NESTING_DEPTH = 1024;`
	`33`	`+static constexpr size_t MAX_DEMANGLE_NODE_LENGTH = 8192;`
`33`	`34`
`34`	`35`	`static BNTypeClass GetFinalizedTypeClass(const Ref<Type>& type)`
`35`	`36`	`{`
`@@ -343,6 +344,8 @@ string DemangleGNU3Reader::ReadString(size_t count)`
`343`	`344`	`{`
`344`	`345`	`if (count > Length())`
`345`	`346`	`throw DemangleException();`
	`347`	`+ if (count > MAX_DEMANGLE_NODE_LENGTH)`
	`348`	`+ throw DemangleException("Demangled node exceeds maximum length");`
`346`	`349`
`347`	`350`	`const string out = m_data.substr(m_offset, count);`
`348`	`351`	`m_offset += count;`
Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@`
`35`	`35`	`#define _STD_VECTOR std::vector`
`36`	`36`	`#endif`
`37`	`37`
`38`		`-#include "demangled_type_node.h"`
	`38`	`+#include "demangler/demangled_type_node.h"`
`39`	`39`
`40`	`40`	`class DemangleException: public std::exception`
`41`	`41`	`{`