From 237843b93a9ed34050df45f9c751084661abc8e1 Mon Sep 17 00:00:00 2001
From: mbennice <mbennice@google.com>
Date: Fri, 5 Mar 2021 09:52:10 -0800
Subject: [PATCH 1/2] Default user data text to empty string when null.

---
 examples/Importers/ImportURDFDemo/UrdfParser.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/examples/Importers/ImportURDFDemo/UrdfParser.cpp b/examples/Importers/ImportURDFDemo/UrdfParser.cpp
index 235e6ee8c..672b44835 100644
--- a/examples/Importers/ImportURDFDemo/UrdfParser.cpp
+++ b/examples/Importers/ImportURDFDemo/UrdfParser.cpp
@@ -94,7 +94,8 @@ static void ParseUserData(const XMLElement* element, btHashMap<btHashString,
 			if (!key_attr) {
 				logger->reportError("User data tag must have a key attribute.");
 			}
-			user_data.insert(key_attr, user_data_xml->GetText());
+			const char* text = user_data_xml->GetText();
+                        user_data.insert(key_attr, text ? text : "");
 		}
 	}
 }

From 296cd85f607acdd9fbece2106d66a62bab3c7240 Mon Sep 17 00:00:00 2001
From: mbennice <mbennice@google.com>
Date: Fri, 5 Mar 2021 09:54:53 -0800
Subject: [PATCH 2/2] Fix tab/spaces

---
 examples/Importers/ImportURDFDemo/UrdfParser.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/Importers/ImportURDFDemo/UrdfParser.cpp b/examples/Importers/ImportURDFDemo/UrdfParser.cpp
index 672b44835..23f36a5e6 100644
--- a/examples/Importers/ImportURDFDemo/UrdfParser.cpp
+++ b/examples/Importers/ImportURDFDemo/UrdfParser.cpp
@@ -95,7 +95,7 @@ static void ParseUserData(const XMLElement* element, btHashMap<btHashString,
 				logger->reportError("User data tag must have a key attribute.");
 			}
 			const char* text = user_data_xml->GetText();
-                        user_data.insert(key_attr, text ? text : "");
+			user_data.insert(key_attr, text ? text : "");
 		}
 	}
 }