summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNikos Mavrogiannopoulos <nmav@redhat.com>2016-12-08 15:44:28 +0100
committerNikos Mavrogiannopoulos <nmav@redhat.com>2016-12-08 15:59:03 +0100
commite40393e5685743e185ea284337b6a0ed5d756a0f (patch)
tree835b9f86dc9296e89984cac55c85e77152354a09
parent6ca5c18e05fd123d8f18b4f492259d39c90ce09f (diff)
downloadgnutls-e40393e5685743e185ea284337b6a0ed5d756a0f.tar.gz
str: do not call gnutls_assert in inline function
This allows the build to succeed when compiled without libidn.
-rw-r--r--lib/str.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/str.h b/lib/str.h
index fe8b38e2b3..d341baa2ef 100644
--- a/lib/str.h
+++ b/lib/str.h
@@ -52,9 +52,10 @@ int _gnutls_idna_email_map(const char *input, unsigned ilen, gnutls_datum_t *out
inline static
int __gnutls_idna_map(const char *input, unsigned ilen, gnutls_datum_t *out, unsigned flags)
{
+ /* no call to gnutls_assert() due to header dependency issues */
out->data = gnutls_malloc(ilen+1);
if (out->data == NULL)
- return gnutls_assert_val(GNUTLS_E_MEMORY_ERROR);
+ return GNUTLS_E_MEMORY_ERROR;
out->size = ilen;
memcpy(out->data, input, ilen);
out->data[ilen] = 0;