i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Unsafe strncpy replaced by strlcpy. CID 2262, 2263, 2262, 2253, 2252, 2251, 2250, 2249. BUFFER_SIZE_WARNING.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@40610 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Jonas Sundström
2011-02-22 07:09:14 +00:00
parent 07ede8884c
commit a49fe9b849
2 changed files with 15 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/kits/media/MediaFiles.cpp
+13 -13
View File
@@ -93,7 +93,7 @@ BMediaFiles::RewindRefs(const char* type)
server_get_media_items_request request; server_get_media_items_request request;
request.team = BPrivate::current_team(); request.team = BPrivate::current_team();
strncpy(request.type, type, B_MEDIA_NAME_LENGTH); strlcpy(request.type, type, B_MEDIA_NAME_LENGTH);
server_get_media_items_reply reply; server_get_media_items_reply reply;
status_t status = QueryServer(SERVER_GET_MEDIA_FILE_ITEMS, &request, status_t status = QueryServer(SERVER_GET_MEDIA_FILE_ITEMS, &request,
@@ -145,8 +145,8 @@ BMediaFiles::GetRefFor(const char* type, const char* item, entry_ref* _ref)
return B_BAD_VALUE; return B_BAD_VALUE;
server_get_ref_for_request request; server_get_ref_for_request request;
strncpy(request.type, type, B_MEDIA_NAME_LENGTH); strlcpy(request.type, type, B_MEDIA_NAME_LENGTH);
strncpy(request.item, item, B_MEDIA_NAME_LENGTH); strlcpy(request.item, item, B_MEDIA_NAME_LENGTH);
server_get_ref_for_reply reply; server_get_ref_for_reply reply;
status_t status = QueryServer(SERVER_GET_REF_FOR, &request, sizeof(request), status_t status = QueryServer(SERVER_GET_REF_FOR, &request, sizeof(request),
@@ -170,8 +170,8 @@ BMediaFiles::GetAudioGainFor(const char* type, const char* item, float* _gain)
return B_BAD_VALUE; return B_BAD_VALUE;
server_get_item_audio_gain_request request; server_get_item_audio_gain_request request;
strncpy(request.type, type, B_MEDIA_NAME_LENGTH); strlcpy(request.type, type, B_MEDIA_NAME_LENGTH);
strncpy(request.item, item, B_MEDIA_NAME_LENGTH); strlcpy(request.item, item, B_MEDIA_NAME_LENGTH);
server_get_item_audio_gain_reply reply; server_get_item_audio_gain_reply reply;
status_t status = QueryServer(SERVER_GET_ITEM_AUDIO_GAIN, &request, status_t status = QueryServer(SERVER_GET_ITEM_AUDIO_GAIN, &request,
@@ -193,8 +193,8 @@ BMediaFiles::SetRefFor(const char* type, const char* item,
CALLED(); CALLED();
server_set_ref_for_request request; server_set_ref_for_request request;
strncpy(request.type, type, B_MEDIA_NAME_LENGTH); strlcpy(request.type, type, B_MEDIA_NAME_LENGTH);
strncpy(request.item, item, B_MEDIA_NAME_LENGTH); strlcpy(request.item, item, B_MEDIA_NAME_LENGTH);
request.ref = ref; request.ref = ref;
server_set_ref_for_reply reply; server_set_ref_for_reply reply;
@@ -215,8 +215,8 @@ BMediaFiles::SetAudioGainFor(const char* type, const char* item, float gain)
CALLED(); CALLED();
server_set_item_audio_gain_request request; server_set_item_audio_gain_request request;
strncpy(request.type, type, B_MEDIA_NAME_LENGTH); strlcpy(request.type, type, B_MEDIA_NAME_LENGTH);
strncpy(request.item, item, B_MEDIA_NAME_LENGTH); strlcpy(request.item, item, B_MEDIA_NAME_LENGTH);
request.gain = gain; request.gain = gain;
server_set_item_audio_gain_reply reply; server_set_item_audio_gain_reply reply;
@@ -238,8 +238,8 @@ BMediaFiles::RemoveRefFor(const char* type, const char* item,
CALLED(); CALLED();
server_invalidate_item_request request; server_invalidate_item_request request;
strncpy(request.type, type, B_MEDIA_NAME_LENGTH); strlcpy(request.type, type, B_MEDIA_NAME_LENGTH);
strncpy(request.item, item, B_MEDIA_NAME_LENGTH); strlcpy(request.item, item, B_MEDIA_NAME_LENGTH);
server_invalidate_item_reply reply; server_invalidate_item_reply reply;
status_t status = QueryServer(SERVER_INVALIDATE_MEDIA_ITEM, &request, status_t status = QueryServer(SERVER_INVALIDATE_MEDIA_ITEM, &request,
@@ -259,8 +259,8 @@ BMediaFiles::RemoveItem(const char* type, const char* item)
CALLED(); CALLED();
server_remove_media_item_request request; server_remove_media_item_request request;
strncpy(request.type, type, B_MEDIA_NAME_LENGTH); strlcpy(request.type, type, B_MEDIA_NAME_LENGTH);
strncpy(request.item, item, B_MEDIA_NAME_LENGTH); strlcpy(request.item, item, B_MEDIA_NAME_LENGTH);
server_remove_media_item_reply reply; server_remove_media_item_reply reply;
status_t status = QueryServer(SERVER_REMOVE_MEDIA_ITEM, &request, status_t status = QueryServer(SERVER_REMOVE_MEDIA_ITEM, &request,
src/kits/media/MediaNode.cpp
+2 -4
View File
@@ -886,10 +886,8 @@ BMediaNode::_InitObject(const char *name, media_node_id id, uint64 kinds)
fNodeID = id; fNodeID = id;
fRefCount = 1; fRefCount = 1;
fName[0] = 0; fName[0] = 0;
if (name) { if (name)
strncpy(fName, name, B_MEDIA_NAME_LENGTH - 1); strlcpy(fName, name, B_MEDIA_NAME_LENGTH);
fName[B_MEDIA_NAME_LENGTH - 1] = 0;
}
fRunMode = B_INCREASE_LATENCY; fRunMode = B_INCREASE_LATENCY;
fKinds = kinds; fKinds = kinds;
fProducerThis = 0; fProducerThis = 0;