diff options
| author | Yunlian Jiang <yunlian@google.com> | 2017-10-03 04:38:07 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-10-03 04:38:07 +0000 |
| commit | 61879522fe1ee10e4d09ffb530dff17d5b4fef65 (patch) | |
| tree | e87da0ce483f25242f80b3281105b407b5938055 /tools/aapt | |
| parent | c153d7a23be0e196e9f48d25b6169ad6b1196374 (diff) | |
| parent | 23f6dca5fda7e53f3ab08a630ce7c62d06127ac1 (diff) | |
Merge "Replace strcpy with memcpy." am: bb115bac41 am: 16951dcb54
am: 23f6dca5fd
Change-Id: I446973c3b96f253e3c3fc2dfda7647cd3e625916
Diffstat (limited to 'tools/aapt')
| -rw-r--r-- | tools/aapt/Images.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tools/aapt/Images.cpp b/tools/aapt/Images.cpp index 5f586a15eeb8..627a231de5c8 100644 --- a/tools/aapt/Images.cpp +++ b/tools/aapt/Images.cpp @@ -1246,7 +1246,7 @@ static void write_png(const char* imageName, if (kIsDebug) { 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].size = imageInfo.info9Patch.serializedSize(); // 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 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); png_byte outputData[chunk_size]; 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 if (imageInfo.haveLayoutBounds) { 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); memcpy(unknowns[b_index].data, &imageInfo.layoutBoundsLeft, chunk_size); unknowns[b_index].size = chunk_size; |