Attachment #134410 for bug #197117

Lines 118-124 Link Here

(-)pyvorbis-1.5a/src/pyvorbiscodec.c (-1 / +1 lines)
118	{	118	{
119	vorbis_dsp_clear(PY_DSP(self));	119	vorbis_dsp_clear(PY_DSP(self));
120	Py_XDECREF(((py_dsp *)self)->parent);	120	Py_XDECREF(((py_dsp *)self)->parent);
121	PyMem_DEL(self);	121	PyObject_Del(self);
122	}	122	}
123		123
124	static PyObject*	124	static PyObject*

Lines 171-177 Link Here

(-)pyvorbis-1.5a/src/pyvorbisfile.c (-2 / +2 lines)
171		171
172	ret = py_ov_open(newobj, args);	172	ret = py_ov_open(newobj, args);
173	if (ret == NULL) {	173	if (ret == NULL) {
174	PyMem_DEL(newobj);	174	PyObject_Del(newobj);
175	return NULL;	175	return NULL;
176	}	176	}
177		177
Lines 196-202 Link Here
196		196
197	free(py_self->ovf);	197	free(py_self->ovf);
198		198
199	PyObject_DEL(self);	199	PyObject_Del(self);
200	}	200	}
201		201
202	static PyObject *	202	static PyObject *




static void
py_ov_info_dealloc(PyObject *self)
{
  PyObject_Del(self);
}

#define CMP_RET(x) \

    free(ovc_self->vc);
  }

  PyObject_Del(self);
}



#if PY_UNICODE
      item = PyUnicode_DecodeUTF8(val, vallen, NULL);
      if (!item) {
        PyErr_Clear();
        /* To deal with non-UTF8 comments (against the standard) */
        item = PyString_FromStringAndSize(val, vallen); 
      } 

Return to bug 197117

Lines 134-140 Link Here

(-)pyvorbis-1.5a/src/pyvorbisinfo.c (-2 / +3 lines)
134	static void	134	static void
135	py_ov_info_dealloc(PyObject *self)	135	py_ov_info_dealloc(PyObject *self)
136	{	136	{
137	PyMem_DEL(self);	137	PyObject_Del(self);
138	}	138	}
139		139
140	#define CMP_RET(x) \	140	#define CMP_RET(x) \
Lines 418-424 Link Here
418	free(ovc_self->vc);	418	free(ovc_self->vc);
419	}	419	}
420		420
421	PyMem_DEL(self);	421	PyObject_Del(self);
422	}	422	}
423		423
424		424
Lines 999-1004 Link Here
999	#if PY_UNICODE	999	#if PY_UNICODE
1000	item = PyUnicode_DecodeUTF8(val, vallen, NULL);	1000	item = PyUnicode_DecodeUTF8(val, vallen, NULL);
1001	if (!item) {	1001	if (!item) {
		1002	PyErr_Clear();
1002	/* To deal with non-UTF8 comments (against the standard) */	1003	/* To deal with non-UTF8 comments (against the standard) */
1003	item = PyString_FromStringAndSize(val, vallen);	1004	item = PyString_FromStringAndSize(val, vallen);
1004	}	1005	}