Attachment #125861 for bug #186450

Lines 202-207 Link Here

(-)trunk~/lib/client.c (+3 lines)
202	{ NULL, NULL }	202	{ NULL, NULL }
203	};	203	};
204		204
		205	/* lock allocation type */
		206	_sasl_allocation_locked++;
		207
205	if(_sasl_client_active) {	208	if(_sasl_client_active) {
206	/* We're already active, just increase our refcount */	209	/* We're already active, just increase our refcount */
207	/* xxx do something with the callback structure? */	210	/* xxx do something with the callback structure? */

Lines 107-112 Link Here

(-)trunk~/lib/common.c (+3 lines)
107	(sasl_realloc_t *) &realloc,	107	(sasl_realloc_t *) &realloc,
108	(sasl_free_t *) &free	108	(sasl_free_t *) &free
109	};	109	};
		110	int _sasl_allocation_locked = 0;
110		111
111	#define SASL_ENCODEV_EXTRA 4096	112	#define SASL_ENCODEV_EXTRA 4096
112		113
Lines 637-642 Link Here
637	sasl_realloc_t *r,	638	sasl_realloc_t *r,
638	sasl_free_t *f)	639	sasl_free_t *f)
639	{	640	{
		641	if (_sasl_allocation_locked++) return;
		642
640	_sasl_allocation_utils.malloc=m;	643	_sasl_allocation_utils.malloc=m;
641	_sasl_allocation_utils.calloc=c;	644	_sasl_allocation_utils.calloc=c;
642	_sasl_allocation_utils.realloc=r;	645	_sasl_allocation_utils.realloc=r;

Lines 300-305 Link Here

(-)trunk~/lib/saslint.h (+1 lines)
300		300
301	extern sasl_allocation_utils_t _sasl_allocation_utils;	301	extern sasl_allocation_utils_t _sasl_allocation_utils;
302	extern sasl_mutex_utils_t _sasl_mutex_utils;	302	extern sasl_mutex_utils_t _sasl_mutex_utils;
		303	extern int _sasl_allocation_locked;
303		304
304	/*	305	/*
305	* checkpw.c	306	* checkpw.c

Lines 698-703 Link Here

(-)trunk~/lib/server.c (+3 lines)
698	{ NULL, NULL }	698	{ NULL, NULL }
699	};	699	};
700		700
		701	/* lock allocation type */
		702	_sasl_allocation_locked++;
		703
701	/* we require the appname (if present) to be short enough to be a path */	704	/* we require the appname (if present) to be short enough to be a path */
702	if (appname != NULL && strlen(appname) >= PATH_MAX)	705	if (appname != NULL && strlen(appname) >= PATH_MAX)
703	return SASL_BADPARAM;	706	return SASL_BADPARAM;

Return to bug 186450