Commit 56456c1e authored by bol-van's avatar bol-van
Browse files

nfqws,tpws: fix possible crashes or high memory usage if hostlist has duplicate hostnames

parent d6a8d1dc

docs/changes.txt

+4 −0
Original line number Diff line number Diff line
@@ -534,3 +534,7 @@ nfqws: ts fooling 
blockcheck: test ts fooling

blockcheck: auto enable tcp timestamps in windows

tpws,nfqws: special handling of IP-like hostnames. strip :port from hostname:port



v71.4



nfqws,tpws: fix possible crashes or high memory usage if hostlist has duplicate hostnames

nfq/pools.c

+8 −5
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ 
	memcpy(elem->str, keystr, keystr_len); \

	elem->str[keystr_len] = 0; \

	oom = false; \

	HASH_ADD_KEYPTR(hh, *ppool, elem->str, strlen(elem->str), elem); \

	HASH_ADD_KEYPTR(hh, *ppool, elem->str, keystr_len, elem); \

	if (oom) \

	{ \

		free(elem->str); \
@@ -33,9 +33,12 @@ 
		return false; \

	}

#define ADD_HOSTLIST_POOL(etype, ppool, keystr, keystr_len, flg) \

	etype *elem_find; \

	HASH_FIND(hh, *ppool, keystr, keystr_len, elem_find); \

	if (!elem_find) { \

		ADD_STR_POOL(etype,ppool,keystr,keystr_len); \

	elem->flags = flg;



		elem->flags = flg; \

	}



#undef uthash_nonfatal_oom

#define uthash_nonfatal_oom(elt) ut_oom_recover(elt)

tpws/pools.c

+7 −4
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ 
	memcpy(elem->str, keystr, keystr_len); \

	elem->str[keystr_len] = 0; \

	oom = false; \

	HASH_ADD_KEYPTR(hh, *ppool, elem->str, strlen(elem->str), elem); \

	HASH_ADD_KEYPTR(hh, *ppool, elem->str, keystr_len, elem); \

	if (oom) \

	{ \

		free(elem->str); \
@@ -33,9 +33,12 @@ 
		return false; \

	}

#define ADD_HOSTLIST_POOL(etype, ppool, keystr, keystr_len, flg) \

	etype *elem_find; \

	HASH_FIND(hh, *ppool, keystr, keystr_len, elem_find); \

	if (!elem_find) { \

		ADD_STR_POOL(etype,ppool,keystr,keystr_len); \

	elem->flags = flg;



		elem->flags = flg; \

	}



#undef uthash_nonfatal_oom

#define uthash_nonfatal_oom(elt) ut_oom_recover(elt)