Added PyMac_BuildOptStr255, which returns None on a null pointer.

diff --git a/Mac/Include/macglue.h b/Mac/Include/macglue.h
index 5e390448c0adc910a2eb08fcd7385d5e0a9865f0..bc1939fb1afb6ea83eb3de7d8da168cd6b8194b7 100644 (file)
--- a/Mac/Include/macglue.h
+++ b/Mac/Include/macglue.h
@@ -105,6 +105,7 @@ PyObject *PyMac_BuildNumVersion(NumVersion);        /* Convert NumVersion to PyObject *
 
 int PyMac_GetStr255(PyObject *, Str255);       /* argument parser for Str255 */
 PyObject *PyMac_BuildStr255(Str255);           /* Convert Str255 to PyObject */
+PyObject *PyMac_BuildOptStr255(Str255);                /* Convert Str255 to PyObject, NULL to None */
 
 int PyMac_GetFSSpec(PyObject *, FSSpec *);     /* argument parser for FSSpec */
 PyObject *PyMac_BuildFSSpec(FSSpec *);         /* Convert FSSpec to PyObject */

diff --git a/Mac/Python/macglue.c b/Mac/Python/macglue.c
index 117911aedfbc6bd43ddbb9b53753a0d855d44ac1..40cdfa2b6afc9ac1f0241bce557232b9bca84d96 100644 (file)
--- a/Mac/Python/macglue.c
+++ b/Mac/Python/macglue.c
@@ -826,6 +826,20 @@ PyMac_GetStr255(PyObject *v, Str255 pbuf)
 PyObject *
 PyMac_BuildStr255(Str255 s)
 {
+       if ( s == NULL ) {
+               PyErr_SetString(PyExc_SystemError, "Str255 pointer is NULL");
+               return NULL;
+       }
+       return PyString_FromStringAndSize((char *)&s[1], (int)s[0]);
+}
+
+PyObject *
+PyMac_BuildOptStr255(Str255 s)
+{
+       if ( s == NULL ) {
+               Py_INCREF(Py_None);
+               return Py_None;
+       }
        return PyString_FromStringAndSize((char *)&s[1], (int)s[0]);
 }