Coverity fixes
authorNelson Ferreira <nelson.ferreira@ieee.org>
Sun, 2 Oct 2011 21:08:56 +0000 (17:08 -0400)
committerNelson Ferreira <nelson.ferreira@ieee.org>
Sun, 2 Oct 2011 21:08:56 +0000 (17:08 -0400)
* src/ui/TTY/gpmevent.c (Fgpm_enabled_p): check return of snprintf
* src/ui/TTY/gpmevent.c (Fgpm_enable): ditto.

Signed-off-by: Nelson Ferreira <nelson.ferreira@ieee.org>
src/ui/TTY/gpmevent.c

index 218a256..41890bd 100644 (file)
@@ -480,15 +480,16 @@ Return non-nil if GPM mouse support is currently enabled on DEVICE.
 {
        char *console_name = ttyname(DEVICE_INFD(decode_device(device)));
        char process_name[1024];
+       int sz;
        Lisp_Object proc;
 
        if (!console_name) {
                return (Qnil);
        }
 
-       memset(process_name, '\0', sizeof(process_name));
-       snprintf(process_name, sizeof(process_name) - 1, "gpm for %s",
-                console_name);
+       sz = snprintf(process_name, sizeof(process_name), "gpm for %s",
+                     console_name);
+       assert(sz >= 0 && sz < sizeof(process_name));
 
        proc = Fget_process(build_string(process_name));
 
@@ -508,7 +509,7 @@ Toggle accepting of GPM mouse events.
       (device, arg))
 {
        Gpm_Connect conn;
-       int rval;
+       int rval, sz;
        Lisp_Object gpm_process;
        Lisp_Object gpm_filter;
        struct device *d = decode_device(device);
@@ -528,9 +529,9 @@ Toggle accepting of GPM mouse events.
                return (Qnil);
        }
 
-       memset(process_name, '\0', sizeof(process_name));
-       snprintf(process_name, sizeof(process_name) - 1, "gpm for %s",
-                console_name);
+       sz = snprintf(process_name, sizeof(process_name), "gpm for %s",
+                     console_name);
+       assert(sz >= 0 && sz < sizeof(process_name));
 
        if (NILP(arg)) {
                turn_off_gpm(process_name);