Fix bugs found in testing.

ttalvitie · Sep 23, 2021 · 64117db · 64117db
1 parent 18ed00e
commit 64117db
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/src/common.cpp b/src/common.cpp
@@ -73,7 +73,7 @@ string sanitizeUTF8String(string str) {
     sanitizeUTF8StringImpl(
         str,
         [&](const char* bytes, size_t count) {
-            str.insert(str.end(), bytes, bytes + count);
+            ret.insert(ret.end(), bytes, bytes + count);
         },
         [](int) {}
     );

diff --git a/src/vice.cpp b/src/vice.cpp
@@ -432,11 +432,13 @@ void ViceContext::start(shared_ptr<ViceContextEventHandler> eventHandler) {
                 string reason = "Unknown reason";
                 uint64_t window =
                     self->eventHandler_->onViceContextCreateWindowRequest(reason, sanitizedURI);
-                if(window || msg == nullptr) {
+                if(window) {
                     REQUIRE(self->openWindows_.insert(window).second);
                     return window;
                 } else {
-                    *msg = createMallocString(reason);
+                    if(msg != nullptr) {
+                        *msg = createMallocString(reason);
+                    }
                     return 0;
                 }
             });
@@ -470,11 +472,13 @@ void ViceContext::start(shared_ptr<ViceContextEventHandler> eventHandler) {
         string reason = "Unknown reason";
         uint64_t window =
             self->eventHandler_->onViceContextCreateWindowRequest(reason, {});
-        if(window || msg == nullptr) {
+        if(window) {
             REQUIRE(self->openWindows_.insert(window).second);
             return window;
         } else {
-            *msg = createMallocString(reason);
+            if(msg != nullptr) {
+                *msg = createMallocString(reason);
+            }
             return 0;
         }
     });