Changeset 2243 for pjproject/trunk/pjlib/src/pj/activesock.c

Timestamp:

Aug 26, 2008 5:10:51 PM (16 years ago)

Author:

bennylp

Message:

Fixed ticket #603: Crash in ICE with IoCompletionPort? ioqueue with the test framework because active socket calls the callback with NULL packet

File:

• pjproject/trunk/pjlib/src/pj/activesock.c (modified) (2 diffs)

pjproject/trunk/pjlib/src/pj/activesock.c

@@ -468 +468 @@
                  * there too.
                  */
-                ret = (*asock->cb.on_data_recvfrom)(asock, NULL, 0,
-                                                    NULL, 0, status);
+                /* In some scenarios, status may be PJ_SUCCESS. The upper 
+                 * layer application may not expect the callback to be called
+                 * with successful status and NULL data, so lets not call the
+                 * callback if the status is PJ_SUCCESS.
+                 */
+                if (status != PJ_SUCCESS ) {
+                    ret = (*asock->cb.on_data_recvfrom)(asock, NULL, 0,
+                                                        NULL, 0, status);
+                }
             }
 
@@ -504 +511 @@
         }
 
-    } while (status != PJ_EPENDING && status != PJ_ECANCELLED);
+        if (status != PJ_EPENDING && status != PJ_ECANCELLED) {
+            bytes_read = -status;
+        } else {
+            break;
+        }
+    } while (1);
 
 }