tequilaOS/platform_system_vold
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

am 8c0a0db1: Merge "Change strncpy to strlcpy"

Browse source 
* commit '8c0a0db1ad217f3238e31c291afa6b5e6a6fc98d':
  Change strncpy to strlcpy
This commit is contained in:
Elliott Hughes 2015-02-07 07:38:37 +00:00 committed by Android Git Automerger
commit d773fc118a
3 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Loop.cpp
View file

@ -121,7 +121,7 @@ int Loop::lookupActive(const char *id, char *buffer, size_t len) {
errno = ENOENT;
return -1;
}
strncpy(buffer, filename, len -1);
strlcpy(buffer, filename, len);
return 0;
}
@ -191,7 +191,7 @@ int Loop::create(const char *id, const char *loopFile, char *loopDeviceBuffer, s
return -1;
}
strncpy(loopDeviceBuffer, filename, len -1);
strlcpy(loopDeviceBuffer, filename, len);
int file_fd;

4
Process.cpp
View file

@ -110,7 +110,7 @@ int Process::checkFileDescriptorSymLinks(int pid, const char *mountPoint, char *
if (readSymLink(path, link, sizeof(link)) && pathMatchesMountPoint(link, mountPoint)) {
if (openFilename) {
memset(openFilename, 0, max);
strncpy(openFilename, link, max-1);
strlcpy(openFilename, link, max);
}
closedir(dir);
return 1;
@ -140,7 +140,7 @@ int Process::checkFileMaps(int pid, const char *mountPoint, char *openFilename,
if (path && pathMatchesMountPoint(path, mountPoint)) {
if (openFilename) {
memset(openFilename, 0, max);
strncpy(openFilename, path, max-1);
strlcpy(openFilename, path, max);
}
fclose(file);
return 1;

3
vdc.c
View file

@ -145,8 +145,7 @@ static int do_monitor(int sock, int stop_after_cmd) {
int code;
char tmp[4];
strncpy(tmp, buffer + offset, 3);
tmp[3] = '\0';
strlcpy(tmp, buffer + offset, sizeof(tmp));
code = atoi(tmp);
printf("%s\n", buffer + offset);