mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-11-03 11:23:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Plugged a couple of potential return value problems, memory leaks, and

Browse source 
descriptor leaks.
This commit is contained in:
Barry Warsaw 1997-01-09 22:29:57 +00:00
parent 2dc8c2c26b
commit 42185a2d7a
1 changed files with 13 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

21
Modules/sunaudiodev.c
View file

@ -118,8 +118,10 @@ newsadobject(arg)
/* Create and initialize the object */ /* Create and initialize the object */
xp = PyObject_NEW(sadobject, &Sadtype); xp = PyObject_NEW(sadobject, &Sadtype);
if (xp == NULL) if (xp == NULL) {
close(fd);
return NULL; return NULL;
}
xp->x_fd = fd; xp->x_fd = fd;
xp->x_icount = xp->x_ocount = 0; xp->x_icount = xp->x_ocount = 0;
xp->x_isctl = (imode < 0); xp->x_isctl = (imode < 0);
@ -162,9 +164,9 @@ sad_read(self, args)
} }
#if 0 #if 0
/* TBD: why print this message if you can handle the condition? /* TBD: why print this message if you can handle the condition?
assume it's debugging info which we can just as well get rid * assume it's debugging info which we can just as well get rid
of. in any case this message should *not* be using printf! * of. in any case this message should *not* be using printf!
*/ */
if (count != size) if (count != size)
printf("sunaudio: funny read rv %d wtd %d\n", count, size); printf("sunaudio: funny read rv %d wtd %d\n", count, size);
#endif #endif
@ -211,7 +213,9 @@ sad_getinfo(self, args)
if (!PyArg_Parse(args, "")) if (!PyArg_Parse(args, ""))
return NULL; return NULL;
rv = sads_alloc(); if (!(rv = sads_alloc()))
return NULL;
if (ioctl(self->x_fd, AUDIO_GETINFO, &rv->ai) < 0) { if (ioctl(self->x_fd, AUDIO_GETINFO, &rv->ai) < 0) {
PyErr_SetFromErrno(SunAudioError); PyErr_SetFromErrno(SunAudioError);
Py_DECREF(rv); Py_DECREF(rv);
@ -501,7 +505,8 @@ initsunaudiodev()
m = Py_InitModule("sunaudiodev", sunaudiodev_methods); m = Py_InitModule("sunaudiodev", sunaudiodev_methods);
d = PyModule_GetDict(m); d = PyModule_GetDict(m);
SunAudioError = PyString_FromString("sunaudiodev.error"); SunAudioError = PyString_FromString("sunaudiodev.error");
if ( SunAudioError == NULL || if (SunAudioError)
PyDict_SetItemString(d, "error", SunAudioError) ) PyDict_SetItemString(d, "error", SunAudioError);
Py_FatalError("can't define sunaudiodev.error"); if (PyErr_Occurred())
Py_FatalError("can't initialize sunaudiodev module");
} }