From a76057ee5d09c0bfeaeb9ae2574d03cd7d3d49c8 Mon Sep 17 00:00:00 2001 From: Wenyi Kuang Date: Tue, 7 Jan 2025 23:32:36 -0700 Subject: [PATCH 1/3] Elinimated undefined behavior of using un-intialized variable. --- src/utilities/geometry/FloorplanJS.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/utilities/geometry/FloorplanJS.cpp b/src/utilities/geometry/FloorplanJS.cpp index f1221dd9ea..0720c8e74c 100644 --- a/src/utilities/geometry/FloorplanJS.cpp +++ b/src/utilities/geometry/FloorplanJS.cpp @@ -1077,8 +1077,9 @@ ThreeScene FloorplanJS::toThreeScene(bool openstudioFormat) const { Json::ArrayIndex storyN = stories.size(); for (Json::ArrayIndex storyIdx = 0; storyIdx < storyN; ++storyIdx) { + std::string storyName = ""; if (checkKeyAndType(stories[storyIdx], "name", Json::stringValue)) { - std::string storyName = stories[storyIdx].get("name", storyName).asString(); + storyName = stories[storyIdx].get("name", "").asString(); buildingStoryNames.push_back(storyName); } From 84b9599e6693e9663749361bb6168769d2e823f4 Mon Sep 17 00:00:00 2001 From: Wenyi Kuang Date: Tue, 7 Jan 2025 23:43:00 -0700 Subject: [PATCH 2/3] Remove all the unintilized var. --- src/utilities/geometry/FloorplanJS.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/utilities/geometry/FloorplanJS.cpp b/src/utilities/geometry/FloorplanJS.cpp index 0720c8e74c..1866acf9fc 100644 --- a/src/utilities/geometry/FloorplanJS.cpp +++ b/src/utilities/geometry/FloorplanJS.cpp @@ -1077,13 +1077,11 @@ ThreeScene FloorplanJS::toThreeScene(bool openstudioFormat) const { Json::ArrayIndex storyN = stories.size(); for (Json::ArrayIndex storyIdx = 0; storyIdx < storyN; ++storyIdx) { - std::string storyName = ""; if (checkKeyAndType(stories[storyIdx], "name", Json::stringValue)) { - storyName = stories[storyIdx].get("name", "").asString(); - buildingStoryNames.push_back(storyName); + buildingStoryNames.push_back(stories[storyIdx].get("name", "").asString()); } - std::string storyColor; + std::string storyColor = ""; if (checkKeyAndType(stories[storyIdx], "color", Json::stringValue)) { storyColor = stories[storyIdx].get("color", storyColor).asString(); } From d25307b92e490a943b1012c33d463ce7eeadb196 Mon Sep 17 00:00:00 2001 From: Julien Marrec Date: Wed, 8 Jan 2025 14:34:02 +0100 Subject: [PATCH 3/3] Update src/utilities/geometry/FloorplanJS.cpp --- src/utilities/geometry/FloorplanJS.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/utilities/geometry/FloorplanJS.cpp b/src/utilities/geometry/FloorplanJS.cpp index 1866acf9fc..0d4dc3f6f2 100644 --- a/src/utilities/geometry/FloorplanJS.cpp +++ b/src/utilities/geometry/FloorplanJS.cpp @@ -1081,7 +1081,7 @@ ThreeScene FloorplanJS::toThreeScene(bool openstudioFormat) const { buildingStoryNames.push_back(stories[storyIdx].get("name", "").asString()); } - std::string storyColor = ""; + std::string storyColor; if (checkKeyAndType(stories[storyIdx], "color", Json::stringValue)) { storyColor = stories[storyIdx].get("color", storyColor).asString(); }