Changeset 4387 for pjproject/branches/1.x/pjlib/src/pj/sock_bsd.c

Timestamp:

Feb 27, 2013 10:16:08 AM (10 years ago)

Author:

ming

Message:

Re #1559: Backported to 1.x, except r4312,r4330

Location:

pjproject/branches/1.x

Files:

• . (modified) (1 prop)
• pjlib/src/pj/sock_bsd.c (modified) (2 diffs)

pjproject/branches/1.x/pjlib/src/pj/sock_bsd.c

@@ -719 +719 @@
     PJ_CHECK_STACK();
     PJ_ASSERT_RETURN(buf && len, PJ_EINVAL);
-    PJ_ASSERT_RETURN(from && fromlen, (*len=-1, PJ_EINVAL));
 
     *len = recvfrom(sock, (char*)buf, *len, flags, 
@@ -727 +726 @@
         return PJ_RETURN_OS_ERROR(pj_get_native_netos_error());
     else {
-        PJ_SOCKADDR_RESET_LEN(from);
+        if (from) {
+            PJ_SOCKADDR_RESET_LEN(from);
+        }
         return PJ_SUCCESS;
     }