summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNikos Mavrogiannopoulos <nmav@gnutls.org>2017-03-05 18:17:36 +0100
committerNikos Mavrogiannopoulos <nmav@gnutls.org>2017-03-05 18:32:03 +0100
commit39aac68b36ef63e3c623331cb8a21f64a36c5fd1 (patch)
tree2ab8e0bf3c1646eb7003723887cc335a144e90e1
parent578f2eb804d224d4fc74f7f4b13f1bdb88810841 (diff)
downloadgnutls-39aac68b36ef63e3c623331cb8a21f64a36c5fd1.tar.gz
_gnutls_set_strdatum: always return an allocated string on success
That prevents returning NULL to functions which require a string. Signed-off-by: Nikos Mavrogiannopoulos <nmav@gnutls.org>
-rw-r--r--lib/datum.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/datum.c b/lib/datum.c
index 41c54d3369..27af043a5e 100644
--- a/lib/datum.c
+++ b/lib/datum.c
@@ -49,12 +49,14 @@ _gnutls_set_datum(gnutls_datum_t * dat, const void *data, size_t data_size)
return 0;
}
-/* ensures that the data set are null-terminated */
+/* ensures that the data set are null-terminated
+ * The function always returns an allocated string in @dat on success.
+ */
int
_gnutls_set_strdatum(gnutls_datum_t * dat, const void *data, size_t data_size)
{
if (data_size == 0 || data == NULL) {
- dat->data = NULL;
+ dat->data = gnutls_calloc(1, 1);
dat->size = 0;
return 0;
}