Changeset 3647

Timestamp:

Jul 15, 2011 2:33:17 AM (13 years ago)

Author:

nanang

Message:

Misc (re #1320): fix verification of invalid/negative video device ID in videodev.c, should just returning error instead of raising assertion.

File:

• pjproject/branches/projects/2.0-dev/pjmedia/src/pjmedia-videodev/videodev.c (modified) (3 diffs)

pjproject/branches/projects/2.0-dev/pjmedia/src/pjmedia-videodev/videodev.c

@@ -515 +515 @@
         unsigned i;
 
-        if (id == PJMEDIA_VID_INVALID_DEV)
+        if (id <= PJMEDIA_VID_INVALID_DEV)
             return PJMEDIA_EVID_INVDEV;
 
@@ -564 +564 @@
     pj_status_t status;
 
-    PJ_ASSERT_RETURN(info && id!=PJMEDIA_VID_INVALID_DEV, PJ_EINVAL);
+    PJ_ASSERT_RETURN(info, PJ_EINVAL);
     PJ_ASSERT_RETURN(vid_subsys.pf, PJMEDIA_EVID_INIT);
+
+    if (id <= PJMEDIA_VID_INVALID_DEV)
+        return PJMEDIA_EVID_INVDEV;
 
     status = lookup_dev(id, &f, &index);
@@ -635 +638 @@
     pj_status_t status;
 
-    PJ_ASSERT_RETURN(param && id!=PJMEDIA_VID_INVALID_DEV, PJ_EINVAL);
+    PJ_ASSERT_RETURN(param, PJ_EINVAL);
     PJ_ASSERT_RETURN(vid_subsys.pf, PJMEDIA_EVID_INIT);
+
+    if (id <= PJMEDIA_VID_INVALID_DEV)
+        return PJMEDIA_EVID_INVDEV;
 
     status = lookup_dev(id, &f, &index);