Changes: Coverity tool defect fixes for tests

RevBy: TrustMe

debian/changelog

@@ -1,6 +1,7 @@
 applauncherd (0.28.0) unstable; urgency=low
 
   * Changes: Some coverity tool defects are fixed
+  * Changes: Coverity tool defect fixes for tests
 
  -- Olli Leppanen <olli.leppanen@nokia.com>  Thu, 14 Apr 2011 13:49:24 +0300
 

tests/common/testapps/fala_multi-instance/mainwindow.cpp

@@ -61,13 +61,13 @@ bool MainWindow::event(QEvent *event)
         if (isMinimized()) 
         {
             std::cerr << "Minimized" << std::endl;
-            sprintf(message, "%i Minimized", getpid());
+            snprintf(message, 32, "%i Minimized", getpid());
             timestamp(message);
         }
         else
         {
             std::cerr << "Maximized"  << std::endl;
-            sprintf(message, "%i Maximized", getpid());
+            snprintf(message, 32, "%i Maximized", getpid());
             timestamp(message);
         }
     }

tests/common/testapps/fala_windowid/main.cpp

@@ -104,7 +104,7 @@ int main(int argc, char **argv)
     // Print the resulting window id's
     const list<Window> &result = match.result();
     for(list<Window>::const_iterator it = result.begin(); it != result.end(); it++)
-        cout << "0x" << std::hex << (unsigned long)(*it) << endl;
+        cout << "0x" << std::hex << (unsigned long)(*it) << std::dec << endl;
 
     return EXIT_SUCCESS;
 }

tests/common/testapps/pixelchanged/main.c

@@ -193,22 +193,28 @@ int main(int argc, char **argv)
 
     while (arg < argc) {
         if (0 == strcmp("-c", argv[arg])) {
+            // coverity[secure_coding]
             sscanf(argv[++arg], "%ux%u", &click_x, &click_y);
         } else if (0 == strcmp("-p", argv[arg])) {
+            // coverity[secure_coding]
             sscanf(argv[++arg], "%lx", &pixel_value);
             pixel_value_defined = True;
         } else if (0 == strcmp("-r", argv[arg])) {
+            // coverity[secure_coding]
             sscanf(argv[++arg], "%x", &window_id);
             raise_window(dpy, window_id);
             return EXIT_SUCCESS;
         } else if (0 == strcmp("-t", argv[arg])) { /* tracked pixel coordinates */
             if (i == 0) {
+                // coverity[secure_coding]
                 sscanf(argv[++arg], "%ux%u", &pixel_x, &pixel_y);
             } else {
+                // coverity[secure_coding]
                 sscanf(argv[++arg], "%ux%u", &pixel2_x, &pixel2_y);
             }
             i++;
         } else if (0 == strcmp("-f", argv[arg])) {
+            // coverity[secure_coding]
             sscanf(argv[++arg], "%s", g_output_filename);
         } else if (0 == strcmp("-q", argv[arg])) {
             quit_when_found = 1;
@@ -266,7 +272,8 @@ int main(int argc, char **argv)
             timestamp(txtbuffer);
             previous_pixel = pixel;
             
-            if (quit_when_found) return EXIT_SUCCESS;
+            if (quit_when_found) 
+                break;
         }
 
         if ( 
@@ -277,7 +284,8 @@ int main(int argc, char **argv)
             timestamp(txtbuffer);
             previous_pixel2 = pixel2;
             
-            if (quit_when_found) return EXIT_SUCCESS;
+            if (quit_when_found) 
+                break;
         }
 
     }

tests/common/testapps/xsendevent/main.cpp

@@ -68,14 +68,20 @@ int main (int argc, char **argv)
 
         if (QString(argv[i]) == "close") {
             Window window;
+
+            // coverity[secure_coding]
             sscanf(argv[++i], "%lx", &window);
+
             sendCloseEvent(window);
             return 0;
         }
 
         if (QString(argv[i]) == "iconify") {
             Window window;
+
+            // coverity[secure_coding]
             sscanf(argv[++i], "%lx", &window);
+
             iconifyWindow(window);
             return 0;
         }