moparisthebest/curl
1
0
Fork 0
mirror of https://github.com/moparisthebest/curl synced 2024-11-11 12:05:06 -05:00
Code Issues Releases Wiki Activity

unit1604: fixed compilation under Windows, broken in the previous commit

Browse Source
This commit is contained in:
Dan Fandrich 2017-04-30 13:35:17 +02:00
parent 8089dcfc5d
commit c0a27c5cee
1 changed files with 19 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
tests/unit/unit1604.c
View File

@ -45,19 +45,20 @@ static void unit_stop(void)
static char *getflagstr(int flags) static char *getflagstr(int flags)
{ {
char *buf = malloc(256); char *buf = malloc(256);
abort_unless(buf, "out of memory"); if(buf) {
snprintf(buf, 256, "%s,%s,%s,%s", snprintf(buf, 256, "%s,%s,%s,%s",
((flags & SANITIZE_ALLOW_COLONS) ? "SANITIZE_ALLOW_COLONS" : ""), ((flags & SANITIZE_ALLOW_COLONS) ? "SANITIZE_ALLOW_COLONS" : ""),
((flags & SANITIZE_ALLOW_PATH) ? "SANITIZE_ALLOW_PATH" : ""), ((flags & SANITIZE_ALLOW_PATH) ? "SANITIZE_ALLOW_PATH" : ""),
((flags & SANITIZE_ALLOW_RESERVED) ? "SANITIZE_ALLOW_RESERVED" : ""), ((flags & SANITIZE_ALLOW_RESERVED) ? "SANITIZE_ALLOW_RESERVED" : ""),
((flags & SANITIZE_ALLOW_TRUNCATE) ? "SANITIZE_ALLOW_TRUNCATE" : "")); ((flags & SANITIZE_ALLOW_TRUNCATE) ? "SANITIZE_ALLOW_TRUNCATE" : ""));
}
return buf; return buf;
} }
static char *getcurlcodestr(int cc) static char *getcurlcodestr(int cc)
{ {
char *buf = malloc(256); char *buf = malloc(256);
abort_unless(buf, "out of memory"); if(buf) {
snprintf(buf, 256, "%s (%d)", snprintf(buf, 256, "%s (%d)",
(cc == SANITIZE_ERR_OK ? "SANITIZE_ERR_OK" : (cc == SANITIZE_ERR_OK ? "SANITIZE_ERR_OK" :
cc == SANITIZE_ERR_BAD_ARGUMENT ? "SANITIZE_ERR_BAD_ARGUMENT" : cc == SANITIZE_ERR_BAD_ARGUMENT ? "SANITIZE_ERR_BAD_ARGUMENT" :
@ -65,6 +66,7 @@ static char *getcurlcodestr(int cc)
cc == SANITIZE_ERR_OUT_OF_MEMORY ? "SANITIZE_ERR_OUT_OF_MEMORY" : cc == SANITIZE_ERR_OUT_OF_MEMORY ? "SANITIZE_ERR_OUT_OF_MEMORY" :
"unexpected error code - add name"), "unexpected error code - add name"),
cc); cc);
}
return buf; return buf;
} }
@ -310,8 +312,11 @@ UNITTEST_START
} }
flagstr = getflagstr(data[i].flags); flagstr = getflagstr(data[i].flags);
abort_unless(flagstr, "out of memory");
received_ccstr = getcurlcodestr(res); received_ccstr = getcurlcodestr(res);
abort_unless(received_ccstr, "out of memory");
expected_ccstr = getcurlcodestr(data[i].expected_result); expected_ccstr = getcurlcodestr(data[i].expected_result);
abort_unless(expected_ccstr, "out of memory");
unitfail++; unitfail++;
fprintf(stderr, "\n" fprintf(stderr, "\n"