Coverity issues done and dusted! from Nelson

* merges:
  Coverity: CID 21028 Logically dead code
  Coverity CID 400011 - Derefence NULL return value

diff --git a/src/doc.c b/src/doc.c
index 1ebb10d..d7b2c5f 100644 (file)
--- a/src/doc.c
+++ b/src/doc.c
@@ -748,6 +748,12 @@ when doc strings are referred to in the dumped Emacs.
                /* p points to ^_Ffunctionname\n or ^_Vvarname\n.  */
                if (p != end) {
                        end = strchr(p, '\n');
+                        if (end == NULL) {
+                                report_file_error("Bad format in file",
+                                                  Fcons(build_string(name), Qnil)); 
+                                close(fd);
+                                return Qnil;
+                        }
                        sym =
                            oblookup(Vobarray, (Bufbyte *) p + 2, end - p - 2);
                        if (SYMBOLP(sym)) {

diff --git a/src/ui/X11/event-Xt.c b/src/ui/X11/event-Xt.c
index 4811a08..3db0524 100644 (file)
--- a/src/ui/X11/event-Xt.c
+++ b/src/ui/X11/event-Xt.c
@@ -863,6 +863,7 @@ static void x_handle_sticky_modifiers(XEvent * ev, struct device *d)
        struct x_device *xd;
        KeyCode keycode;
        int type;
+       bool key_event_p;
 
        if (!modifier_keys_are_sticky) {
                /* Optimize for non-sticky modifiers */
@@ -877,11 +878,10 @@ static void x_handle_sticky_modifiers(XEvent * ev, struct device *d)
            keycode > xd->x_keysym_map_max_code) {
                return;
        }
+       key_event_p = (type == KeyPress || type == KeyRelease);
 
-       if (!((type == KeyPress || type == KeyRelease) &&
-             x_key_is_modifier_p(keycode, d))) {
+       if (!( key_event_p && x_key_is_modifier_p(keycode, d))) {
                /* Not a modifier key */
-               bool key_event_p = (type == KeyPress || type == KeyRelease);
 
                if (type == ButtonPress
                    || (type == KeyPress