This is the mail archive of the
ecos-patches@sources.redhat.com
mailing list for the eCos project.
MicroWindows - null pointer fixups
- From: Gary Thomas <gary at mlbassoc dot com>
- To: eCos patches <ecos-patches at sources dot redhat dot com>
- Date: 03 Sep 2003 06:33:31 -0600
- Subject: MicroWindows - null pointer fixups
- Organization: MLB Associates
>From Eric Doenges
--
Gary Thomas <gary@mlbassoc.com>
MLB Associates
Index: services/gfx/mw/current/ChangeLog
===================================================================
RCS file: /misc/cvsfiles/ecos/packages/services/gfx/mw/current/ChangeLog,v
retrieving revision 1.8
diff -u -5 -p -r1.8 ChangeLog
--- services/gfx/mw/current/ChangeLog 2 Sep 2003 11:24:17 -0000 1.8
+++ services/gfx/mw/current/ChangeLog 3 Sep 2003 12:17:42 -0000
@@ -1,5 +1,14 @@
+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:
* src/ecos/ecos_init.c:
Do not use ARM display hardware setup routines when VNC server
Index: services/gfx/mw/current/src/drivers/kbd_vnc_ecos.c
===================================================================
RCS file: /misc/cvsfiles/ecos/packages/services/gfx/mw/current/src/drivers/kbd_vnc_ecos.c,v
retrieving revision 1.1
diff -u -5 -p -r1.1 kbd_vnc_ecos.c
--- services/gfx/mw/current/src/drivers/kbd_vnc_ecos.c 28 Aug 2003 10:34:35 -0000 1.1
+++ services/gfx/mw/current/src/drivers/kbd_vnc_ecos.c 3 Sep 2003 12:10:15 -0000
@@ -110,12 +110,14 @@ static void vnc_GetModifierInfo(MWKEYMOD
if (modifiers)
{
*modifiers = MWKMOD_CTRL | MWKMOD_SHIFT | MWKMOD_ALT | MWKMOD_META
| MWKMOD_CAPS | MWKMOD_NUM | MWKMOD_SCR;
}
-
- *curmodifiers = current_mods;
+ if (curmodifiers)
+ {
+ *curmodifiers = current_mods;
+ }
}
/*
* This reads one keystroke from the keyboard, and the current state of
Index: services/gfx/mw/current/src/ecos/nanox_thread.c
===================================================================
RCS file: /misc/cvsfiles/ecos/packages/services/gfx/mw/current/src/ecos/nanox_thread.c,v
retrieving revision 1.2
diff -u -5 -p -r1.2 nanox_thread.c
--- services/gfx/mw/current/src/ecos/nanox_thread.c 30 Aug 2003 21:30:05 -0000 1.2
+++ services/gfx/mw/current/src/ecos/nanox_thread.c 3 Sep 2003 12:16:57 -0000
@@ -43,10 +43,9 @@ externC int nanox_main(int argc, char *a
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);
}