Mercurial > ecos
changeset 1193:794b7caa7450
Avoid null pointers
| author | gthomas |
|---|---|
| date | Wed, 03 Sep 2003 12:32:00 +0000 |
| parents | 797d8336bd8a |
| children | 3c7101fdac8c |
| files | packages/services/gfx/mw/current/ChangeLog packages/services/gfx/mw/current/src/drivers/kbd_vnc_ecos.c packages/services/gfx/mw/current/src/ecos/nanox_thread.c |
| diffstat | 3 files changed, 14 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- 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:
--- 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; + } }
--- 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); }