patch from div0 to fix the fixangle logic (my fix apparently didn't work properly...

[xonotic/darkplaces.git] / sys_sdl.c

diff --git a/sys_sdl.c b/sys_sdl.c
index 5f3e6c6c5049920644bde787367efecd19dd55b1..c781cfed3cff43f632c862a2e312362ca5887a31 100644 (file)
--- a/sys_sdl.c
+++ b/sys_sdl.c
@@ -155,11 +155,11 @@ char *Sys_ConsoleInput(void)
        return NULL;
 }
 
-void Sys_Sleep(int milliseconds)
+void Sys_Sleep(int microseconds)
 {
-       if (milliseconds < 1)
-               milliseconds = 1;
-       SDL_Delay(milliseconds);
+       if (microseconds < 1000)
+               microseconds = 1000;
+       SDL_Delay(microseconds / 1000);
 }
 
 char *Sys_GetClipboardData (void)
@@ -176,8 +176,10 @@ char *Sys_GetClipboardData (void)
                {
                        if ((cliptext = GlobalLock (hClipboardData)) != 0)
                        {
-                               data = Z_Malloc (GlobalSize(hClipboardData)+1);
-                               strcpy (data, cliptext);
+                               size_t allocsize;
+                               allocsize = GlobalSize (hClipboardData) + 1;
+                               data = Z_Malloc (allocsize);
+                               strlcpy (data, cliptext, allocsize);
                                GlobalUnlock (hClipboardData);
                        }
                }