We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

[patch] malloc the text, hoping it will be freed

windows_event_text_size.diff (text/plain), 4.77 KB, created by tamo on 2019-08-31 15:51:35 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: tamo

Created: 2019-08-31 15:51:35 UTC

Size: 4.77 KB

patch

obsolete

>diff -r bfed06214c2a include/SDL_events.h
>--- a/include/SDL_events.h	Tue Aug 27 11:38:43 2019 +0200
>+++ b/include/SDL_events.h	Sun Sep 01 00:40:52 2019 +0900
>@@ -220,7 +220,7 @@
>     SDL_Keysym keysym;  /**< The key that was pressed or released */
> } SDL_KeyboardEvent;
> 
>-#define SDL_TEXTEDITINGEVENT_TEXT_SIZE (32)
>+#define SDL_TEXTEDITINGEVENT_TEXT_SIZE (512)
> /**
>  *  \brief Keyboard text editing event structure (event.edit.*)
>  */
>@@ -229,13 +229,13 @@
>     Uint32 type;                                /**< ::SDL_TEXTEDITING */
>     Uint32 timestamp;                           /**< In milliseconds, populated using SDL_GetTicks() */
>     Uint32 windowID;                            /**< The window with keyboard focus, if any */
>-    char text[SDL_TEXTEDITINGEVENT_TEXT_SIZE];  /**< The editing text */
>+    char *text;                                 /**< The editing text, which should be SDL_free()d later */
>     Sint32 start;                               /**< The start cursor of selected editing text */
>     Sint32 length;                              /**< The length of selected editing text */
> } SDL_TextEditingEvent;
> 
> 
>-#define SDL_TEXTINPUTEVENT_TEXT_SIZE (32)
>+#define SDL_TEXTINPUTEVENT_TEXT_SIZE (512)
> /**
>  *  \brief Keyboard text input event structure (event.text.*)
>  */
>@@ -244,7 +244,7 @@
>     Uint32 type;                              /**< ::SDL_TEXTINPUT */
>     Uint32 timestamp;                         /**< In milliseconds, populated using SDL_GetTicks() */
>     Uint32 windowID;                          /**< The window with keyboard focus, if any */
>-    char text[SDL_TEXTINPUTEVENT_TEXT_SIZE];  /**< The input text */
>+    char *text;                               /**< The input text, which should be SDL_free()d later */
> } SDL_TextInputEvent;
> 
> /**
>diff -r bfed06214c2a src/events/SDL_keyboard.c
>--- a/src/events/SDL_keyboard.c	Tue Aug 27 11:38:43 2019 +0200
>+++ b/src/events/SDL_keyboard.c	Sun Sep 01 00:40:52 2019 +0900
>@@ -786,7 +786,7 @@
> }
> 
> int
>-SDL_SendKeyboardText(const char *text)
>+SDL_SendKeyboardText(char *text)
> {
>     SDL_Keyboard *keyboard = &SDL_keyboard;
>     int posted;
>@@ -802,14 +802,14 @@
>         SDL_Event event;
>         event.text.type = SDL_TEXTINPUT;
>         event.text.windowID = keyboard->focus ? keyboard->focus->id : 0;
>-        SDL_utf8strlcpy(event.text.text, text, SDL_arraysize(event.text.text));
>+        event.text.text = text;
>         posted = (SDL_PushEvent(&event) > 0);
>     }
>     return (posted);
> }
> 
> int
>-SDL_SendEditingText(const char *text, int start, int length)
>+SDL_SendEditingText(char *text, int start, int length)
> {
>     SDL_Keyboard *keyboard = &SDL_keyboard;
>     int posted;
>@@ -822,7 +822,7 @@
>         event.edit.windowID = keyboard->focus ? keyboard->focus->id : 0;
>         event.edit.start = start;
>         event.edit.length = length;
>-        SDL_utf8strlcpy(event.edit.text, text, SDL_arraysize(event.edit.text));
>+        event.edit.text = text;
>         posted = (SDL_PushEvent(&event) > 0);
>     }
>     return (posted);
>diff -r bfed06214c2a src/events/SDL_keyboard_c.h
>--- a/src/events/SDL_keyboard_c.h	Tue Aug 27 11:38:43 2019 +0200
>+++ b/src/events/SDL_keyboard_c.h	Sun Sep 01 00:40:52 2019 +0900
>@@ -51,10 +51,10 @@
> extern int SDL_SendKeyboardKey(Uint8 state, SDL_Scancode scancode);
> 
> /* Send keyboard text input */
>-extern int SDL_SendKeyboardText(const char *text);
>+extern int SDL_SendKeyboardText(char *text);
> 
> /* Send editing text for selected range from start to end */
>-extern int SDL_SendEditingText(const char *text, int start, int end);
>+extern int SDL_SendEditingText(char *text, int start, int end);
> 
> /* Shutdown the keyboard subsystem */
> extern void SDL_KeyboardQuit(void);
>diff -r bfed06214c2a src/video/windows/SDL_windowsevents.c
>--- a/src/video/windows/SDL_windowsevents.c	Tue Aug 27 11:38:43 2019 +0200
>+++ b/src/video/windows/SDL_windowsevents.c	Sun Sep 01 00:40:52 2019 +0900
>@@ -716,7 +716,8 @@
>         /* otherwise fall through to below */
>     case WM_CHAR:
>         {
>-            char text[5];
>+            char *text;
>+            text = (char *)SDL_malloc(5);
>             if (WIN_ConvertUTF32toUTF8((UINT32)wParam, text)) {
>                 SDL_SendKeyboardText(text);
>             }
>diff -r bfed06214c2a src/video/windows/SDL_windowskeyboard.c
>--- a/src/video/windows/SDL_windowskeyboard.c	Tue Aug 27 11:38:43 2019 +0200
>+++ b/src/video/windows/SDL_windowskeyboard.c	Sun Sep 01 00:40:52 2019 +0900
>@@ -751,7 +751,6 @@
>     char *s = 0;
>     s = WIN_StringToUTF8(videodata->ime_composition);
>     SDL_SendKeyboardText(s);
>-    SDL_free(s);
> 
>     videodata->ime_composition[0] = 0;
>     videodata->ime_readingstring[0] = 0;
>@@ -776,7 +775,6 @@
>     }
>     s = WIN_StringToUTF8(buffer);
>     SDL_SendEditingText(s, videodata->ime_cursor + (int)SDL_wcslen(videodata->ime_readingstring), 0);
>-    SDL_free(s);
> }
> 
> static void

Actions: View | Diff

Attachments on bug 4774: 3934 | 3939

We are currently migrating Bugzilla to GitHub issues.Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.