Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Replace strcpy with memcpy."

Browse Source
This commit is contained in:
Treehugger Robot
2017-10-03 04:09:48 +00:00
committed by Gerrit Code Review
parent 1704df64ce d32ae10f4c
commit bb115bac41
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tools/aapt/Images.cpp
View File

@@ -1246,7 +1246,7 @@ static void write_png(const char* imageName,
if (kIsDebug) { if (kIsDebug) {
printf("Adding 9-patch info...\n"); printf("Adding 9-patch info...\n");
} }
strcpy((char*)unknowns[p_index].name, "npTc"); memcpy((char*)unknowns[p_index].name, "npTc", 5);
unknowns[p_index].data = (png_byte*)imageInfo.serialize9patch(); unknowns[p_index].data = (png_byte*)imageInfo.serialize9patch();
unknowns[p_index].size = imageInfo.info9Patch.serializedSize(); unknowns[p_index].size = imageInfo.info9Patch.serializedSize();
// TODO: remove the check below when everything works // TODO: remove the check below when everything works
@@ -1254,7 +1254,7 @@ static void write_png(const char* imageName,
// automatically generated 9 patch outline data // automatically generated 9 patch outline data
int chunk_size = sizeof(png_uint_32) * 6; int chunk_size = sizeof(png_uint_32) * 6;
strcpy((char*)unknowns[o_index].name, "npOl"); memcpy((char*)unknowns[o_index].name, "npOl", 5);
unknowns[o_index].data = (png_byte*) calloc(chunk_size, 1); unknowns[o_index].data = (png_byte*) calloc(chunk_size, 1);
png_byte outputData[chunk_size]; png_byte outputData[chunk_size];
memcpy(&outputData, &imageInfo.outlineInsetsLeft, 4 * sizeof(png_uint_32)); memcpy(&outputData, &imageInfo.outlineInsetsLeft, 4 * sizeof(png_uint_32));
@@ -1266,7 +1266,7 @@ static void write_png(const char* imageName,
// optional optical inset / layout bounds data // optional optical inset / layout bounds data
if (imageInfo.haveLayoutBounds) { if (imageInfo.haveLayoutBounds) {
int chunk_size = sizeof(png_uint_32) * 4; int chunk_size = sizeof(png_uint_32) * 4;
strcpy((char*)unknowns[b_index].name, "npLb"); memcpy((char*)unknowns[b_index].name, "npLb", 5);
unknowns[b_index].data = (png_byte*) calloc(chunk_size, 1); unknowns[b_index].data = (png_byte*) calloc(chunk_size, 1);
memcpy(unknowns[b_index].data, &imageInfo.layoutBoundsLeft, chunk_size); memcpy(unknowns[b_index].data, &imageInfo.layoutBoundsLeft, chunk_size);
unknowns[b_index].size = chunk_size; unknowns[b_index].size = chunk_size;

6
tools/aapt2/compile/Png.cpp
View File

@@ -538,7 +538,7 @@ static bool writePng(IDiagnostics* diag, png_structp writePtr,
if (kDebug) { if (kDebug) {
diag->Note(DiagMessage() << "adding 9-patch info.."); diag->Note(DiagMessage() << "adding 9-patch info..");
} }
strcpy((char*)unknowns[pIndex].name, "npTc"); memcpy((char*)unknowns[pIndex].name, "npTc", 5);
unknowns[pIndex].data = (png_byte*)info->serialize9Patch(); unknowns[pIndex].data = (png_byte*)info->serialize9Patch();
unknowns[pIndex].size = info->info9Patch.serializedSize(); unknowns[pIndex].size = info->info9Patch.serializedSize();
// TODO: remove the check below when everything works // TODO: remove the check below when everything works
@@ -546,7 +546,7 @@ static bool writePng(IDiagnostics* diag, png_structp writePtr,
// automatically generated 9 patch outline data // automatically generated 9 patch outline data
int chunkSize = sizeof(png_uint_32) * 6; int chunkSize = sizeof(png_uint_32) * 6;
strcpy((char*)unknowns[oIndex].name, "npOl"); memcpy((char*)unknowns[oIndex].name, "npOl", 5);
unknowns[oIndex].data = (png_byte*)calloc(chunkSize, 1); unknowns[oIndex].data = (png_byte*)calloc(chunkSize, 1);
png_byte outputData[chunkSize]; png_byte outputData[chunkSize];
memcpy(&outputData, &info->outlineInsetsLeft, 4 * sizeof(png_uint_32)); memcpy(&outputData, &info->outlineInsetsLeft, 4 * sizeof(png_uint_32));
@@ -558,7 +558,7 @@ static bool writePng(IDiagnostics* diag, png_structp writePtr,
// optional optical inset / layout bounds data // optional optical inset / layout bounds data
if (info->haveLayoutBounds) { if (info->haveLayoutBounds) {
int chunkSize = sizeof(png_uint_32) * 4; int chunkSize = sizeof(png_uint_32) * 4;
strcpy((char*)unknowns[bIndex].name, "npLb"); memcpy((char*)unknowns[bIndex].name, "npLb", 5);
unknowns[bIndex].data = (png_byte*)calloc(chunkSize, 1); unknowns[bIndex].data = (png_byte*)calloc(chunkSize, 1);
memcpy(unknowns[bIndex].data, &info->layoutBoundsLeft, chunkSize); memcpy(unknowns[bIndex].data, &info->layoutBoundsLeft, chunkSize);
unknowns[bIndex].size = chunkSize; unknowns[bIndex].size = chunkSize;