Changeset 276:4667540927be in verona

Timestamp:

Aug 23, 2011 2:35:51 PM (22 months ago)

Author:

laurent <laurent@…>

Branch:

default

Message:

deallocation video struct

File:

• phapi/phms_videostream.c (modified) (2 diffs)

phapi/phms_videostream.c

@@ -140 +140 @@
                 pvs->frame_event.frame_remote = (phPicture_t *)malloc(sizeof(phPicture_t));
                 pvs->frame_event.frame_remote = (phPicture_t *)malloc(sizeof(phPicture_t));
-                pvs->frame_event.frame_local->width = pvs->frame_event.frame_remote->width = width;
-                pvs->frame_event.frame_local->height = pvs->frame_event.frame_remote->height = height;
+                pvs->frame_event.frame_local->width = pvs->frame_event.frame_remote->width = 0;
+                pvs->frame_event.frame_local->height = pvs->frame_event.frame_remote->height = 0;
                 pvs->frame_event.frame_local->planes[0] = NULL;
                 pvs->frame_event.frame_remote->planes[0] = NULL;
@@ -675 +675 @@
 #endif
         
-        free(pvs->frame_event.frame_local);
-        free(pvs->frame_event.frame_remote);
-
+        if(pvs->frame_event.frame_local)
+        {
+                if(pvs->frame_event.frame_local->planes[0])
+                        free(pvs->frame_event.frame_local->planes[0]);
+                
+                free(pvs->frame_event.frame_local);
+        }
+        
+        if(pvs->frame_event.frame_remote)
+        {
+                if(pvs->frame_event.frame_remote->planes[0])
+                        free(pvs->frame_event.frame_remote->planes[0]);
+                
+                free(pvs->frame_event.frame_remote);
+        }
 }