Ticket #4648: cspace.patch

src/add-ons/input_server/devices/keyboard/KeyboardInputDevice.cpp

@@ -733 +733 @@
             msg->AddInt32("modifiers", fModifiers);
             msg->AddData("states", B_UINT8_TYPE, states, 16);
             if (numBytes > 0) {
+                BString bytes;
+                bytes.SetTo('\0', numBytes);
                 for (int i = 0; i < numBytes; i++) {
                     msg->AddInt8("byte", (int8)string[i]);
+                    bytes[i] = string[i];
                 }
-                msg->AddString("bytes", string);
+                msg->AddString("bytes", bytes);
 
                 if (rawNumBytes <= 0) {
                     rawNumBytes = 1;

src/kits/app/Message.cpp

@@ -2570 +2570 @@
     if (string == NULL)
         return B_BAD_VALUE;
 
+    ssize_t bytes;
     const char *cstr;
-    status_t error = FindString(name, index, &cstr);
+    status_t error = FindData(name, B_STRING_TYPE, index,
+        (const void **)&cstr, &bytes);
     if (error < B_OK)
         return error;
 
-    *string = cstr;
+    string->SetTo('\0', bytes - 1);
+    while (--bytes > 0)
+        (*string)[bytes - 1] = cstr[bytes - 1];
     return B_OK;
 }
 

src/kits/interface/Window.cpp

@@ -1113 +1113 @@
                     // TODO: cannot use "string" here if we support having
                     // different font encoding per view (it's supposed to be
                     // converted by _HandleKeyDown() one day)
-                    const char* string;
+                    BString string;
                     if (msg->FindString("bytes", &string) == B_OK)
-                        view->KeyDown(string, strlen(string));
+                        view->KeyDown(string.String(), string.Length());
                 } else
                     target->MessageReceived(msg);
             }
@@ -1124 +1124 @@
 
         case B_KEY_UP:
         {
-            const char* string = NULL;
+            BString string;
             msg->FindString("bytes", &string);
 
             // TODO: same as above
             if (BView* view = dynamic_cast<BView*>(target))
-                view->KeyUp(string, strlen(string));
+                view->KeyUp(string.String(), string.Length());
             else
                 target->MessageReceived(msg);
             break;