Commit ebb9c7ae authored by Dan Fandrich's avatar Dan Fandrich
Browse files

Made unit_setup() return an error code to abort the test early 

This makes it possible to skip the call to unit_stop() in such
cases.  Also use Curl_safefree() in unit test 1302 so it will
pass the memory torture test.
parent 53014175

tests/unit/curlcheck.h

+4 −3
Original line number Diff line number Diff line
@@ -46,12 +46,13 @@ extern int unitfail; 
  int test(char *unused)                        \

  {                                             \

  (void)unused;                                 \

  unit_setup();                                 \

  {

  if (unit_setup()) {                           \

    fail("unit_setup() failure");               \

  } else {



#define UNITTEST_STOP                           \

  }                                             \

    unit_stop();                                \

  }                                             \

  return unitfail;                              \

  }

tests/unit/unit1300.c

+4 −1
Original line number Diff line number Diff line
@@ -14,9 +14,12 @@ static void test_curl_llist_dtor(void *key , void *value) 
  (void)value;

}



static void unit_setup( void )

static CURLcode unit_setup( void )

{

  llist = Curl_llist_alloc( test_curl_llist_dtor );

  if (!llist)

    return CURLE_OUT_OF_MEMORY;

  return CURLE_OK;

}



static void unit_stop( void )

tests/unit/unit1301.c

+1 −1
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 
#include "strequal.h"

#include "curlcheck.h"



static void unit_setup( void ) {}

static CURLcode unit_setup( void ) {return CURLE_OK;}

static void unit_stop( void ) {}



UNITTEST_START

tests/unit/unit1302.c

+18 −11
Original line number Diff line number Diff line
@@ -3,16 +3,21 @@ 
#include "setup.h"



#include "urldata.h"

#include "url.h" /* for Curl_safefree */

#include "curl_base64.h"

#include "curlcheck.h"

#include "memdebug.h" /* LAST include file */



static struct SessionHandle *data;



static void unit_setup( void )

static CURLcode unit_setup( void )

{

  data = curl_easy_init();

  if (!data)

    return CURLE_OUT_OF_MEMORY;

  return CURLE_OK;

}



static void unit_stop( void )

{

  curl_easy_cleanup(data);
@@ -27,56 +32,58 @@ size_t rc; 
rc = Curl_base64_encode(data, "i", 1, &output);

fail_unless( rc == 4 , "return code should be 4" );

verify_memory( output, "aQ==", 4);

free(output);

Curl_safefree(output);



rc = Curl_base64_encode(data, "ii", 2, &output);

fail_unless( rc == 4 , "return code should be 4" );

verify_memory( output, "aWk=", 4);

free(output);

Curl_safefree(output);



rc = Curl_base64_encode(data, "iii", 3, &output);

fail_unless( rc == 4 , "return code should be 4" );

verify_memory( output, "aWlp", 4);

free(output);

Curl_safefree(output);



rc = Curl_base64_encode(data, "iiii", 4, &output);

fail_unless( rc == 8 , "return code should be 8" );

verify_memory( output, "aWlpaQ==", 8);

free(output);

Curl_safefree(output);



/* 0 length makes it do strlen() */

rc = Curl_base64_encode(data, "iiii", 0, &output);

fail_unless( rc == 8 , "return code should be 8" );

verify_memory( output, "aWlpaQ==", 8);

free(output);

Curl_safefree(output);



rc = Curl_base64_decode("aWlpaQ==", &decoded);

fail_unless(rc == 4, "return code should be 4");

verify_memory(decoded, "iiii", 4);

free(decoded);

Curl_safefree(decoded);



rc = Curl_base64_decode("aWlp", &decoded);

fail_unless(rc == 3, "return code should be 3");

verify_memory(decoded, "iii", 3);

free(decoded);

Curl_safefree(decoded);



rc = Curl_base64_decode("aWk=", &decoded);

fail_unless(rc == 2, "return code should be 2");

verify_memory(decoded, "ii", 2);

free(decoded);

Curl_safefree(decoded);



rc = Curl_base64_decode("aQ==", &decoded);

fail_unless(rc == 1, "return code should be 1");

verify_memory(decoded, "i", 2);

free(decoded);

Curl_safefree(decoded);



/* this is an illegal input */

decoded = NULL;

rc = Curl_base64_decode("aQ", &decoded);

fail_unless(rc == 0, "return code should be 0");

fail_if(decoded, "returned pointer should be NULL");



/* this is garbage input that libcurl decodes as far as possible */

rc = Curl_base64_decode("a\x1f==", &decoded);

fail_unless(rc == 1, "return code should be 1");

free(decoded);

Curl_safefree(decoded);



UNITTEST_STOP

tests/unit/unit1303.c

+5 −1
Original line number Diff line number Diff line
@@ -9,10 +9,14 @@ 


static struct SessionHandle *data;



static void unit_setup( void )

static CURLcode unit_setup( void )

{

  data = curl_easy_init();

  if (!data)

    return CURLE_OUT_OF_MEMORY;

  return CURLE_OK;

}



static void unit_stop( void )

{

  curl_easy_cleanup(data);