[pywin32-checkins] pywin32/win32/src PySECURITY_DESCRIPTOR.cpp,1.15,1.16

[Roger U. <ru...@us...>]

Update of /cvsroot/pywin32/pywin32/win32/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13579/win32/src

Modified Files:
	PySECURITY_DESCRIPTOR.cpp 
Log Message:
Check for NULL security descriptor pointer in PyWinMethod_NewSECURITY_DESCRIPTOR

Index: PySECURITY_DESCRIPTOR.cpp
===================================================================
RCS file: /cvsroot/pywin32/pywin32/win32/src/PySECURITY_DESCRIPTOR.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** PySECURITY_DESCRIPTOR.cpp	27 Jan 2005 01:46:44 -0000	1.15
--- PySECURITY_DESCRIPTOR.cpp	28 Jan 2005 08:50:20 -0000	1.16
***************
*** 84,89 ****
  {
  	int descriptor_len = SECURITY_DESCRIPTOR_MIN_LENGTH;
! 	if (PyArg_ParseTuple(args, "|l:SECURITY_DESCRIPTOR", &descriptor_len))
! 		return new PySECURITY_DESCRIPTOR(descriptor_len);
  
  	PyErr_Clear();
--- 84,97 ----
  {
  	int descriptor_len = SECURITY_DESCRIPTOR_MIN_LENGTH;
! 	if (PyArg_ParseTuple(args, "|l:SECURITY_DESCRIPTOR", &descriptor_len)){
! 		PyObject *ret=new PySECURITY_DESCRIPTOR(descriptor_len);
! 		if (((PySECURITY_DESCRIPTOR *)ret)->GetSD()==NULL){
! 			if (!PyErr_Occurred())
! 				PyErr_SetString(PyExc_NotImplementedError,"Security descriptors are not supported on this platform");
! 			Py_DECREF(ret);
! 			ret=NULL;
! 			}
! 		return ret;
! 		}
  
  	PyErr_Clear();
***************
*** 239,242 ****
--- 247,251 ----
  		// SECURITY_DESCRIPTOR stuff is not supported.
  		this->m_psd = NULL;
+ 		return TRUE;
  		}
  	else if (_IsSelfRelative(psd)){