# HG changeset patch
# User gthomas
# Date 1062592320 0
# Node ID 794b7caa7450ad0b823495423816084010640733
# Parent  797d8336bd8a3bbe5d6a52cac9825271b0b02a68
Avoid null pointers

diff --git a/packages/services/gfx/mw/current/ChangeLog b/packages/services/gfx/mw/current/ChangeLog
--- a/packages/services/gfx/mw/current/ChangeLog
+++ b/packages/services/gfx/mw/current/ChangeLog
@@ -1,3 +1,12 @@
+2003-09-03  Gary Thomas  <gary@mlbassoc.com>
+
+	* src/ecos/nanox_thread.c (nanox_thread): Fill in program
+	name - also from Eric Doenges.
+
+	* src/drivers/kbd_vnc_ecos.c (vnc_GetModifierInfo): 
+	Protect against null [curmodifiers] pointer.  Reported
+	by Eric Doenges <Eric.Doenges@DynaPel.com>
+
 2003-09-01  Chris Garry <cgarry@sweeneydesign.co.uk>
 
     * src/ecos/ecos_app.c:
diff --git a/packages/services/gfx/mw/current/src/drivers/kbd_vnc_ecos.c b/packages/services/gfx/mw/current/src/drivers/kbd_vnc_ecos.c
--- a/packages/services/gfx/mw/current/src/drivers/kbd_vnc_ecos.c
+++ b/packages/services/gfx/mw/current/src/drivers/kbd_vnc_ecos.c
@@ -112,8 +112,10 @@ static void vnc_GetModifierInfo(MWKEYMOD
         *modifiers = MWKMOD_CTRL | MWKMOD_SHIFT | MWKMOD_ALT | MWKMOD_META
                    | MWKMOD_CAPS | MWKMOD_NUM | MWKMOD_SCR;
     }
-
-    *curmodifiers = current_mods;
+    if (curmodifiers)
+    {
+        *curmodifiers = current_mods;
+    }
 }
 
 
diff --git a/packages/services/gfx/mw/current/src/ecos/nanox_thread.c b/packages/services/gfx/mw/current/src/ecos/nanox_thread.c
--- a/packages/services/gfx/mw/current/src/ecos/nanox_thread.c
+++ b/packages/services/gfx/mw/current/src/ecos/nanox_thread.c
@@ -45,8 +45,7 @@ static void
 nanox_thread(CYG_ADDRWORD data)
 {
     int argc = 0;
-    char **argv;
+    char *argv[] = {"nanox_thread", NULL};
 
-        printf("%s.%d\n", __FUNCTION__, __LINE__);
     nanox_main(argc, argv);
 }