Changeset 357Tweet

Timestamp:

Jan 21, 2004, 2:49:26 PM (19 years ago)

Author:

Sam Hocevar

Message:

• src/graphics.c: + Fixed a buffer overflow due to bad signed/unsigned handling.
• src/event.c: + Disallow zero width or height in the X11 driver. + Fixed resizing in ncurses and slang.
• THANKS: + Added the Source Mage maintainer.

Location:

libcaca/trunk

Files:

• THANKS (modified) (1 diff)
• src/event.c (modified) (4 diffs)
• src/graphics.c (modified) (1 diff)

libcaca/trunk/THANKS

@@ -4 +4 @@
 Gildas Bazin <gbazin@netcourrier.com> - win32 driver improvements
 Jan Hubicka <hubicka@freesoft.cz> - aafire
+Ladislav Hagara <hgr@vabo.cz> - Source Mage spell
 Michele Bini <mibin@tin.it> - original SDL plasma
 Philip Balinov - Slackware package

libcaca/trunk/src/event.c

@@ -279 +279 @@
                       / x11_font_height;
 
-                if(w == _caca_width && h == _caca_height)
+                if(!w || !h || (w == _caca_width && h == _caca_height))
                     continue;
 
@@ -371 +371 @@
         {
             _caca_resize_event = 0;
+            _caca_resize = 1;
             return CACA_EVENT_RESIZE;
         }
@@ -554 +555 @@
         {
             _caca_resize_event = 0;
+            _caca_resize = 1;
             return CACA_EVENT_RESIZE;
         }
@@ -724 +726 @@
 static void _push_event(unsigned int event)
 {
-    if(events == EVENTBUF_LEN)
+    if(!event || events == EVENTBUF_LEN)
         return;
     eventbuf[events] = event;

libcaca/trunk/src/graphics.c

@@ -444 +444 @@
     if(x < 0)
     {
+        if(len < (unsigned int)-x)
+            return;
         len -= -x;
-        if(len < 0)
-            return;
         s += -x;
         x = 0;