diff options
| author | qctecmdr Service <qctecmdr@qualcomm.com> | 2017-11-02 07:05:20 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-11-02 07:05:20 -0700 |
| commit | bad4d1f535707a060d0bcb330c97e4a1bbbacfde (patch) | |
| tree | a164e42911e02c943832e6223ac96d3b0ecb9158 /ipanat | |
| parent | cd0ffe8371ab904068f56eb64ff4aef512c1d251 (diff) | |
| parent | c9e6a88d685e472c4dabeaaabbf7a682efb254b3 (diff) | |
| download | ipacfg-mgr-bad4d1f535707a060d0bcb330c97e4a1bbbacfde.tar.gz | |
Merge "IPACM: Do not use deprecated strncpy function"
Diffstat (limited to 'ipanat')
| -rw-r--r-- | ipanat/src/ipa_nat_drvi.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/ipanat/src/ipa_nat_drvi.c b/ipanat/src/ipa_nat_drvi.c index 9b06028..675dcf5 100644 --- a/ipanat/src/ipa_nat_drvi.c +++ b/ipanat/src/ipa_nat_drvi.c @@ -35,11 +35,16 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #define strlcpy g_strlcpy #else #ifndef FEATURE_IPA_ANDROID -static size_t strlcpy(char * dst, const char * src, size_t size) { +static size_t strlcpy(char * dst, const char * src, size_t size) +{ + size_t i; + if (size < 1) return 0; - strncpy(dst, src, size - 1); - dst[size - 1] = 0; + for (i = 0; i < (size - 1) && src[i] != '\0'; i++) + dst[i] = src[i]; + for (; i < size; i++) + dst[i] = '\0'; return strlen(dst); } #endif |