moparisthebest/curl
1
0
Fork 0
mirror of https://github.com/moparisthebest/curl synced 2025-02-28 09:21:50 -05:00
Code Issues Releases Wiki Activity

dynbuf: return NULL when there's no buffer length

Browse Source 
... as returning a "" is not a good idea as the string is supposed to be
allocated and returning a const string will cause issues.

Reported-by: Brian Carpenter
Follow-up to ed35d6590e72c
Closes #5405
This commit is contained in:
Daniel Stenberg 2020-05-17 19:47:45 +02:00
parent 2c598cc778
commit 3df42ca949
No known key found for this signature in database
GPG Key ID: 5CC908FDB71E12C2
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
docs/DYNBUF.md
View File

@ -60,17 +60,17 @@ larger than the buffer length.
char *Curl_dyn_ptr(const struct dynbuf *s);
Returns a `char *` to the buffer. Since the buffer may be reallocated, this
pointer should not be trusted or used anymore after the next buffer
manipulation call.
Returns a `char *` to the buffer if it has a length, otherwise a NULL. Since
the buffer may be reallocated, this pointer should not be trusted or used
anymore after the next buffer manipulation call.
## uptr
unsigned char *Curl_dyn_uptr(const struct dynbuf *s);
Returns an `unsigned char *` to the buffer. Since the buffer may be
reallocated, this pointer should not be trusted or used anymore after the next
buffer manipulation call.
Returns an `unsigned char *` to the buffer if it has a length, otherwise a
NULL. Since the buffer may be reallocated, this pointer should not be trusted
or used anymore after the next buffer manipulation call.
## len

4
lib/dynbuf.c
View File

@ -201,7 +201,7 @@ char *Curl_dyn_ptr(const struct dynbuf *s)
DEBUGASSERT(s);
DEBUGASSERT(s->init == DYNINIT);
DEBUGASSERT(!s->leng || s->bufr);
return s->leng ? s->bufr : (char *)"";
return s->bufr;
}
/*
@ -212,7 +212,7 @@ unsigned char *Curl_dyn_uptr(const struct dynbuf *s)
DEBUGASSERT(s);
DEBUGASSERT(s->init == DYNINIT);
DEBUGASSERT(!s->leng || s->bufr);
return s->leng ? (unsigned char *)s->bufr : (unsigned char *)"";
return (unsigned char *)s->bufr;
}
/*