|
 |
3a27f0 |
From 48b69def52771149ed19189284b8c6d1ba667ef7 Mon Sep 17 00:00:00 2001
|
|
|
3a27f0 |
From: Linus Nielsen Feltzing <linus@haxx.se>
|
|
|
3a27f0 |
Date: Sun, 10 Feb 2013 22:57:58 +0100
|
|
|
3a27f0 |
Subject: [PATCH] Fix NULL pointer reference when closing an unused multi handle.
|
|
|
3a27f0 |
|
|
|
3a27f0 |
[upstream commit da3fc1ee91de656a30f3a12de394bcba55119872]
|
|
|
3a27f0 |
|
|
|
3a27f0 |
Signed-off-by: Kamil Dudka <kdudka@redhat.com>
|
|
|
3a27f0 |
---
|
|
|
3a27f0 |
lib/multi.c | 8 +++--
|
|
|
3a27f0 |
tests/data/Makefile.am | 2 +-
|
|
|
3a27f0 |
tests/data/Makefile.in | 2 +-
|
|
|
3a27f0 |
tests/data/test1508 | 31 +++++++++++++++++
|
|
|
3a27f0 |
tests/libtest/Makefile.in | 79 ++++++++++++++++++++++++++++++++++++++++++--
|
|
|
3a27f0 |
tests/libtest/Makefile.inc | 6 +++-
|
|
|
3a27f0 |
tests/libtest/lib1508.c | 49 +++++++++++++++++++++++++++
|
|
|
3a27f0 |
7 files changed, 168 insertions(+), 9 deletions(-)
|
|
|
3a27f0 |
create mode 100644 tests/data/test1508
|
|
|
3a27f0 |
create mode 100644 tests/libtest/lib1508.c
|
|
|
3a27f0 |
|
|
|
3a27f0 |
diff --git a/lib/multi.c b/lib/multi.c
|
|
|
3a27f0 |
index fa0afb9..706df23 100644
|
|
|
3a27f0 |
--- a/lib/multi.c
|
|
|
3a27f0 |
+++ b/lib/multi.c
|
|
|
3a27f0 |
@@ -1773,10 +1773,12 @@ CURLMcode curl_multi_cleanup(CURLM *multi_handle)
|
|
|
3a27f0 |
/* Close all the connections in the connection cache */
|
|
|
3a27f0 |
close_all_connections(multi);
|
|
|
3a27f0 |
|
|
|
3a27f0 |
- multi->closure_handle->dns.hostcache = multi->hostcache;
|
|
|
3a27f0 |
- Curl_hostcache_clean(multi->closure_handle);
|
|
|
3a27f0 |
+ if(multi->closure_handle) {
|
|
|
3a27f0 |
+ multi->closure_handle->dns.hostcache = multi->hostcache;
|
|
|
3a27f0 |
+ Curl_hostcache_clean(multi->closure_handle);
|
|
|
3a27f0 |
|
|
|
3a27f0 |
- Curl_close(multi->closure_handle);
|
|
|
3a27f0 |
+ Curl_close(multi->closure_handle);
|
|
|
3a27f0 |
+ }
|
|
|
3a27f0 |
multi->closure_handle = NULL;
|
|
|
3a27f0 |
|
|
|
3a27f0 |
Curl_hash_destroy(multi->sockhash);
|
|
|
3a27f0 |
diff --git a/tests/data/Makefile.am b/tests/data/Makefile.am
|
|
|
3a27f0 |
index d82534d..9f569a3 100644
|
|
|
3a27f0 |
--- a/tests/data/Makefile.am
|
|
|
3a27f0 |
+++ b/tests/data/Makefile.am
|
|
|
3a27f0 |
@@ -93,7 +93,7 @@ test1379 test1380 test1381 test1382 test1383 test1384 test1385 test1386 \
|
|
|
3a27f0 |
test1387 test1388 test1389 test1390 test1391 test1392 test1393 \
|
|
|
3a27f0 |
test1400 test1401 test1402 test1403 test1404 test1405 test1406 test1407 \
|
|
|
3a27f0 |
test1408 test1409 test1410 test1411 test1412 test1413 \
|
|
|
3a27f0 |
-test1500 test1501 test1502 test1503 test1504 test1505 test1506 \
|
|
|
3a27f0 |
+test1500 test1501 test1502 test1503 test1504 test1505 test1506 test1508 \
|
|
|
3a27f0 |
test2000 test2001 test2002 test2003 test2004 test2005 test2006 test2007 \
|
|
|
3a27f0 |
test2008 test2009 test2010 test2011 test2012 test2013 test2014 test2015 \
|
|
|
3a27f0 |
test2016 test2017 test2018 test2019 test2020 test2021 test2022 \
|
|
|
3a27f0 |
diff --git a/tests/data/Makefile.in b/tests/data/Makefile.in
|
|
|
3a27f0 |
index df52421..d5b0918 100644
|
|
|
3a27f0 |
--- a/tests/data/Makefile.in
|
|
|
3a27f0 |
+++ b/tests/data/Makefile.in
|
|
|
3a27f0 |
@@ -357,7 +357,7 @@ test1379 test1380 test1381 test1382 test1383 test1384 test1385 test1386 \
|
|
|
3a27f0 |
test1387 test1388 test1389 test1390 test1391 test1392 test1393 \
|
|
|
3a27f0 |
test1400 test1401 test1402 test1403 test1404 test1405 test1406 test1407 \
|
|
|
3a27f0 |
test1408 test1409 test1410 test1411 test1412 test1413 \
|
|
|
3a27f0 |
-test1500 test1501 test1502 test1503 test1504 test1505 test1506 \
|
|
|
3a27f0 |
+test1500 test1501 test1502 test1503 test1504 test1505 test1506 test1508 \
|
|
|
3a27f0 |
test2000 test2001 test2002 test2003 test2004 test2005 test2006 test2007 \
|
|
|
3a27f0 |
test2008 test2009 test2010 test2011 test2012 test2013 test2014 test2015 \
|
|
|
3a27f0 |
test2016 test2017 test2018 test2019 test2020 test2021 test2022 \
|
|
|
3a27f0 |
diff --git a/tests/data/test1508 b/tests/data/test1508
|
|
|
3a27f0 |
new file mode 100644
|
|
|
3a27f0 |
index 0000000..f8607e5
|
|
|
3a27f0 |
--- /dev/null
|
|
|
3a27f0 |
+++ b/tests/data/test1508
|
|
|
3a27f0 |
@@ -0,0 +1,31 @@
|
|
|
3a27f0 |
+<testcase>
|
|
|
3a27f0 |
+<info>
|
|
|
3a27f0 |
+<keywords>
|
|
|
3a27f0 |
+HTTP
|
|
|
3a27f0 |
+multi
|
|
|
3a27f0 |
+</keywords>
|
|
|
3a27f0 |
+</info>
|
|
|
3a27f0 |
+
|
|
|
3a27f0 |
+# Client-side
|
|
|
3a27f0 |
+<client>
|
|
|
3a27f0 |
+<server>
|
|
|
3a27f0 |
+none
|
|
|
3a27f0 |
+</server>
|
|
|
3a27f0 |
+<tool>
|
|
|
3a27f0 |
+lib1508
|
|
|
3a27f0 |
+</tool>
|
|
|
3a27f0 |
+ <name>
|
|
|
3a27f0 |
+Close a multi handle without using it
|
|
|
3a27f0 |
+ </name>
|
|
|
3a27f0 |
+ <command>
|
|
|
3a27f0 |
+http://%HOSTIP:%HTTPPORT/path/1508
|
|
|
3a27f0 |
+</command>
|
|
|
3a27f0 |
+</client>
|
|
|
3a27f0 |
+
|
|
|
3a27f0 |
+# Verify data after the test has been "shot"
|
|
|
3a27f0 |
+<verify>
|
|
|
3a27f0 |
+<file name="log/stdout1508" mode="text">
|
|
|
3a27f0 |
+We are done
|
|
|
3a27f0 |
+</file>
|
|
|
3a27f0 |
+</verify>
|
|
|
3a27f0 |
+</testcase>
|
|
|
3a27f0 |
diff --git a/tests/libtest/Makefile.in b/tests/libtest/Makefile.in
|
|
|
3a27f0 |
index 406b457..7683c09 100644
|
|
|
3a27f0 |
--- a/tests/libtest/Makefile.in
|
|
|
3a27f0 |
+++ b/tests/libtest/Makefile.in
|
|
|
3a27f0 |
@@ -85,7 +85,7 @@ noinst_PROGRAMS = chkhostname$(EXEEXT) libauthretry$(EXEEXT) \
|
|
|
3a27f0 |
lib591$(EXEEXT) lib597$(EXEEXT) lib598$(EXEEXT) \
|
|
|
3a27f0 |
lib599$(EXEEXT) lib1500$(EXEEXT) lib1501$(EXEEXT) \
|
|
|
3a27f0 |
lib1502$(EXEEXT) lib1503$(EXEEXT) lib1504$(EXEEXT) \
|
|
|
3a27f0 |
- lib1505$(EXEEXT) lib1506$(EXEEXT)
|
|
|
3a27f0 |
+ lib1505$(EXEEXT) lib1506$(EXEEXT) lib1508$(EXEEXT)
|
|
|
3a27f0 |
subdir = tests/libtest
|
|
|
3a27f0 |
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
|
|
|
3a27f0 |
am__aclocal_m4_deps = $(top_srcdir)/m4/curl-compilers.m4 \
|
|
|
3a27f0 |
@@ -173,6 +173,13 @@ am_lib1506_OBJECTS = lib1506-lib1506.$(OBJEXT) $(am__objects_18) \
|
|
|
3a27f0 |
$(am__objects_19) $(am__objects_20)
|
|
|
3a27f0 |
lib1506_OBJECTS = $(am_lib1506_OBJECTS)
|
|
|
3a27f0 |
lib1506_DEPENDENCIES = $(am__DEPENDENCIES_1)
|
|
|
3a27f0 |
+am__objects_151 = lib1508-first.$(OBJEXT)
|
|
|
3a27f0 |
+am__objects_152 = lib1508-testutil.$(OBJEXT)
|
|
|
3a27f0 |
+am__objects_153 = lib1508-warnless.$(OBJEXT)
|
|
|
3a27f0 |
+am_lib1508_OBJECTS = lib1508-lib1508.$(OBJEXT) $(am__objects_151) \
|
|
|
3a27f0 |
+ $(am__objects_152) $(am__objects_153)
|
|
|
3a27f0 |
+lib1508_OBJECTS = $(am_lib1508_OBJECTS)
|
|
|
3a27f0 |
+lib1508_DEPENDENCIES = $(am__DEPENDENCIES_1)
|
|
|
3a27f0 |
am__objects_21 = lib500-first.$(OBJEXT)
|
|
|
3a27f0 |
am__objects_22 = lib500-testutil.$(OBJEXT)
|
|
|
3a27f0 |
am__objects_23 = lib500-testtrace.$(OBJEXT)
|
|
|
3a27f0 |
@@ -632,7 +639,7 @@ LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
|
|
|
3a27f0 |
SOURCES = $(libhostname_la_SOURCES) $(chkhostname_SOURCES) \
|
|
|
3a27f0 |
$(lib1500_SOURCES) $(lib1501_SOURCES) $(lib1502_SOURCES) \
|
|
|
3a27f0 |
$(lib1503_SOURCES) $(lib1504_SOURCES) $(lib1505_SOURCES) \
|
|
|
3a27f0 |
- $(lib1506_SOURCES) $(lib500_SOURCES) $(lib501_SOURCES) \
|
|
|
3a27f0 |
+ $(lib1506_SOURCES) $(lib1508_SOURCES) $(lib500_SOURCES) $(lib501_SOURCES) \
|
|
|
3a27f0 |
$(lib502_SOURCES) $(lib503_SOURCES) $(lib504_SOURCES) \
|
|
|
3a27f0 |
$(lib505_SOURCES) $(lib506_SOURCES) $(lib507_SOURCES) \
|
|
|
3a27f0 |
$(lib508_SOURCES) $(lib510_SOURCES) $(lib511_SOURCES) \
|
|
|
3a27f0 |
@@ -662,7 +669,7 @@ SOURCES = $(libhostname_la_SOURCES) $(chkhostname_SOURCES) \
|
|
|
3a27f0 |
DIST_SOURCES = $(libhostname_la_SOURCES) $(chkhostname_SOURCES) \
|
|
|
3a27f0 |
$(lib1500_SOURCES) $(lib1501_SOURCES) $(lib1502_SOURCES) \
|
|
|
3a27f0 |
$(lib1503_SOURCES) $(lib1504_SOURCES) $(lib1505_SOURCES) \
|
|
|
3a27f0 |
- $(lib1506_SOURCES) $(lib500_SOURCES) $(lib501_SOURCES) \
|
|
|
3a27f0 |
+ $(lib1506_SOURCES) $(lib1508_SOURCES) $(lib500_SOURCES) $(lib501_SOURCES) \
|
|
|
3a27f0 |
$(lib502_SOURCES) $(lib503_SOURCES) $(lib504_SOURCES) \
|
|
|
3a27f0 |
$(lib505_SOURCES) $(lib506_SOURCES) $(lib507_SOURCES) \
|
|
|
3a27f0 |
$(lib508_SOURCES) $(lib510_SOURCES) $(lib511_SOURCES) \
|
|
|
3a27f0 |
@@ -1155,6 +1162,9 @@ lib1505_CPPFLAGS = $(AM_CPPFLAGS) -DLIB1505
|
|
|
3a27f0 |
lib1506_SOURCES = lib1506.c $(SUPPORTFILES) $(TESTUTIL) $(WARNLESS)
|
|
|
3a27f0 |
lib1506_LDADD = $(TESTUTIL_LIBS)
|
|
|
3a27f0 |
lib1506_CPPFLAGS = $(AM_CPPFLAGS) -DLIB1506
|
|
|
3a27f0 |
+lib1508_SOURCES = lib1508.c $(SUPPORTFILES) $(TESTUTIL) $(WARNLESS)
|
|
|
3a27f0 |
+lib1508_LDADD = $(TESTUTIL_LIBS)
|
|
|
3a27f0 |
+lib1508_CPPFLAGS = $(AM_CPPFLAGS) -DLIB1508
|
|
|
3a27f0 |
@BUILD_LIBHOSTNAME_FALSE@noinst_LTLIBRARIES =
|
|
|
3a27f0 |
|
|
|
3a27f0 |
# Makefile.inc provides the source defines (TESTUTIL, SUPPORTFILES,
|
|
|
3a27f0 |
@@ -1253,6 +1263,9 @@ lib1505$(EXEEXT): $(lib1505_OBJECTS) $(lib1505_DEPENDENCIES) $(EXTRA_lib1505_DEP
|
|
|
3a27f0 |
lib1506$(EXEEXT): $(lib1506_OBJECTS) $(lib1506_DEPENDENCIES) $(EXTRA_lib1506_DEPENDENCIES)
|
|
|
3a27f0 |
@rm -f lib1506$(EXEEXT)
|
|
|
3a27f0 |
$(LINK) $(lib1506_OBJECTS) $(lib1506_LDADD) $(LIBS)
|
|
|
3a27f0 |
+lib1508$(EXEEXT): $(lib1508_OBJECTS) $(lib1508_DEPENDENCIES) $(EXTRA_lib1508_DEPENDENCIES)
|
|
|
3a27f0 |
+ @rm -f lib1508$(EXEEXT)
|
|
|
3a27f0 |
+ $(LINK) $(lib1508_OBJECTS) $(lib1508_LDADD) $(LIBS)
|
|
|
3a27f0 |
lib500$(EXEEXT): $(lib500_OBJECTS) $(lib500_DEPENDENCIES) $(EXTRA_lib500_DEPENDENCIES)
|
|
|
3a27f0 |
@rm -f lib500$(EXEEXT)
|
|
|
3a27f0 |
$(LINK) $(lib500_OBJECTS) $(lib500_LDADD) $(LIBS)
|
|
|
3a27f0 |
@@ -1520,6 +1533,10 @@ distclean-compile:
|
|
|
3a27f0 |
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lib1506-lib1506.Po@am__quote@
|
|
|
3a27f0 |
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lib1506-testutil.Po@am__quote@
|
|
|
3a27f0 |
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lib1506-warnless.Po@am__quote@
|
|
|
3a27f0 |
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lib1508-first.Po@am__quote@
|
|
|
3a27f0 |
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lib1508-lib1508.Po@am__quote@
|
|
|
3a27f0 |
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lib1508-testutil.Po@am__quote@
|
|
|
3a27f0 |
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lib1508-warnless.Po@am__quote@
|
|
|
3a27f0 |
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lib500-first.Po@am__quote@
|
|
|
3a27f0 |
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lib500-lib500.Po@am__quote@
|
|
|
3a27f0 |
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lib500-testtrace.Po@am__quote@
|
|
|
3a27f0 |
@@ -2163,6 +2180,62 @@ lib1506-warnless.obj: ../../lib/warnless.c
|
|
|
3a27f0 |
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
|
|
|
3a27f0 |
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib1506_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o lib1506-warnless.obj `if test -f '../../lib/warnless.c'; then $(CYGPATH_W) '../../lib/warnless.c'; else $(CYGPATH_W) '$(srcdir)/../../lib/warnless.c'; fi`
|
|
|
3a27f0 |
|
|
|
3a27f0 |
+lib1508-lib1508.o: lib1508.c
|
|
|
3a27f0 |
+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib1508_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT lib1508-lib1508.o -MD -MP -MF $(DEPDIR)/lib1508-lib1508.Tpo -c -o lib1508-lib1508.o `test -f 'lib1508.c' || echo '$(srcdir)/'`lib1508.c
|
|
|
3a27f0 |
+@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/lib1508-lib1508.Tpo $(DEPDIR)/lib1508-lib1508.Po
|
|
|
3a27f0 |
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='lib1508.c' object='lib1508-lib1508.o' libtool=no @AMDEPBACKSLASH@
|
|
|
3a27f0 |
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
|
|
|
3a27f0 |
+@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib1508_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o lib1508-lib1508.o `test -f 'lib1508.c' || echo '$(srcdir)/'`lib1508.c
|
|
|
3a27f0 |
+
|
|
|
3a27f0 |
+lib1508-lib1508.obj: lib1508.c
|
|
|
3a27f0 |
+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib1508_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT lib1508-lib1508.obj -MD -MP -MF $(DEPDIR)/lib1508-lib1508.Tpo -c -o lib1508-lib1508.obj `if test -f 'lib1508.c'; then $(CYGPATH_W) 'lib1508.c'; else $(CYGPATH_W) '$(srcdir)/lib1508.c'; fi`
|
|
|
3a27f0 |
+@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/lib1508-lib1508.Tpo $(DEPDIR)/lib1508-lib1508.Po
|
|
|
3a27f0 |
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='lib1508.c' object='lib1508-lib1508.obj' libtool=no @AMDEPBACKSLASH@
|
|
|
3a27f0 |
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
|
|
|
3a27f0 |
+@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib1508_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o lib1508-lib1508.obj `if test -f 'lib1508.c'; then $(CYGPATH_W) 'lib1508.c'; else $(CYGPATH_W) '$(srcdir)/lib1508.c'; fi`
|
|
|
3a27f0 |
+
|
|
|
3a27f0 |
+lib1508-first.o: first.c
|
|
|
3a27f0 |
+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib1508_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT lib1508-first.o -MD -MP -MF $(DEPDIR)/lib1508-first.Tpo -c -o lib1508-first.o `test -f 'first.c' || echo '$(srcdir)/'`first.c
|
|
|
3a27f0 |
+@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/lib1508-first.Tpo $(DEPDIR)/lib1508-first.Po
|
|
|
3a27f0 |
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='first.c' object='lib1508-first.o' libtool=no @AMDEPBACKSLASH@
|
|
|
3a27f0 |
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
|
|
|
3a27f0 |
+@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib1508_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o lib1508-first.o `test -f 'first.c' || echo '$(srcdir)/'`first.c
|
|
|
3a27f0 |
+
|
|
|
3a27f0 |
+lib1508-first.obj: first.c
|
|
|
3a27f0 |
+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib1508_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT lib1508-first.obj -MD -MP -MF $(DEPDIR)/lib1508-first.Tpo -c -o lib1508-first.obj `if test -f 'first.c'; then $(CYGPATH_W) 'first.c'; else $(CYGPATH_W) '$(srcdir)/first.c'; fi`
|
|
|
3a27f0 |
+@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/lib1508-first.Tpo $(DEPDIR)/lib1508-first.Po
|
|
|
3a27f0 |
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='first.c' object='lib1508-first.obj' libtool=no @AMDEPBACKSLASH@
|
|
|
3a27f0 |
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
|
|
|
3a27f0 |
+@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib1508_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o lib1508-first.obj `if test -f 'first.c'; then $(CYGPATH_W) 'first.c'; else $(CYGPATH_W) '$(srcdir)/first.c'; fi`
|
|
|
3a27f0 |
+
|
|
|
3a27f0 |
+lib1508-testutil.o: testutil.c
|
|
|
3a27f0 |
+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib1508_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT lib1508-testutil.o -MD -MP -MF $(DEPDIR)/lib1508-testutil.Tpo -c -o lib1508-testutil.o `test -f 'testutil.c' || echo '$(srcdir)/'`testutil.c
|
|
|
3a27f0 |
+@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/lib1508-testutil.Tpo $(DEPDIR)/lib1508-testutil.Po
|
|
|
3a27f0 |
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='testutil.c' object='lib1508-testutil.o' libtool=no @AMDEPBACKSLASH@
|
|
|
3a27f0 |
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
|
|
|
3a27f0 |
+@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib1508_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o lib1508-testutil.o `test -f 'testutil.c' || echo '$(srcdir)/'`testutil.c
|
|
|
3a27f0 |
+
|
|
|
3a27f0 |
+lib1508-testutil.obj: testutil.c
|
|
|
3a27f0 |
+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib1508_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT lib1508-testutil.obj -MD -MP -MF $(DEPDIR)/lib1508-testutil.Tpo -c -o lib1508-testutil.obj `if test -f 'testutil.c'; then $(CYGPATH_W) 'testutil.c'; else $(CYGPATH_W) '$(srcdir)/testutil.c'; fi`
|
|
|
3a27f0 |
+@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/lib1508-testutil.Tpo $(DEPDIR)/lib1508-testutil.Po
|
|
|
3a27f0 |
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='testutil.c' object='lib1508-testutil.obj' libtool=no @AMDEPBACKSLASH@
|
|
|
3a27f0 |
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
|
|
|
3a27f0 |
+@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib1508_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o lib1508-testutil.obj `if test -f 'testutil.c'; then $(CYGPATH_W) 'testutil.c'; else $(CYGPATH_W) '$(srcdir)/testutil.c'; fi`
|
|
|
3a27f0 |
+
|
|
|
3a27f0 |
+lib1508-warnless.o: ../../lib/warnless.c
|
|
|
3a27f0 |
+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib1508_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT lib1508-warnless.o -MD -MP -MF $(DEPDIR)/lib1508-warnless.Tpo -c -o lib1508-warnless.o `test -f '../../lib/warnless.c' || echo '$(srcdir)/'`../../lib/warnless.c
|
|
|
3a27f0 |
+@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/lib1508-warnless.Tpo $(DEPDIR)/lib1508-warnless.Po
|
|
|
3a27f0 |
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='../../lib/warnless.c' object='lib1508-warnless.o' libtool=no @AMDEPBACKSLASH@
|
|
|
3a27f0 |
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
|
|
|
3a27f0 |
+@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib1508_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o lib1508-warnless.o `test -f '../../lib/warnless.c' || echo '$(srcdir)/'`../../lib/warnless.c
|
|
|
3a27f0 |
+
|
|
|
3a27f0 |
+lib1508-warnless.obj: ../../lib/warnless.c
|
|
|
3a27f0 |
+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib1508_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT lib1508-warnless.obj -MD -MP -MF $(DEPDIR)/lib1508-warnless.Tpo -c -o lib1508-warnless.obj `if test -f '../../lib/warnless.c'; then $(CYGPATH_W) '../../lib/warnless.c'; else $(CYGPATH_W) '$(srcdir)/../../lib/warnless.c'; fi`
|
|
|
3a27f0 |
+@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/lib1508-warnless.Tpo $(DEPDIR)/lib1508-warnless.Po
|
|
|
3a27f0 |
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='../../lib/warnless.c' object='lib1508-warnless.obj' libtool=no @AMDEPBACKSLASH@
|
|
|
3a27f0 |
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
|
|
|
3a27f0 |
+@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib1508_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o lib1508-warnless.obj `if test -f '../../lib/warnless.c'; then $(CYGPATH_W) '../../lib/warnless.c'; else $(CYGPATH_W) '$(srcdir)/../../lib/warnless.c'; fi`
|
|
|
3a27f0 |
+
|
|
|
3a27f0 |
lib500-lib500.o: lib500.c
|
|
|
3a27f0 |
@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib500_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT lib500-lib500.o -MD -MP -MF $(DEPDIR)/lib500-lib500.Tpo -c -o lib500-lib500.o `test -f 'lib500.c' || echo '$(srcdir)/'`lib500.c
|
|
|
3a27f0 |
@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/lib500-lib500.Tpo $(DEPDIR)/lib500-lib500.Po
|
|
|
3a27f0 |
diff --git a/tests/libtest/Makefile.inc b/tests/libtest/Makefile.inc
|
|
|
3a27f0 |
index 82c265d..8bf2be4 100644
|
|
|
3a27f0 |
--- a/tests/libtest/Makefile.inc
|
|
|
3a27f0 |
+++ b/tests/libtest/Makefile.inc
|
|
|
3a27f0 |
@@ -23,7 +23,7 @@ noinst_PROGRAMS = chkhostname libauthretry libntlmconnect \
|
|
|
3a27f0 |
lib582 lib583 lib585 lib586 lib587 \
|
|
|
3a27f0 |
lib590 lib591 lib597 lib598 lib599 \
|
|
|
3a27f0 |
\
|
|
|
3a27f0 |
- lib1500 lib1501 lib1502 lib1503 lib1504 lib1505 lib1506
|
|
|
3a27f0 |
+ lib1500 lib1501 lib1502 lib1503 lib1504 lib1505 lib1506 lib1508
|
|
|
3a27f0 |
|
|
|
3a27f0 |
chkhostname_SOURCES = chkhostname.c ../../lib/curl_gethostname.c
|
|
|
3a27f0 |
chkhostname_LDADD = @CURL_NETWORK_LIBS@
|
|
|
3a27f0 |
@@ -312,3 +312,7 @@ lib1505_CPPFLAGS = $(AM_CPPFLAGS) -DLIB1505
|
|
|
3a27f0 |
lib1506_SOURCES = lib1506.c $(SUPPORTFILES) $(TESTUTIL) $(WARNLESS)
|
|
|
3a27f0 |
lib1506_LDADD = $(TESTUTIL_LIBS)
|
|
|
3a27f0 |
lib1506_CPPFLAGS = $(AM_CPPFLAGS) -DLIB1506
|
|
|
3a27f0 |
+
|
|
|
3a27f0 |
+lib1508_SOURCES = lib1508.c $(SUPPORTFILES) $(TESTUTIL) $(WARNLESS)
|
|
|
3a27f0 |
+lib1508_LDADD = $(TESTUTIL_LIBS)
|
|
|
3a27f0 |
+lib1508_CPPFLAGS = $(AM_CPPFLAGS) -DLIB1508
|
|
|
3a27f0 |
diff --git a/tests/libtest/lib1508.c b/tests/libtest/lib1508.c
|
|
|
3a27f0 |
new file mode 100644
|
|
|
3a27f0 |
index 0000000..72f26d1
|
|
|
3a27f0 |
--- /dev/null
|
|
|
3a27f0 |
+++ b/tests/libtest/lib1508.c
|
|
|
3a27f0 |
@@ -0,0 +1,49 @@
|
|
|
3a27f0 |
+/***************************************************************************
|
|
|
3a27f0 |
+ * _ _ ____ _
|
|
|
3a27f0 |
+ * Project ___| | | | _ \| |
|
|
|
3a27f0 |
+ * / __| | | | |_) | |
|
|
|
3a27f0 |
+ * | (__| |_| | _ <| |___
|
|
|
3a27f0 |
+ * \___|\___/|_| \_\_____|
|
|
|
3a27f0 |
+ *
|
|
|
3a27f0 |
+ * Copyright (C) 2013, Linus Nielsen Feltzing <linus@haxx.se>
|
|
|
3a27f0 |
+ *
|
|
|
3a27f0 |
+ * This software is licensed as described in the file COPYING, which
|
|
|
3a27f0 |
+ * you should have received as part of this distribution. The terms
|
|
|
3a27f0 |
+ * are also available at http://curl.haxx.se/docs/copyright.html.
|
|
|
3a27f0 |
+ *
|
|
|
3a27f0 |
+ * You may opt to use, copy, modify, merge, publish, distribute and/or sell
|
|
|
3a27f0 |
+ * copies of the Software, and permit persons to whom the Software is
|
|
|
3a27f0 |
+ * furnished to do so, under the terms of the COPYING file.
|
|
|
3a27f0 |
+ *
|
|
|
3a27f0 |
+ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
|
|
|
3a27f0 |
+ * KIND, either express or implied.
|
|
|
3a27f0 |
+ *
|
|
|
3a27f0 |
+ ***************************************************************************/
|
|
|
3a27f0 |
+#include "test.h"
|
|
|
3a27f0 |
+
|
|
|
3a27f0 |
+#include "testutil.h"
|
|
|
3a27f0 |
+#include "warnless.h"
|
|
|
3a27f0 |
+#include "memdebug.h"
|
|
|
3a27f0 |
+
|
|
|
3a27f0 |
+int test(char *URL)
|
|
|
3a27f0 |
+{
|
|
|
3a27f0 |
+ int res = 0;
|
|
|
3a27f0 |
+ CURLM *m = NULL;
|
|
|
3a27f0 |
+
|
|
|
3a27f0 |
+ (void)URL;
|
|
|
3a27f0 |
+
|
|
|
3a27f0 |
+ global_init(CURL_GLOBAL_ALL);
|
|
|
3a27f0 |
+
|
|
|
3a27f0 |
+ multi_init(m);
|
|
|
3a27f0 |
+
|
|
|
3a27f0 |
+test_cleanup:
|
|
|
3a27f0 |
+
|
|
|
3a27f0 |
+ /* proper cleanup sequence - type PB */
|
|
|
3a27f0 |
+
|
|
|
3a27f0 |
+ curl_multi_cleanup(m);
|
|
|
3a27f0 |
+ curl_global_cleanup();
|
|
|
3a27f0 |
+
|
|
|
3a27f0 |
+ printf("We are done\n");
|
|
|
3a27f0 |
+
|
|
|
3a27f0 |
+ return res;
|
|
|
3a27f0 |
+}
|
|
|
3a27f0 |
--
|
|
|
3a27f0 |
1.7.1
|
|
|
3a27f0 |
|