test509: libcurl initialization with memory callbacks and actual usage

4 files changed, 197 insertions, 12 deletions

diff --git a/tests/data/Makefile.am b/tests/data/Makefile.am
index 8feb73c5a..f65fe0688 100644
--- a/tests/data/Makefile.am
+++ b/tests/data/Makefile.am
@@ -39,17 +39,17 @@ test303 test304 test305 test306 test307 test308 test309 test310 test311	\
 test312 test313 test320 test321 test322 test323 test324 test350 test351	\
 test352 test353 test354 test400 test401 test402 test403 test404 test405	\
 test406 test407 test408 test409 test500 test501 test502 test503 test504	\
-test505 test506 test507 test508 test510 test511 test512 test513 test514	\
-test515 test516 test517 test518 test519 test520 test521 test522 test523	\
-test524 test525 test526 test527 test528 test529 test530 test531 test532	\
-test533 test534 test535 test536 test537 test538 test539 test540 test541	\
-test542 test543 test544 test545 test546 test547 test548 test549 test550	\
-test551 test552 test553 test554 test555 test556 test557 test560 test561	\
-test562 test563 test564 test565 test566 test567 test568 test569 test570	\
-test571 test572 test573 test574 test575 test576 test578 test579 test580	\
-test581 test582 test583 test584 test585 test586 test587 test588 test590	\
-test591 test592 test593 test594 test595 test596 test597 test598 test599	\
-test600 test601 test602 test603 test604	\
+test505 test506 test507 test508 test509 test510 test511 test512 test513 \
+test514 test515 test516 test517 test518 test519 test520 test521 test522 \
+test523 test524 test525 test526 test527 test528 test529 test530 test531 \
+test532 test533 test534 test535 test536 test537 test538 test539 test540 \
+test541 test542 test543 test544 test545 test546 test547 test548 test549 \
+test550 test551 test552 test553 test554 test555 test556 test557 test560 \
+test561 test562 test563 test564 test565 test566 test567 test568 test569 \
+test570 test571 test572 test573 test574 test575 test576 test578 test579 \
+test580 test581 test582 test583 test584 test585 test586 test587 test588 \
+test590 test591 test592 test593 test594 test595 test596 test597 test598 \
+test599 test600 test601 test602 test603 test604 \
 test605 test606 test607 test608 test609 test610 test611 test612 test613	\
 test614 test615 test616 test617 test618 test619 test620 test621 test622	\
 test623 test624 test625 test626 test627 test628 test629 test630 test631	\
diff --git a/tests/data/test509 b/tests/data/test509
new file mode 100644
index 000000000..dfe9027c6
--- /dev/null
+++ b/tests/data/test509
@@ -0,0 +1,36 @@
+<testcase>
+#
+# Server-side
+<reply>
+</reply>
+
+# Client-side
+<client>
+<server>
+none
+</server>
+# tool is what to use instead of 'curl'
+<tool>
+lib509
+</tool>
+
+<name>
+initialization with memory callbacks and actual usage
+</name>
+<command>
+nothing
+</command>
+</client>
+
+#
+# Verify data after the test has been "shot"
+<verify>
+<stdout mode="text">
+seen custom_calloc()
+seen custom_malloc()
+seen custom_realloc()
+seen custom_free()
+</stdout>
+</verify>
+
+</testcase>
diff --git a/tests/libtest/Makefile.inc b/tests/libtest/Makefile.inc
index 5e377d371..88fc7d8fa 100644
--- a/tests/libtest/Makefile.inc
+++ b/tests/libtest/Makefile.inc
@@ -12,7 +12,7 @@ SUPPORTFILES = first.c test.h
 
 # These are all libcurl test programs
 noinst_PROGRAMS = chkhostname libauthretry libntlmconnect \
-  lib500 lib501 lib502 lib503 lib504 lib505 lib506 lib507 lib508        \
+  lib500 lib501 lib502 lib503 lib504 lib505 lib506 lib507 lib508 lib509 \
   lib510 lib511 lib512 lib513 lib514 lib515 lib516 lib517 lib518 lib519 \
   lib520 lib521        lib523 lib524 lib525 lib526 lib527        lib529 \
   lib530        lib532 lib533               lib536 lib537        lib539 \
@@ -69,6 +69,9 @@ lib507_CPPFLAGS = $(AM_CPPFLAGS)
 lib508_SOURCES = lib508.c $(SUPPORTFILES)
 lib508_CPPFLAGS = $(AM_CPPFLAGS)
 
+lib509_SOURCES = lib509.c $(SUPPORTFILES)
+lib509_CPPFLAGS = $(AM_CPPFLAGS)
+
 lib510_SOURCES = lib510.c $(SUPPORTFILES)
 lib510_CPPFLAGS = $(AM_CPPFLAGS)
 
diff --git a/tests/libtest/lib509.c b/tests/libtest/lib509.c
new file mode 100644
index 000000000..a3de51e96
--- /dev/null
+++ b/tests/libtest/lib509.c
@@ -0,0 +1,146 @@
+/***************************************************************************
+ *                                  _   _ ____  _
+ *  Project                     ___| | | |  _ \| |
+ *                             / __| | | | |_) | |
+ *                            | (__| |_| |  _ <| |___
+ *                             \___|\___/|_| \_\_____|
+ *
+ * Copyright (C) 1998 - 2013, 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 "test.h"
+
+/*
+ * This test uses these funny custom memory callbacks for the only purpose
+ * of verifying that curl_global_init_mem() functionallity is present in
+ * libcurl and that it works unconditionally no matter how libcurl is built,
+ * nothing more.
+ *
+ * Do not include memdebug.h in this source file, and do not use directly
+ * memory related functions in this file except those used inside custom
+ * memory callbacks which should be calling 'the real thing'.
+ */
+
+/*
+#include "memdebug.h"
+*/
+
+int seen_malloc = 0;
+int seen_free = 0;
+int seen_realloc = 0;
+int seen_strdup = 0;
+int seen_calloc = 0;
+
+void *custom_malloc(size_t size);
+void custom_free(void *ptr);
+void *custom_realloc(void *ptr, size_t size);
+char *custom_strdup(const char *ptr);
+void *custom_calloc(size_t nmemb, size_t size);
+
+
+void *custom_calloc(size_t nmemb, size_t size)
+{
+  if(!seen_calloc) {
+    printf("seen custom_calloc()\n");
+    seen_calloc = 1;
+  }
+  return (calloc)(nmemb, size);
+}
+
+void *custom_malloc(size_t size)
+{
+  if(!seen_malloc && seen_calloc) {
+    printf("seen custom_malloc()\n");
+    seen_malloc = 1;
+  }
+  return (malloc)(size);
+}
+
+char *custom_strdup(const char *ptr)
+{
+  if(!seen_strdup && seen_malloc) {
+    /* currently (2013.03.13), memory tracking enabled builds do not call
+       the strdup callback, in this case malloc callback and memcpy are used
+       instead. If some day this is changed the following printf() should be
+       uncommented, and a line added to test definition.
+    printf("seen custom_strdup()\n");
+    */
+    seen_strdup = 1;
+  }
+  return (strdup)(ptr);
+}
+
+void *custom_realloc(void *ptr, size_t size)
+{
+  if(!seen_realloc && seen_malloc) {
+    printf("seen custom_realloc()\n");
+    seen_realloc = 1;
+  }
+  return (realloc)(ptr, size);
+}
+
+void custom_free(void *ptr)
+{
+  if(!seen_free && seen_realloc) {
+    printf("seen custom_free()\n");
+    seen_free = 1;
+  }
+  (free)(ptr);
+}
+
+
+int test(char *URL)
+{
+  unsigned char a[] = {0x2f, 0x3a, 0x3b, 0x3c, 0x3d, 0x3e, 0x3f,
+                       0x91, 0xa2, 0xb3, 0xc4, 0xd5, 0xe6, 0xf7};
+  CURLcode res;
+  CURL *curl;
+  int asize;
+  char *str = NULL;
+
+  (void)URL;
+
+  res = curl_global_init_mem(CURL_GLOBAL_ALL,
+                             custom_malloc,
+                             custom_free,
+                             custom_realloc,
+                             custom_strdup,
+                             custom_calloc);
+  if (res != CURLE_OK) {
+    fprintf(stderr, "curl_global_init_mem() failed\n");
+    return TEST_ERR_MAJOR_BAD;
+  }
+
+  if ((curl = curl_easy_init()) == NULL) {
+    fprintf(stderr, "curl_easy_init() failed\n");
+    curl_global_cleanup();
+    return TEST_ERR_MAJOR_BAD;
+  }
+
+  test_setopt(curl, CURLOPT_USERAGENT, "test509"); /* uses strdup() */
+
+  asize = (int)sizeof(a);
+  str = curl_easy_escape(curl, (char *)a, asize); /* uses realloc() */
+
+test_cleanup:
+
+  if(str)
+    curl_free(str);
+
+  curl_easy_cleanup(curl);
+  curl_global_cleanup();
+
+  return (int)res;
+}
+