commit 155c8f5e4011d9a411b6be778766ba93239eac82
author Wind Yuan <feng.yuan@intel.com> Fri Mar 18 23:16:59 2016 +0800
committer Wind Yuan <feng.yuan@intel.com> Fri Mar 18 23:52:25 2016 +0800
tree e417459a0e319776d82e5cd6e45c0d7befefb4d7
parent 1f7d4d2eb72bb24d58f860697078afa7b086cb71

compile: fix possible memory leak issues

 * potential issues reported by klocwork

Signed-off-by: Wind Yuan <feng.yuan@intel.com>

tests/test-device-manager.cpp

diff --git a/tests/test-device-manager.cpp b/tests/test-device-manager.cpp
index af84129..eb1c04e 100644
--- a/tests/test-device-manager.cpp
+++ b/tests/test-device-manager.cpp
@@ -368,12 +368,12 @@
     CL3aImageProcessor::WaveletBasis wavelet_mode = CL3aImageProcessor::WaveletDisable;
     int32_t brightness_level = 128;
     bool    have_usbcam = 0;
-    char*   usb_device_name = NULL;
+    SmartPtr<char> usb_device_name;
     bool sync_mode = false;
     int frame_rate;
     int frame_width = 1920;
     int frame_height = 1080;
-    char *path_to_fake = NULL;
+    SmartPtr<char> path_to_fake = NULL;
 
     const char *short_opts = "sca:n:m:f:d:b:pi:e:r:h";
     const struct option long_opts[] = {
@@ -470,8 +470,8 @@
             break;
         case 'U':
             have_usbcam = true;
-            usb_device_name = strdup(optarg);
-            XCAM_LOG_DEBUG("using USB camera plugged in at node: %s", usb_device_name);
+            usb_device_name = strndup(optarg, XCAM_MAX_STR_SIZE);
+            XCAM_LOG_DEBUG("using USB camera plugged in at node: %s", XCAM_STR(usb_device_name.ptr ()));
             break;
         case 'R':
             XCAM_ASSERT (optarg);
@@ -611,7 +611,7 @@
         case 'r': {
             if (optarg) {
                 XCAM_LOG_INFO ("use raw image %s as input source", optarg);
-                path_to_fake = strdup(optarg);
+                path_to_fake = strndup(optarg, XCAM_MAX_STR_SIZE);
             }
             break;
         }
@@ -632,10 +632,10 @@
         device_manager->set_display_mode (display_mode);
     }
     if (!device.ptr ())  {
-        if (path_to_fake) {
+        if (path_to_fake.ptr ()) {
             device = new FakeV4l2Device ();
         } else if (have_usbcam) {
-            device = new UVCDevice (usb_device_name);
+            device = new UVCDevice (usb_device_name.ptr ());
         } else {
             if (capture_mode == V4L2_CAPTURE_MODE_STILL)
                 device = new AtomispDevice (CAPTURE_DEVICE_STILL);
@@ -768,8 +768,8 @@
 #endif
 
     SmartPtr<PollThread> poll_thread;
-    if (path_to_fake)
-        poll_thread = new FakePollThread (path_to_fake);
+    if (path_to_fake.ptr ())
+        poll_thread = new FakePollThread (path_to_fake.ptr ());
     else
         poll_thread = new PollThread ();
     device_manager->set_poll_thread (poll_thread);
@@ -797,10 +797,6 @@
     CHECK_CONTINUE (ret, "device manager stop failed");
     device->close ();
     event_device->close ();
-    if (usb_device_name)
-        free (usb_device_name);
-    if (path_to_fake)
-        free (path_to_fake);
 
     return 0;
 }