archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-19 08:49:28 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Error reporting leaks and cleanup

Browse source
This commit is contained in:
Wez Furlong 2003-02-10 12:33:15 +00:00
parent 778ce2495d
commit b0894e7eba
2 changed files with 6 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

6
ext/rpc/com/com.c
View file

@ -495,7 +495,7 @@ static int com_call(rpc_string method_name, void **data, zval *return_value, int
VARIANT *variant_args; VARIANT *variant_args;
VARIANT result; VARIANT result;
int current_arg, current_variant; int current_arg, current_variant;
char *ErrString; char *ErrString = NULL;
TSRMLS_FETCH(); TSRMLS_FETCH();
/* if the length of the name is 0, we are dealing with a pointer to a dispid */ /* if the length of the name is 0, we are dealing with a pointer to a dispid */
@ -552,7 +552,7 @@ static int com_call(rpc_string method_name, void **data, zval *return_value, int
static int com_get(rpc_string property_name, zval *return_value, void **data) static int com_get(rpc_string property_name, zval *return_value, void **data)
{ {
char *ErrString; char *ErrString = NULL;
VARIANT *result; VARIANT *result;
OLECHAR *propname; OLECHAR *propname;
DISPID dispid; DISPID dispid;
@ -610,7 +610,7 @@ static int com_set(rpc_string property_name, zval *value, void **data)
DISPID dispid, mydispid = DISPID_PROPERTYPUT; DISPID dispid, mydispid = DISPID_PROPERTYPUT;
DISPPARAMS dispparams; DISPPARAMS dispparams;
VARIANT *var; VARIANT *var;
char *error_message, *ErrString; char *error_message, *ErrString = NULL;
TSRMLS_FETCH(); TSRMLS_FETCH();
/* obtain property handler */ /* obtain property handler */

8
ext/rpc/com/com_wrapper.c
View file

@ -125,8 +125,7 @@ ZEND_API HRESULT php_COM_invoke(comval *obj, DISPID dispIdMember, WORD wFlags, D
SysFreeString(ExceptInfo.bstrDescription); SysFreeString(ExceptInfo.bstrDescription);
} }
*ErrString = emalloc(srclen+desclen+50); spprintf(ErrString, 0, "<b>Source</b>: %s <b>Description</b>: %s", src, desc);
zend_sprintf(*ErrString, "<b>Source</b>: %s <b>Description</b>: %s", src, desc);
efree(src); efree(src);
efree(desc); efree(desc);
@ -138,8 +137,7 @@ ZEND_API HRESULT php_COM_invoke(comval *obj, DISPID dispIdMember, WORD wFlags, D
break; break;
case DISP_E_PARAMNOTFOUND: case DISP_E_PARAMNOTFOUND:
case DISP_E_TYPEMISMATCH: case DISP_E_TYPEMISMATCH:
*ErrString = emalloc(25); spprintf(ErrString, 0, "<b>Argument</b>: %d", pDispParams->cArgs-ArgErr+1);
sprintf(*ErrString, "<b>Argument</b>: %d", pDispParams->cArgs-ArgErr+1);
break; break;
} }
} }
@ -247,7 +245,7 @@ ZEND_API HRESULT php_COM_set(comval *obj, IDispatch FAR* FAR* ppDisp, int cleanu
ZEND_API char *php_COM_error_message(HRESULT hr) ZEND_API char *php_COM_error_message(HRESULT hr)
{ {
void *pMsgBuf; void *pMsgBuf = NULL;
if (!FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM, NULL, if (!FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM, NULL,
hr, MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), (LPTSTR) &pMsgBuf, 0, NULL)) { hr, MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), (LPTSTR) &pMsgBuf, 0, NULL)) {