generic-library/libupnp
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Directly use strdup()

Browse Source 
commit 0edaf3361db01425cae0daee7dc3f6039f381a17 replaced several
malloc()+strcpy() sequences with memset()+strncpy() using strlen().
This doesn't improve security and introduced a bug URI handling.

While reviewing this commit change the code to directly use strdup()
instead of re-implementing it multiple times, as shortens the code and
thus improves readability.

Signed-off-by: Marcelo Roberto Jimenez <mroberto@users.sourceforge.net>
(cherry picked from commit 04fb68432330c3a622161dda98dbe1b30eaa0927)
This commit is contained in:
Philipp Matthias Hahn 2014-05-01 10:41:20 +02:00 committed by Marcelo Roberto Jimenez
parent 11f05dc09d
commit 0398b1fc75
2 changed files with 9 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
upnp/src/gena/gena_device.c
View File

@ -480,25 +480,20 @@ int genaInitNotify(
} }
*reference_count = 0; *reference_count = 0;
UDN_copy = (char *)malloc(strlen(UDN) + 1); UDN_copy = strdup(UDN);
if (UDN_copy == NULL) { if (UDN_copy == NULL) {
line = __LINE__; line = __LINE__;
ret = UPNP_E_OUTOF_MEMORY; ret = UPNP_E_OUTOF_MEMORY;
goto ExitFunction; goto ExitFunction;
} }
servId_copy = (char *)malloc(strlen(servId) + 1); servId_copy = strdup(servId);
if (servId_copy == NULL) { if (servId_copy == NULL) {
line = __LINE__; line = __LINE__;
ret = UPNP_E_OUTOF_MEMORY; ret = UPNP_E_OUTOF_MEMORY;
goto ExitFunction; goto ExitFunction;
} }
memset(UDN_copy, 0, strlen(UDN) + 1);
strncpy(UDN_copy, UDN, strlen(UDN));
memset(servId_copy, 0, strlen(servId) + 1);
strncpy(servId_copy, servId, strlen(servId));
HandleLock(); HandleLock();
if (GetHandleInfo(device_handle, &handle_info) != HND_DEVICE) { if (GetHandleInfo(device_handle, &handle_info) != HND_DEVICE) {
@ -639,25 +634,20 @@ int genaInitNotifyExt(
} }
*reference_count = 0; *reference_count = 0;
UDN_copy = (char *)malloc(strlen(UDN) + 1); UDN_copy = strdup(UDN);
if (UDN_copy == NULL) { if (UDN_copy == NULL) {
line = __LINE__; line = __LINE__;
ret = UPNP_E_OUTOF_MEMORY; ret = UPNP_E_OUTOF_MEMORY;
goto ExitFunction; goto ExitFunction;
} }
servId_copy = (char *)malloc(strlen(servId) + 1); servId_copy = strdup(servId);
if( servId_copy == NULL ) { if( servId_copy == NULL ) {
line = __LINE__; line = __LINE__;
ret = UPNP_E_OUTOF_MEMORY; ret = UPNP_E_OUTOF_MEMORY;
goto ExitFunction; goto ExitFunction;
} }
memset(UDN_copy, 0, strlen(UDN) + 1);
strncpy(UDN_copy, UDN, strlen(UDN));
memset(servId_copy, 0, strlen(servId) + 1);
strncpy(servId_copy, servId, strlen(servId));
HandleLock(); HandleLock();
if (GetHandleInfo(device_handle, &handle_info) != HND_DEVICE) { if (GetHandleInfo(device_handle, &handle_info) != HND_DEVICE) {
@ -798,25 +788,20 @@ int genaNotifyAllExt(
} }
*reference_count = 0; *reference_count = 0;
UDN_copy = (char *)malloc(strlen(UDN) + 1); UDN_copy = strdup(UDN);
if (UDN_copy == NULL) { if (UDN_copy == NULL) {
line = __LINE__; line = __LINE__;
ret = UPNP_E_OUTOF_MEMORY; ret = UPNP_E_OUTOF_MEMORY;
goto ExitFunction; goto ExitFunction;
} }
servId_copy = (char *)malloc(strlen(servId) + 1); servId_copy = strdup(servId);
if( servId_copy == NULL ) { if( servId_copy == NULL ) {
line = __LINE__; line = __LINE__;
ret = UPNP_E_OUTOF_MEMORY; ret = UPNP_E_OUTOF_MEMORY;
goto ExitFunction; goto ExitFunction;
} }
memset(UDN_copy, 0, strlen(UDN) + 1);
strncpy(UDN_copy, UDN, strlen(UDN));
memset(servId_copy, 0, strlen(servId) + 1);
strncpy(servId_copy, servId, strlen(servId));
propertySet = ixmlPrintNode((IXML_Node *)PropSet); propertySet = ixmlPrintNode((IXML_Node *)PropSet);
if (propertySet == NULL) { if (propertySet == NULL) {
line = __LINE__; line = __LINE__;
@ -944,25 +929,20 @@ int genaNotifyAll(
} }
*reference_count = 0; *reference_count = 0;
UDN_copy = (char *)malloc(strlen(UDN) + 1); UDN_copy = strdup(UDN);
if (UDN_copy == NULL) { if (UDN_copy == NULL) {
line = __LINE__; line = __LINE__;
ret = UPNP_E_OUTOF_MEMORY; ret = UPNP_E_OUTOF_MEMORY;
goto ExitFunction; goto ExitFunction;
} }
servId_copy = (char *)malloc(strlen(servId) + 1); servId_copy = strdup(servId);
if( servId_copy == NULL ) { if( servId_copy == NULL ) {
line = __LINE__; line = __LINE__;
ret = UPNP_E_OUTOF_MEMORY; ret = UPNP_E_OUTOF_MEMORY;
goto ExitFunction; goto ExitFunction;
} }
memset(UDN_copy, 0, strlen(UDN) + 1);
strncpy(UDN_copy, UDN, strlen(UDN));
memset(servId_copy, 0, strlen(servId) + 1);
strncpy(servId_copy, servId, strlen(servId));
ret = GeneratePropertySet(VarNames, VarValues, var_count, &propertySet); ret = GeneratePropertySet(VarNames, VarValues, var_count, &propertySet);
if (ret != XML_SUCCESS) { if (ret != XML_SUCCESS) {
line = __LINE__; line = __LINE__;

4
upnp/src/genlib/net/http/webserver.c
View File

@ -795,11 +795,9 @@ static int CreateHTTPRangeResponseHeader(
Instr->ReadSendSize = FileLength; Instr->ReadSendSize = FileLength;
if (!ByteRangeSpecifier) if (!ByteRangeSpecifier)
return HTTP_BAD_REQUEST; return HTTP_BAD_REQUEST;
RangeInput = malloc(strlen(ByteRangeSpecifier) + 1); RangeInput = strdup(ByteRangeSpecifier);
if (!RangeInput) if (!RangeInput)
return HTTP_INTERNAL_SERVER_ERROR; return HTTP_INTERNAL_SERVER_ERROR;
memset(RangeInput, 0, strlen(ByteRangeSpecifier) + 1);
strncpy(RangeInput, ByteRangeSpecifier, strlen(ByteRangeSpecifier));
/* CONTENT-RANGE: bytes 222-3333/4000 HTTP_PARTIAL_CONTENT */ /* CONTENT-RANGE: bytes 222-3333/4000 HTTP_PARTIAL_CONTENT */
if (StrStr(RangeInput, "bytes") == NULL || if (StrStr(RangeInput, "bytes") == NULL ||
(Ptr = StrStr(RangeInput, "=")) == NULL) { (Ptr = StrStr(RangeInput, "=")) == NULL) {