romenskiy2012/curl
1
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2026-08-25 01:43:32 +03:00
Code Issues Projects Releases Packages Wiki Activity

hostip: fix unintended destruction of hash table

Browse source 
.. and added unit1602 for hash.c
This commit is contained in:
Anthony Avina 2015-05-02 13:49:55 -05:00 • committed by Daniel Stenberg
parent 39b9bf60d1
commit 4883f7019d
11 changed files with 136 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

2
tests/data/Makefile.inc
View file

@ -155,7 +155,7 @@ test1520 \
\
test1525 test1526 test1527 test1528 test1529 \
\
test1600 test1601 \
test1600 test1601 test1602 \
\
test1800 test1801 \
\

26
tests/data/test1602 Normal file
View file

@ -0,0 +1,26 @@
<testcase>
<info>
<keywords>
unittest
hash
</keywords>
</info>
#
# Client-side
<client>
<server>
none
</server>
<features>
unittest
</features>
<name>
Internal hash create/add/destroy testing, exercising clean functions
</name>
<tool>
unit1602
</tool>
</client>
</testcase>

5
tests/unit/Makefile.inc
View file

@ -7,7 +7,7 @@ UNITFILES = curlcheck.h \
# These are all unit test programs
UNITPROGS = unit1300 unit1301 unit1302 unit1303 unit1304 unit1305 unit1307 \
unit1308 unit1309 unit1330 unit1394 unit1395 unit1396 unit1397 unit1398 \
unit1600 unit1601
unit1600 unit1601 unit1602
unit1300_SOURCES = unit1300.c $(UNITFILES)
unit1300_CPPFLAGS = $(AM_CPPFLAGS)
@ -63,3 +63,6 @@ unit1600_CPPFLAGS = $(AM_CPPFLAGS)
unit1601_SOURCES = unit1601.c $(UNITFILES)
unit1601_CPPFLAGS = $(AM_CPPFLAGS)
unit1602_SOURCES = unit1602.c $(UNITFILES)
unit1602_CPPFLAGS = $(AM_CPPFLAGS)

2
tests/unit/unit1305.c
View file

@ -67,7 +67,7 @@ static void unit_stop( void )
free(data_node);
}
free(data_key);
Curl_hash_clean(&hp);
Curl_hash_destroy(&hp);
curl_easy_cleanup(data);
curl_global_cleanup();

80
tests/unit/unit1602.c Normal file
View file

@ -0,0 +1,80 @@
/***************************************************************************
* _ _ ____ _
* Project ___| | | | _ \| |
* / __| | | | |_) | |
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
* Copyright (C) 1998 - 2011, Daniel Stenberg, <daniel@haxx.se>, et al.
*
* This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
* are also available at http://curl.haxx.se/docs/copyright.html.
*
* You may opt to use, copy, modify, merge, publish, distribute and/or sell
* copies of the Software, and permit persons to whom the Software is
* furnished to do so, under the terms of the COPYING file.
*
* This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
* KIND, either express or implied.
*
***************************************************************************/
#include "curlcheck.h"
#define ENABLE_CURLX_PRINTF
#include "curlx.h"
#include "hash.h"
#include "memdebug.h" /* LAST include file */
static CURLcode unit_setup( void )
{
return CURLE_OK;
}
static void unit_stop( void )
{
}
static void mydtor(void *p)
{
int *ptr = (int*)p;
free(ptr);
}
UNITTEST_START
int *value;
int *value2;
size_t klen = sizeof(int);
struct curl_hash hash_static;
int key = 20;
int key2 = 25;
int rc = 0;
rc = Curl_hash_init(&hash_static, 7, Curl_hash_str,
Curl_str_key_compare, mydtor);
if(rc)
{
fail("Curl_hash_init failed to initialize static hash!");
goto unit_test_abort;
}
value = malloc(sizeof(int));
value2 = malloc(sizeof(int));
*value = 199;
*value2 = 204;
Curl_hash_add(&hash_static, &key, klen, value);
Curl_hash_clean(&hash_static);
/* Attempt to add another key/value pair */
Curl_hash_add(&hash_static, &key2, klen, value2);
Curl_hash_destroy(&hash_static);
UNITTEST_STOP