diff options
| author | Guy Harris <guy@alum.mit.edu> | 2018-10-16 00:15:38 -0700 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2018-10-16 00:15:38 -0700 |
| commit | 017c240336a375aebd52ec30cf341a207f1c12a4 (patch) | |
| tree | 51018597dbbf7efcfeb940e14f0a7bd58ea01095 /pcap-rpcap.c | |
| parent | ed63d72f6b9bddab83fc35a957a6a9ff02501d0a (diff) | |
Provide out own strlcpy() and strlcat() routines if necessary.
We now depend on the *full* semantics of those routines, including the
return value being usable for truncation checks.
If we're building for a UN*X that has them, define pcap_strl{cpy,cat} to
be strl{cpy,cat}.
If we're building for Windows using MSVC, define pcap_strl{cpy,cat}, not
strl{cpy,cat}.
Otherwise, build our won versions of pcap_strl{cpy,cat} from BSD-derived
source code.
Diffstat (limited to 'pcap-rpcap.c')
| -rw-r--r-- | pcap-rpcap.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pcap-rpcap.c b/pcap-rpcap.c index a35eaf24..a62296d6 100644 --- a/pcap-rpcap.c +++ b/pcap-rpcap.c @@ -2528,7 +2528,7 @@ pcap_findalldevs_ex_remote(char *source, struct pcap_rmtauth *auth, pcap_if_t ** } /* Copy the new device name into the correct memory location */ - strlcpy(dev->name, tmpstring2, stringlen + 1); + pcap_strlcpy(dev->name, tmpstring2, stringlen + 1); } if (findalldevs_if.desclen) @@ -2561,7 +2561,7 @@ pcap_findalldevs_ex_remote(char *source, struct pcap_rmtauth *auth, pcap_if_t ** } /* Copy the new device description into the correct memory location */ - strlcpy(dev->description, tmpstring2, stringlen + 1); + pcap_strlcpy(dev->description, tmpstring2, stringlen + 1); } dev->flags = ntohl(findalldevs_if.flags); @@ -2983,7 +2983,7 @@ int pcap_remoteact_list(char *hostlist, char sep, int size, char *errbuf) return -1; } - strlcat(hostlist, hoststr, PCAP_ERRBUF_SIZE); + pcap_strlcat(hostlist, hoststr, PCAP_ERRBUF_SIZE); hostlist[len - 1] = sep; hostlist[len] = 0; |