diff options
| author | Taeyoung Kim <ty317.kim@samsung.com> | 2016-06-30 17:59:48 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@review.vlan103.tizen.org> | 2016-06-30 17:59:48 -0700 |
| commit | 0f1227f454480037cd49776d16c74226d351b5c4 (patch) | |
| tree | 999ecc3137fefb30fabbf978abe3a0e41f28d9c5 | |
| parent | e3dab626e38347ca8617651e58e45813c96adcf8 (diff) | |
| parent | d7b743831ba61acf1c9e6b59bc6d61372f120685 (diff) | |
| download | deviced-0f1227f454480037cd49776d16c74226d351b5c4.tar.gz deviced-0f1227f454480037cd49776d16c74226d351b5c4.tar.bz2 deviced-0f1227f454480037cd49776d16c74226d351b5c4.zip | |
Merge "Add and remove error checking code" into tizen
| -rw-r--r-- | src/block/block.c | 2 | ||||
| -rw-r--r-- | src/haptic/haptic.c | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/block/block.c b/src/block/block.c index ef7960f7..3f375b00 100644 --- a/src/block/block.c +++ b/src/block/block.c @@ -410,8 +410,6 @@ static int get_scsi_mount_node(char *devnode, char *node, size_t len) name = dev; name += strlen("sd"); - if (!name) - return -EINVAL; for (i = 0 ; i < strlen(name) ; i++) name[i] = toupper(name[i]); diff --git a/src/haptic/haptic.c b/src/haptic/haptic.c index 08208736..a5f838d1 100644 --- a/src/haptic/haptic.c +++ b/src/haptic/haptic.c @@ -857,6 +857,10 @@ static int parse_section(struct parse_result *result, void *user_data, int index conf->sound_capture = atoi(result->value); } else if (MATCH(result->name, "level")) { conf->level = atoi(result->value); + if (conf->level < 0) { + _E("You must set level with positive number"); + return -EINVAL; + } conf->level_arr = calloc(sizeof(int), conf->level); if (!conf->level_arr) { _E("failed to allocate memory for level"); |