celix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pnol...@apache.org
Subject [24/50] [abbrv] celix git commit: Fixed Coverity issues
Date Tue, 30 Jan 2018 19:19:20 GMT
Fixed Coverity issues


Project: http://git-wip-us.apache.org/repos/asf/celix/repo
Commit: http://git-wip-us.apache.org/repos/asf/celix/commit/361abd71
Tree: http://git-wip-us.apache.org/repos/asf/celix/tree/361abd71
Diff: http://git-wip-us.apache.org/repos/asf/celix/diff/361abd71

Branch: refs/heads/master
Commit: 361abd711d9d3a3dafe42a296a117962d03258c5
Parents: 4da7947
Author: gricciardi <gricciardi@apache.org>
Authored: Wed Nov 15 18:45:58 2017 +0100
Committer: gricciardi <gricciardi@apache.org>
Committed: Wed Nov 15 18:45:58 2017 +0100

----------------------------------------------------------------------
 shell_tui/private/src/shell_tui.c | 23 +++++++++++++++--------
 1 file changed, 15 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/celix/blob/361abd71/shell_tui/private/src/shell_tui.c
----------------------------------------------------------------------
diff --git a/shell_tui/private/src/shell_tui.c b/shell_tui/private/src/shell_tui.c
index de16a20..28bedaa 100644
--- a/shell_tui/private/src/shell_tui.c
+++ b/shell_tui/private/src/shell_tui.c
@@ -66,9 +66,9 @@ struct shell_tui {
 };
 
 typedef struct shell_context {
-    char in[LINE_SIZE];
-    char buffer[LINE_SIZE];
-    char dline[LINE_SIZE];
+    char in[LINE_SIZE+1];
+    char buffer[LINE_SIZE+1];
+    char dline[LINE_SIZE+1];
     int pos;
     history_t* hist;
 } shell_context_t;
@@ -101,8 +101,13 @@ celix_status_t shellTui_start(shell_tui_t* shellTui) {
     if (rc == 0) {
         shellTui->readPipeFd = fds[0];
         shellTui->writePipeFd = fds[1];
-        fcntl(shellTui->writePipeFd, F_SETFL, O_NONBLOCK);
-        celixThread_create(&shellTui->thread, NULL, shellTui_runnable, shellTui);
+        if(fcntl(shellTui->writePipeFd, F_SETFL, O_NONBLOCK) == 0){
+        	celixThread_create(&shellTui->thread, NULL, shellTui_runnable, shellTui);
+        }
+        else{
+        	fprintf(stderr,"fcntl on pipe failed");
+        	status = CELIX_FILE_IO_EXCEPTION;
+        }
     } else {
         fprintf(stderr, "Cannot create pipe");
         status = CELIX_BUNDLE_EXCEPTION;
@@ -229,6 +234,10 @@ static void shellTui_parseInputForControl(shell_tui_t* shellTui, shell_context_t
 
     char* line = NULL;
 
+    if (shellTui == NULL) {
+    	return;
+    }
+
     int nr_chars = read(STDIN_FILENO, buffer, LINE_SIZE-pos-1);
     for(int bufpos = 0; bufpos < nr_chars; bufpos++) {
         if (buffer[bufpos] == KEY_ESC1 && buffer[bufpos+1] == KEY_ESC2) {
@@ -289,9 +298,7 @@ static void shellTui_parseInputForControl(shell_tui_t* shellTui, shell_context_t
             continue;
         } else if(buffer[bufpos] == KEY_TAB) {
             celixThreadMutex_lock(&shellTui->mutex);
-            if (shellTui != NULL) {
-                pos = autoComplete(shellTui->shell, in, pos, LINE_SIZE);
-            }
+            pos = autoComplete(shellTui->shell, in, pos, LINE_SIZE);
             celixThreadMutex_unlock(&shellTui->mutex);
             continue;
         } else if (buffer[bufpos] != KEY_ENTER) { //not end of line -> text


Mime
View raw message