diff options
author | Andreas Gampe <agampe@google.com> | 2015-08-13 22:39:29 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-13 22:39:29 +0000 |
commit | 7f36ebb4719f7362ad0727b284d19d42b2f0507f (patch) | |
tree | d1280901d629e761eeba894b29a98d1c6e9cccf6 | |
parent | 2b19bb5af8275f1927e45a8c830b086c9317f1f2 (diff) | |
parent | db892f22d2c992eca9193f4a4b1706a9e9c9f321 (diff) | |
download | flo-7f36ebb4719f7362ad0727b284d19d42b2f0507f.tar.gz |
am db892f22: Merge "Conninit: Check fread return value"
* commit 'db892f22d2c992eca9193f4a4b1706a9e9c9f321':
Conninit: Check fread return value
-rw-r--r-- | conn_init/conn_init.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/conn_init/conn_init.c b/conn_init/conn_init.c index 2cb5591..08759b5 100644 --- a/conn_init/conn_init.c +++ b/conn_init/conn_init.c @@ -29,7 +29,6 @@ static int wifi_check_qcom_cfg_files() // Read MAC String FILE *fp = NULL; - int n = 0; fp = fopen("/persist/wifi/.macaddr", "r"); if ( fp == NULL ) { @@ -38,8 +37,13 @@ static int wifi_check_qcom_cfg_files() } else { - n = fread(macAddress, 12, 1, fp); + int n = fread(macAddress, 12, 1, fp); fclose(fp); + if (n != 12) { + memset(macAddress, 0, 13); + wfc_util_qcom_check_config((unsigned char *)macAddress); + return 0; + } // Write MAC String wfc_util_atoh( macAddress, 12, (unsigned char *)hex, 6); |