Fix some crashes by checking pointers before deref

This commit is contained in:
Ryan Pavlik
2010-11-11 15:11:27 -06:00
parent 61238e4732
commit 8eef1f89dc
2 changed files with 6 additions and 0 deletions

View File

@@ -144,6 +144,8 @@ int wiiuse_connect(struct wiimote_t** wm, int wiimotes) {
int i = 0; int i = 0;
for (; i < wiimotes; ++i) { for (; i < wiimotes; ++i) {
if (!wm[i])
continue;
if (WIIMOTE_IS_SET(wm[i], WIIMOTE_STATE_CONNECTED)) if (WIIMOTE_IS_SET(wm[i], WIIMOTE_STATE_CONNECTED))
++connected; ++connected;
} }

View File

@@ -505,8 +505,12 @@ void wiiuse_status(struct wiimote_t* wm) {
*/ */
struct wiimote_t* wiiuse_get_by_id(struct wiimote_t** wm, int wiimotes, int unid) { struct wiimote_t* wiiuse_get_by_id(struct wiimote_t** wm, int wiimotes, int unid) {
int i = 0; int i = 0;
if (!wm)
return NULL;
for (; i < wiimotes; ++i) { for (; i < wiimotes; ++i) {
if (!wm[i])
continue;
if (wm[i]->unid == unid) if (wm[i]->unid == unid)
return wm[i]; return wm[i];
} }