Ticket #78: j78-closed-wiimote-value-error.patch

trunk/python/Wiimote.c

@@ -15 +15 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, 
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor,
  * Boston, MA  02110-1301  USA
  *
  * ChangeLog:
@@ -59 +59 @@
 #include <errno.h>
 #include <bluetooth/bluetooth.h>
 #include "cwiid.h"
+#include "cwiid_internal.h" /* for send_report */
 
 typedef struct {
         PyObject_HEAD
@@ -178 +179 @@
         Wiimote_new,                    /* tp_new */
 };
 
+static void Wiimote_closed_ValueError() {
+        PyErr_SetString(PyExc_ValueError, "Wiimote is closed");
+}
+
 /* Allocate and deallocate functions */
 static PyObject *
         Wiimote_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
@@ -259 +264 @@
 
 static PyObject *Wiimote_close(Wiimote *self)
 {
+        if (!self->wiimote) {
+                Wiimote_closed_ValueError();
+                return NULL;
+        }
         if (cwiid_close(self->wiimote)) {
                 PyErr_SetString(PyExc_RuntimeError,
                                 "Error closing wiimote connection");
@@ -275 +284 @@
         static char *kwlist[] = {"flags", NULL};
         int flags;
 
+        if (!self->wiimote) {
+                Wiimote_closed_ValueError();
+                return NULL;
+        }
         if (!PyArg_ParseTupleAndKeywords(args, kwds, "i:cwiid.Wiimote.enable",
                                          kwlist, &flags)) {
                 return NULL;
@@ -293 +306 @@
         static char *kwlist[] = {"flags", NULL};
         int flags;
 
+        if (!self->wiimote) {
+                Wiimote_closed_ValueError();
+                return NULL;
+        }
         if (!PyArg_ParseTupleAndKeywords(args, kwds, "i:cwiid.Wiimote.disable",
                                          kwlist, &flags)) {
                 return NULL;
@@ -312 +329 @@
 {
         PyObject *OldCallback;
 
+        if (!self->wiimote) {
+                Wiimote_closed_ValueError();
+                return -1;
+        }
         if (!PyCallable_Check(NewCallback)) {
                 PyErr_SetString(PyExc_TypeError, "callback must be callable!");
         }
@@ -346 +367 @@
         struct timespec t;
         PyObject *PyMesg;
 
+        if (!self->wiimote) {
+                Wiimote_closed_ValueError();
+                return NULL;
+        }
         if (cwiid_get_mesg(self->wiimote, &mesg_count, &mesg, &t)) {
                 if (errno == EAGAIN) {
                         Py_RETURN_NONE;
@@ -369 +394 @@
         struct cwiid_state state;
         PyObject *PyState;
 
+        if (!self->wiimote) {
+                Wiimote_closed_ValueError();
+                return NULL;
+        }
         if (cwiid_get_state(self->wiimote, &state)) {
                 PyErr_SetString(PyExc_IOError, "get state error");
                 return NULL;
         }
+        if (!self->wiimote) {
+                Wiimote_closed_ValueError();
+                return NULL;
+        }
 
         PyState = Py_BuildValue("{s:B,s:B,s:B,s:B,s:i,s:i}",
                                 "rpt_mode", state.rpt_mode,
@@ -539 +572 @@
         struct acc_cal acc_cal;
         PyObject *PyAccCal;
 
+        if (!self->wiimote) {
+                Wiimote_closed_ValueError();
+                return NULL;
+        }
         if (!PyArg_ParseTupleAndKeywords(args, kwds,
                                          "i:cwiid.Wiimote.get_acc_cal", kwlist,
                                          &ext_type)) {
@@ -575 +612 @@
 {
         long led;
 
+        if (!self->wiimote) {
+                Wiimote_closed_ValueError();
+                return -1;
+        }
         if (((led = PyInt_AsLong(PyLed)) == -1) && PyErr_Occurred()) {
                 return -1;
         }
@@ -593 +634 @@
 {
         long rumble;
 
+        if (!self->wiimote) {
+                Wiimote_closed_ValueError();
+                return -1;
+        }
         if (((rumble = PyInt_AsLong(PyRumble)) == -1) && PyErr_Occurred()) {
                 return -1;
         }
@@ -611 +656 @@
 {
         long rpt_mode;
 
+        if (!self->wiimote) {
+                Wiimote_closed_ValueError();
+                return -1;
+        }
         if (((rpt_mode = PyInt_AsLong(PyRptMode)) == -1) && PyErr_Occurred()) {
                 return -1;
         }
@@ -649 +698 @@
         void *buf;
         PyObject *pyRetBuf;
 
+        if (!self->wiimote) {
+                Wiimote_closed_ValueError();
+                return NULL;
+        }
         if (!PyArg_ParseTupleAndKeywords(args, kwds, "BII:cwiid.Wiimote.read",
                                          kwlist, &flags, &offset, &len)) {
                 return NULL;
@@ -699 +752 @@
         void *buf;
         int len;
 
+        if (!self->wiimote) {
+                Wiimote_closed_ValueError();
+                return NULL;
+        }
         if (!PyArg_ParseTupleAndKeywords(args, kwds, "BIt#:cwiid.Wiimote.write",
                                          kwlist, &flags, &offset, &buf, &len)) {
                 return NULL;
@@ -715 +772 @@
 static void CallbackBridge(cwiid_wiimote_t *wiimote, int mesg_count,
                                union cwiid_mesg mesg[], struct timespec *t)
 {
-        PyObject *ArgTuple, *Time;
+        PyObject *ArgTuple;
         PyObject *PySelf;
         PyGILState_STATE gstate;
 
         gstate = PyGILState_Ensure();
+        if (!wiimote) {
+                Wiimote_closed_ValueError();
+                PyGILState_Release(gstate);
+                return;
+        }
 
         ArgTuple = ConvertMesgArray(mesg_count, mesg);
 
@@ -743 +805 @@
  *
  * Python callback takes arg (mesgs). The mesgs is a list of
  * mesg tuples which contain the mesg type and a dict of the arguments.
- * 
+ *
  * Ex:
  * mesgs =>[(cwiid.STATUS_MESG,{"battery":battery,"ext_type":ext_type}),
- *          (cwiid.BTN_MESG,buttons), 
+ *          (cwiid.BTN_MESG,buttons),
  *          (cwiid.ACC_MESG,(x,y,z)),
  *          (cwiid.IR_MESG,[{"pos":(x,y),"size":size}, ...]),
  *          (cwiid.NUNCHUK_MESG,{"stick":(x,y),"acc":(x,y,z),