kenbarbour
/
HttpServer
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

setMessage to nullptr should free memory

documentation
Kenneth Barbour 2018-11-29 21:48:14 -05:00
parent 5f31638210
commit e20c32a4fc
2 changed files with 33 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/HttpRequest.cpp
View File

@ -63,6 +63,7 @@ const char * HttpRequest::getUrl() const
const char * HttpRequest::setMessage(const char * str)
{
if (str == nullptr) {
if (this->message != nullptr) free(this->message);
this->message = nullptr;
message_length = 0;
return this->message;
@ -71,12 +72,16 @@ const char * HttpRequest::setMessage(const char * str)
return this->setMessage(str, len);
}
const char * HttpRequest::setMessage(const char * message, unsigned int n)
const char * HttpRequest::setMessage(const char * str, unsigned int n)
{
if (this->message) free(this->message);
this->message = (char *) malloc(n + 1);
if (this->message == nullptr) {
this->message = (char *) malloc(n + 1);
} else if (n > this->message_length) {
this->message = (char *) realloc(this->message, n + 1);
}
message_length = n;
strncpy(this->message, message, n+1);
strncpy(this->message, str, n);
this->message[n] = '\0';
return this->message;
}
@ -87,12 +92,12 @@ const char * HttpRequest::getMessage() const
HttpRequest::~HttpRequest()
{
if (url) {
free(url);
url = nullptr;
if (this->url) {
free(this->url);
this->url = nullptr;
}
if (message) {
free(message);
url = nullptr;
if (this->message != nullptr) {
free(this->message);
this->message = nullptr;
}
}

18
test/test_HttpRequest.cpp
View File

@ -82,3 +82,21 @@ TEST_CASE("HttpRequest reassignment", "[HttpRequest][HttpRequest-reassign]")
CHECK(!req2.headers.has("Content-Type"));
CHECK_THAT(req2.headers.get("Accept"), Equals("*/*"));
}
TEST_CASE("Set message multiple times", "[HttpRequest]")
{
HttpRequest req;
req.setMessage("foo=bar");
CHECK_THAT(req.getMessage(), Equals("foo=bar"));
req.setMessage("foo=bar&baz");
CHECK_THAT(req.getMessage(), Equals("foo=bar&baz"));
req.setMessage("");
CHECK_THAT(req.getMessage(), Equals(""));
req.setMessage(nullptr);
bool isNull = (req.getMessage() == nullptr);
CHECK(isNull);
}