Changeset 269799 in webkit

Timestamp:

Nov 13, 2020, 2:22:01 PM (6 years ago)

Author:

Russell Epstein

Message:

Apply patch. rdar://problem/71378194

File:

• branches/safari-610-branch/Source/ThirdParty/libwebrtc/Source/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_indata.c (modified) (5 diffs)

branches/safari-610-branch/Source/ThirdParty/libwebrtc/Source/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_indata.c

@@ -1663 +1663 @@
 {
         struct sctp_tmit_chunk *chk = NULL; /* make gcc happy */
+        struct sctp_stream_in *strm;
         uint32_t tsn, fsn, gap, mid;
         struct mbuf *dmbuf;
@@ -2295 +2296 @@
                         TAILQ_FOREACH_SAFE(control, &asoc->pending_reply_queue, next, ncontrol) {
                                 TAILQ_REMOVE(&asoc->pending_reply_queue, control, next);
+                                strm = &asoc->strmin[control->sinfo_stream];
                                 sctp_queue_data_to_stream(stcb, asoc, control, abort_flag, &need_reasm_check);
                                 if (*abort_flag) {
@@ -2300 +2302 @@
                                 }
                                 if (need_reasm_check) {
-                                        (void)sctp_deliver_reasm_check(stcb, asoc, &asoc->strmin[control->sinfo_stream], SCTP_READ_LOCK_NOT_HELD);
+                                        (void)sctp_deliver_reasm_check(stcb, asoc, strm, SCTP_READ_LOCK_NOT_HELD);
                                         need_reasm_check = 0;
                                 }
@@ -2315 +2317 @@
                                  */
                                 TAILQ_REMOVE(&asoc->pending_reply_queue, control, next);
+                                strm = &asoc->strmin[control->sinfo_stream];
                                 sctp_queue_data_to_stream(stcb, asoc, control, abort_flag, &need_reasm_check);
                                 if (*abort_flag) {
@@ -2320 +2323 @@
                                 }
                                 if (need_reasm_check) {
-                                        (void)sctp_deliver_reasm_check(stcb, asoc, &asoc->strmin[control->sinfo_stream], SCTP_READ_LOCK_NOT_HELD);
+                                        (void)sctp_deliver_reasm_check(stcb, asoc, strm, SCTP_READ_LOCK_NOT_HELD);
                                         need_reasm_check = 0;
                                 }