diff options
| author | Rohit Rangwani <rrangwan@codeaurora.org> | 2017-10-10 12:44:32 +0530 |
|---|---|---|
| committer | Rohit Rangwani <rrangwan@codeaurora.org> | 2017-10-10 15:42:19 +0530 |
| commit | fc5b771a74b50b15c781142b711a7ae2cd9cbf3e (patch) | |
| tree | 0165369f683567a2268c9196636ba010e161cbf9 | |
| parent | 31abb952fa3b788a2da84d58940d7b7a9f6080fa (diff) | |
| download | android_vendor_nxp_opensource_packages_apps_Nfc-fc5b771a74b50b15c781142b711a7ae2cd9cbf3e.tar.gz android_vendor_nxp_opensource_packages_apps_Nfc-fc5b771a74b50b15c781142b711a7ae2cd9cbf3e.tar.bz2 android_vendor_nxp_opensource_packages_apps_Nfc-fc5b771a74b50b15c781142b711a7ae2cd9cbf3e.zip | |
NFC: Avoid banned functions usage
Banned functions replaced to fix reported kw issues
Change-Id: Ie1abb8f08406c40e868ffa94f7ad561baa6d7a19
| -rw-r--r-- | nci/jni/NativeNfcManager.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/nci/jni/NativeNfcManager.cpp b/nci/jni/NativeNfcManager.cpp index d395226c..73574ed8 100644 --- a/nci/jni/NativeNfcManager.cpp +++ b/nci/jni/NativeNfcManager.cpp @@ -1,6 +1,6 @@ /****************************************************************************** * - * Copyright (c) 2016, The Linux Foundation. All rights reserved. + * Copyright (c) 2016-2017, The Linux Foundation. All rights reserved. * Not a Contribution. * * Copyright (C) 2015 NXP Semiconductors @@ -7394,15 +7394,15 @@ void write_uicc_context(uint8_t *uiccContext, uint16_t uiccContextLen, uint8_t * memset (filename, 0, sizeof(filename)); memset (filename2, 0, sizeof(filename2)); - strcpy(filename2, "/data/nfc"); - strncat(filename2, "/nxpStorage.bin", sizeof(filename2)-strlen(filename2)-1); + strlcpy(filename2, "/data/nfc", sizeof(filename2)); + strlcat(filename2, "/nxpStorage.bin", sizeof(filename2)); if (strlen(filename2) > 200) { ALOGE("%s: filename too long", __func__); return; } - sprintf (filename, "%s%u", filename2, block); + snprintf (filename, sizeof(filename), "%s%u", filename2, block); ALOGV("%s: bytes=%u; file=%s slotnum=%d", __func__, uiccContextLen, filename, slotnum); int fileStream = 0; @@ -7481,14 +7481,14 @@ void read_uicc_context(uint8_t *uiccContext, uint16_t uiccContextLen, uint8_t *u memset (filename, 0, sizeof(filename)); memset (filename2, 0, sizeof(filename2)); - strcpy(filename2, "/data/nfc"); - strncat(filename2, "/nxpStorage.bin", sizeof(filename2)-strlen(filename2)-1); + strlcpy(filename2, "/data/nfc", sizeof(filename2)); + strlcat(filename2, "/nxpStorage.bin", sizeof(filename2)); if (strlen(filename2) > 200) { ALOGE("%s: filename too long", __func__); return; } - sprintf (filename, "%s%u", filename2, block); + snprintf (filename, sizeof(filename), "%s%u", filename2, block); ALOGV("%s: buffer len=%u; file=%s, slotnum=%d", __func__, uiccContextLen, filename, slotnum); int fileStream = open (filename, O_RDONLY); |