OSDN Git Service

sens: remove unused parameter in dispatch_cmd
authorOctavian Purdila <octavian.purdila@intel.com>
Thu, 20 Nov 2014 13:21:22 +0000 (15:21 +0200)
committerAdriana Reus <adriana.reus@intel.com>
Wed, 3 Dec 2014 13:56:05 +0000 (15:56 +0200)
We already assume that cmd is NULL terminated, so lets remove the unused
cmd_len. Add check to verify that the received command is NULL
terminated.

Change-Id: I1da3cdf8005b778d7e3e37fe7b2e3ca4b9322801
Signed-off-by: Octavian Purdila <octavian.purdila@intel.com>
sens.c

diff --git a/sens.c b/sens.c
index ecb75fa..81e0992 100644 (file)
--- a/sens.c
+++ b/sens.c
@@ -233,7 +233,7 @@ static int sensor_activate(int handle, int enable)
 #define CLIENT_ERR(f, fmt...)                  \
        { if (f) { fprintf(f, fmt); fprintf(f, "\n"); } ALOGE(fmt); }
 
 #define CLIENT_ERR(f, fmt...)                  \
        { if (f) { fprintf(f, fmt); fprintf(f, "\n"); } ALOGE(fmt); }
 
-static int dispatch_cmd(char *cmd, int cmd_len, FILE *f)
+static int dispatch_cmd(char *cmd, FILE *f)
 {
        char *argv[16], *tmp;
        int argc = 0, handle;
 {
        char *argv[16], *tmp;
        int argc = 0, handle;
@@ -388,7 +388,12 @@ static int start_server(void)
                                }
                        }
 
                                }
                        }
 
-                       err = dispatch_cmd(data_buff, err, f);
+                       if (data_buff[err - 1] != 0) {
+                               ALOGE("command is not NULL terminated\n");
+                               break;
+                       }
+
+                       err = dispatch_cmd(data_buff, f);
                        if (err < 0) {
                                ALOGE("error dispatching command: %d", err);
                                break;
                        if (err < 0) {
                                ALOGE("error dispatching command: %d", err);
                                break;