LineageOS/android_vendor_qcom_opensource_power
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

power: Fix power hal compiler warnings

Browse Source 
Bug: 30432975
Test: compile power hal for walleye without warnings
Change-Id: I0d90c26462c662690f8a179250000b9a449a109f
Signed-off-by: Arian <arian.kulmer@web.de>
This commit is contained in:
Adrian Salido
2017-03-29 15:58:38 -07:00
committed by Michael Bestas
parent 48bfafcf39
commit d12031bf27
3 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
metadata-parser.c
View File

@@ -33,8 +33,8 @@
#include "metadata-defs.h"
int parse_metadata(char* metadata, char** metadata_saveptr, char* attribute, int attribute_size,
char* value, int value_size) {
int parse_metadata(char* metadata, char** metadata_saveptr, char* attribute,
unsigned int attribute_size, char* value, unsigned int value_size) {
char* attribute_string;
char* attribute_value_delim;
unsigned int bytes_to_copy;
@@ -46,15 +46,12 @@ int parse_metadata(char* metadata, char** metadata_saveptr, char* attribute, int
attribute[0] = value[0] = '\0';
if ((attribute_value_delim = strchr(attribute_string, ATTRIBUTE_VALUE_DELIM)) != NULL) {
bytes_to_copy = MIN((attribute_value_delim - attribute_string), attribute_size - 1);
/* Replace strncpy with strlcpy
* Add +1 to bytes_to_copy as strlcpy copies size-1 bytes */
strlcpy(attribute, attribute_string, bytes_to_copy + 1);
unsigned int attribute_len = (unsigned int)(attribute_value_delim - attribute_string);
/* copy only attribute len + NUL character, or as much as can be fit */
bytes_to_copy = MIN(attribute_len + 1, attribute_size);
bytes_to_copy = MIN(strlen(attribute_string) - strlen(attribute) - 1, value_size - 1);
/* Replace strncpy with strlcpy
* Add +1 to bytes_to_copy as strlcpy copies size-1 bytes */
strlcpy(value, attribute_value_delim + 1, bytes_to_copy + 1);
strlcpy(attribute, attribute_string, bytes_to_copy);
strlcpy(value, attribute_value_delim + 1, value_size);
}
return METADATA_PARSING_CONTINUE;