224180 2021-04-05 04:14:12 -0700 [GStreamer][MediaStream] AudioSource triggering critical warnings 2021-04-13 09:04:26 -0700 1 1 1 Unclassified WebKit Platform WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 pnormand pnormand calvaris eric.carlson ews-watchlist glenn jer.noble philipj sergio webkit-bug-importer oldest_to_newest 1746923 0 pnormand 2021-04-05 04:14:12 -0700 Audioconvert emits warnings because the buffers have no audio meta. 1746924 1 425145 pnormand 2021-04-05 04:20:11 -0700 Created attachment 425145 Patch 1746926 2 pnormand 2021-04-05 04:30:56 -0700 Example, when running imported/w3c/web-platform-tests/webrtc/simplecall.https.html Thread 1 (Thread 0x7f91bffff700 (LWP 17092)): #0 g_logv (log_domain=0x0, log_level=G_LOG_LEVEL_CRITICAL, format=<optimized out>, args=<optimized out>) at ../glib/gmessages.c:1413 #1 0x00007f93103f5973 in g_log (log_domain=log_domain@entry=0x0, log_level=log_level@entry=G_LOG_LEVEL_CRITICAL, format=format@entry=0x7f931044dad0 "%s: assertion '%s' failed") at ../glib/gmessages.c:1451 #2 0x00007f93103f619d in g_return_if_fail_warning (log_domain=log_domain@entry=0x0, pretty_function=pretty_function@entry=0x7f930f547af0 <__func__.0> "gst_audio_buffer_map", expression=expression@entry=0x7f930f5479e0 "(!meta && info->layout == GST_AUDIO_LAYOUT_INTERLEAVED) || (meta && info->layout == meta->info.layout)") at ../glib/gmessages.c:2883 #3 0x00007f930f4ffd09 in gst_audio_buffer_map (buffer=buffer@entry=0x7f91bfffd240, info=info@entry=0x7f91b006d068, gstbuffer=gstbuffer@entry=0x7f929c005120 [GstBuffer], flags=(GST_MAP_READ | GST_MAP_WRITE)) at ../gst-libs/gst/audio/audio-buffer.c:110 #4 0x00007f92c67e0d2d in gst_audio_convert_transform (base=<optimized out>, inbuf=0x7f929c005120 [GstBuffer], outbuf=0x7f9198012360 [GstBuffer]) at ../gst/audioconvert/gstaudioconvert.c:824 #5 0x00007f930f74ce71 in default_generate_output (trans=0x7f91b006ce00 [GstAudioConvert], outbuf=0x7f91bfffdce0) at ../libs/gst/base/gstbasetransform.c:2188 #6 0x00007f930f74c504 in gst_base_transform_chain (pad=<optimized out>, parent=0x7f91b006ce00 [GstAudioConvert], buffer=0x7f91bfffdce0 [None]) at ../libs/gst/base/gstbasetransform.c:2341 #7 0x00007f930f63989d in gst_pad_chain_data_unchecked (pad=pad@entry=0x7f91b005fdb0 [GstPad], type=type@entry=4112, data=data@entry=0x7f929c005120) at ../gst/gstpad.c:4399 #8 0x00007f930f63bb19 in gst_pad_push_data (pad=pad@entry=0x7f91b00685e0 [GstProxyPad], type=type@entry=4112, data=data@entry=0x7f929c005120) at ../gst/gstpad.c:4655 #9 0x00007f930f643142 in gst_pad_push (pad=pad@entry=0x7f91b00685e0 [GstProxyPad], buffer=buffer@entry=0x7f929c005120 [GstBuffer]) at ../gst/gstpad.c:4774 #10 0x00007f930f626503 in gst_proxy_pad_chain_default (pad=<optimized out>, parent=<optimized out>, buffer=0x7f929c005120 [GstBuffer]) at ../gst/gstghostpad.c:127 #11 0x00007f930f63989d in gst_pad_chain_data_unchecked (pad=pad@entry=0x7f91a8007650 [GstGhostPad], type=type@entry=4112, data=data@entry=0x7f929c005120) at ../gst/gstpad.c:4399 #12 0x00007f930f63bb19 in gst_pad_push_data (pad=pad@entry=0x7f91b0068a90 [GstStreamSyncPad], type=type@entry=4112, data=data@entry=0x7f929c005120) at ../gst/gstpad.c:4655 #13 0x00007f930f643142 in gst_pad_push (pad=pad@entry=0x7f91b0068a90 [GstStreamSyncPad], buffer=buffer@entry=0x7f929c005120 [GstBuffer]) at ../gst/gstpad.c:4774 #14 0x00007f92c65d54b1 in gst_stream_synchronizer_sink_chain (pad=0x7f91b0068830 [GstStreamSyncPad], parent=<optimized out>, buffer=0x7f929c005120 [GstBuffer]) at ../gst/playback/gststreamsynchronizer.c:814 #15 0x00007f930f63989d in gst_pad_chain_data_unchecked (pad=pad@entry=0x7f91b0068830 [GstStreamSyncPad], type=type@entry=4112, data=data@entry=0x7f929c005120) at ../gst/gstpad.c:4399 #16 0x00007f930f63bb19 in gst_pad_push_data (pad=pad@entry=0x7f91b0068cf0 [GstTeePad], type=type@entry=4112, data=data@entry=0x7f929c005120) at ../gst/gstpad.c:4655 #17 0x00007f930f643142 in gst_pad_push (pad=0x7f91b0068cf0 [GstTeePad], buffer=0x7f929c005120 [GstBuffer]) at ../gst/gstpad.c:4774 #18 0x00007f92c774c7f6 in gst_tee_handle_data (tee=tee@entry=0x159f3f0 [GstTee], data=data@entry=0x7f929c005120, is_list=is_list@entry=0) at ../plugins/elements/gsttee.c:897 #19 0x00007f92c774c9ed in gst_tee_chain (pad=<optimized out>, parent=0x159f3f0 [GstTee], buffer=0x7f929c005120 [GstBuffer]) at ../plugins/elements/gsttee.c:1024 #20 0x00007f930f63989d in gst_pad_chain_data_unchecked (pad=pad@entry=0x1d35ce0 [GstPad], type=type@entry=4112, data=data@entry=0x7f929c005120) at ../gst/gstpad.c:4399 #21 0x00007f930f63bb19 in gst_pad_push_data (pad=pad@entry=0x1d52550 [GstProxyPad], type=type@entry=4112, data=data@entry=0x7f929c005120) at ../gst/gstpad.c:4655 #22 0x00007f930f643142 in gst_pad_push (pad=pad@entry=0x1d52550 [GstProxyPad], buffer=buffer@entry=0x7f929c005120 [GstBuffer]) at ../gst/gstpad.c:4774 #23 0x00007f930f626503 in gst_proxy_pad_chain_default (pad=<optimized out>, parent=<optimized out>, buffer=0x7f929c005120 [GstBuffer]) at ../gst/gstghostpad.c:127 #24 0x00007f930f63989d in gst_pad_chain_data_unchecked (pad=pad@entry=0x1d58060 [GstGhostPad], type=type@entry=4112, data=data@entry=0x7f929c005120) at ../gst/gstpad.c:4399 #25 0x00007f930f63bb19 in gst_pad_push_data (pad=pad@entry=0x1d60120 [GstPad], type=type@entry=4112, data=data@entry=0x7f929c005120) at ../gst/gstpad.c:4655 #26 0x00007f930f643142 in gst_pad_push (pad=0x1d60120 [GstPad], buffer=buffer@entry=0x7f929c005120 [GstBuffer]) at ../gst/gstpad.c:4774 #27 0x00007f92c771343f in gst_concat_sink_chain (pad=0x17d8650 [GstConcatPad], parent=<optimized out>, buffer=0x7f929c005120 [GstBuffer]) at ../plugins/elements/gstconcat.c:456 #28 0x00007f930f63989d in gst_pad_chain_data_unchecked (pad=pad@entry=0x17d8650 [GstConcatPad], type=type@entry=4112, data=data@entry=0x7f929c005120) at ../gst/gstpad.c:4399 #29 0x00007f930f63bb19 in gst_pad_push_data (pad=pad@entry=0x7f91d40127b0 [GstGhostPad], type=type@entry=4112, data=data@entry=0x7f929c005120) at ../gst/gstpad.c:4655 #30 0x00007f930f643142 in gst_pad_push (pad=pad@entry=0x7f91d40127b0 [GstGhostPad], buffer=buffer@entry=0x7f929c005120 [GstBuffer]) at ../gst/gstpad.c:4774 #31 0x00007f930f626503 in gst_proxy_pad_chain_default (pad=<optimized out>, parent=<optimized out>, buffer=0x7f929c005120 [GstBuffer]) at ../gst/gstghostpad.c:127 #32 0x00007f930f63989d in gst_pad_chain_data_unchecked (pad=pad@entry=0x7f91d4007130 [GstProxyPad], type=type@entry=4112, data=data@entry=0x7f929c005120) at ../gst/gstpad.c:4399 #33 0x00007f930f63bb19 in gst_pad_push_data (pad=pad@entry=0x7f91d4012540 [GstGhostPad], type=type@entry=4112, data=data@entry=0x7f929c005120) at ../gst/gstpad.c:4655 #34 0x00007f930f643142 in gst_pad_push (pad=pad@entry=0x7f91d4012540 [GstGhostPad], buffer=buffer@entry=0x7f929c005120 [GstBuffer]) at ../gst/gstpad.c:4774 #35 0x00007f930f626503 in gst_proxy_pad_chain_default (pad=<optimized out>, parent=<optimized out>, buffer=0x7f929c005120 [GstBuffer]) at ../gst/gstghostpad.c:127 #36 0x00007f930f63989d in gst_pad_chain_data_unchecked (pad=pad@entry=0x7f91d4006ed0 [GstProxyPad], type=type@entry=4112, data=data@entry=0x7f929c005120) at ../gst/gstpad.c:4399 #37 0x00007f930f63bb19 in gst_pad_push_data (pad=pad@entry=0x7f91d0018440 [GstMultiQueuePad], type=type@entry=4112, data=data@entry=0x7f929c005120) at ../gst/gstpad.c:4655 #38 0x00007f930f643142 in gst_pad_push (pad=pad@entry=0x7f91d0018440 [GstMultiQueuePad], buffer=buffer@entry=0x7f929c005120 [GstBuffer]) at ../gst/gstpad.c:4774 #39 0x00007f92c7734c80 in gst_single_queue_push_one (allow_drop=<synthetic pointer>, object=0x7f929c005120 [GstBuffer], sq=0x7f91d000da90, mq=0x19946e0 [GstMultiQueue]) at ../plugins/elements/gstmultiqueue.c:1925 #40 gst_multi_queue_loop (pad=<optimized out>) at ../plugins/elements/gstmultiqueue.c:2252 #41 0x00007f930f673257 in gst_task_func (task=0x7f929c005a70 [GstTask]) at ../gst/gsttask.c:384 #42 0x00007f9310418ea4 in g_thread_pool_thread_proxy (data=<optimized out>) at ../glib/gthreadpool.c:354 #43 0x00007f93104185a1 in g_thread_proxy (data=0x18376a0) at ../glib/gthread.c:826 #44 0x00007f931037c4d2 in start_thread (arg=<optimized out>) at pthread_create.c:477 #45 0x00007f930fe6a323 in clone () at ../sysdeps/unix/sysv/linux/x86_64/clone.S:95 STDERR: gst_audio_buffer_map: assertion '(!meta && info->layout == GST_AUDIO_LAYOUT_INTERLEAVED) || (meta && info->layout == meta->info.layout)' failed 1746979 3 425161 pnormand 2021-04-05 09:41:43 -0700 Created attachment 425161 Patch 1747394 4 ews-feeder 2021-04-06 06:24:37 -0700 Committed r275510: <https://commits.webkit.org/r275510> All reviewed patches have been landed. Closing bug and clearing flags on attachment 425161. 1747396 5 webkit-bug-importer 2021-04-06 06:25:16 -0700 <rdar://problem/76264439> 1749698 6 pnormand 2021-04-13 09:04:26 -0700 *** Bug 222793 has been marked as a duplicate of this bug. *** 425145 2021-04-05 04:20:11 -0700 2021-04-05 09:41:38 -0700 Patch bug-224180-20210405042010.patch text/plain 3347 pnormand U3VidmVyc2lvbiBSZXZpc2lvbjogMjc1NDUwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYzA5ZmRjYzBkZWVkYmI0 NDFlOGI3MWEyZTliYjQ5OTliY2IwZjQ2Ni4uMGVlMmJlOTUxNzNhNDMxNzU3ZTZiZTA0OTRmN2Ni NWQwOTJhYWY4ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDIxLTA0LTA1ICBQaGls aXBwZSBOb3JtYW5kICA8cG5vcm1hbmRAaWdhbGlhLmNvbT4KKworICAgICAgICBbR1N0cmVhbWVy XVtNZWRpYVN0cmVhbV0gQXVkaW9Tb3VyY2UgdHJpZ2dlcmluZyBjcml0aWNhbCB3YXJuaW5ncwor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjI0MTgwCisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgS2VlcCB0cmFj ayBvZiBhdWRpbyBjaGFubmVsIG9mZnNldHMgYW5kIHN0b3JlIHRoZW0gYXMgbWV0YWRhdGEgaW4g YXVkaW8gYnVmZmVycy4gVGhpcyBpcworICAgICAgICB1c2VkIGJ5IGRvd25zdHJlYW0gZWxlbWVu dHMgc3VjaCBhcyB0aGUgYXVkaW8gY29udmVydCBlbGVtZW50cy4KKworICAgICAgICAqIE1vZHVs ZXMvd2ViYXVkaW8vTWVkaWFTdHJlYW1BdWRpb1NvdXJjZUdTdHJlYW1lci5jcHA6CisgICAgICAg IChXZWJDb3JlOjpjb3B5QnVzRGF0YSk6CisgICAgICAgIChXZWJDb3JlOjpNZWRpYVN0cmVhbUF1 ZGlvU291cmNlOjpjb25zdW1lQXVkaW8pOgorCiAyMDIxLTA0LTAyICBSeW9zdWtlIE5pd2EgIDxy bml3YUB3ZWJraXQub3JnPgogCiAgICAgICAgIFBlbmRpbmdJbWFnZUJpdG1hcCBnZXRzIGNyZWF0 ZWQgb24gYSBzdG9wcGVkIHNjcmlwdCBleGVjdXRpb24gY29udGV4dC4KZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL01vZHVsZXMvd2ViYXVkaW8vTWVkaWFTdHJlYW1BdWRpb1NvdXJjZUdTdHJl YW1lci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL3dlYmF1ZGlvL01lZGlhU3RyZWFtQXVk aW9Tb3VyY2VHU3RyZWFtZXIuY3BwCmluZGV4IGE2NDhlNjkzMGE3ZmQ4YTA2ODc1YzNjZTJkOGE3 MzlhOThjMmFjMTEuLjYzNzAyNmUyOTU5N2EwMzY3MjMyYzJiYmEyOGM1MWFmNTU1ZDhlM2UgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvd2ViYXVkaW8vTWVkaWFTdHJlYW1BdWRp b1NvdXJjZUdTdHJlYW1lci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy93ZWJhdWRp by9NZWRpYVN0cmVhbUF1ZGlvU291cmNlR1N0cmVhbWVyLmNwcApAQCAtMjksMjAgKzI5LDI0IEBA CiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAotc3RhdGljIHZvaWQgY29weUJ1c0RhdGEoQXVkaW9C dXMmIGJ1cywgR3N0QnVmZmVyKiBidWZmZXIsIGJvb2wgaXNNdXRlZCkKK3N0YXRpYyBWZWN0b3I8 c2l6ZV90PiBjb3B5QnVzRGF0YShBdWRpb0J1cyYgYnVzLCBHc3RCdWZmZXIqIGJ1ZmZlciwgYm9v bCBpc011dGVkKQogeworICAgIFZlY3RvcjxzaXplX3Q+IG9mZnNldHM7CiAgICAgR3N0TWFwcGVk QnVmZmVyIG1hcHBlZEJ1ZmZlcihidWZmZXIsIEdTVF9NQVBfV1JJVEUpOwogICAgIGlmIChpc011 dGVkKSB7CiAgICAgICAgIG1lbXNldChtYXBwZWRCdWZmZXIuZGF0YSgpLCAwLCBtYXBwZWRCdWZm ZXIuc2l6ZSgpKTsKLSAgICAgICAgcmV0dXJuOworICAgICAgICByZXR1cm4gb2Zmc2V0czsKICAg ICB9CiAKKyAgICBvZmZzZXRzLnJlc2VydmVJbml0aWFsQ2FwYWNpdHkoc2l6ZW9mKHNpemVfdCkg KiBidXMubnVtYmVyT2ZDaGFubmVscygpKTsKICAgICBzaXplX3Qgc2l6ZSA9IG1hcHBlZEJ1ZmZl ci5zaXplKCkgLyBidXMubnVtYmVyT2ZDaGFubmVscygpOwogICAgIGZvciAoc2l6ZV90IGNoYW5u ZWxJbmRleCA9IDA7IGNoYW5uZWxJbmRleCA8IGJ1cy5udW1iZXJPZkNoYW5uZWxzKCk7ICsrY2hh bm5lbEluZGV4KSB7Ci0gICAgICAgIEF1ZGlvQ2hhbm5lbCYgY2hhbm5lbCA9ICpidXMuY2hhbm5l bChjaGFubmVsSW5kZXgpOwotICAgICAgICBmbG9hdCogZGVzdGluYXRpb24gPSByZWludGVycHJl dF9jYXN0PGZsb2F0Kj4obWFwcGVkQnVmZmVyLmRhdGEoKSArIChjaGFubmVsSW5kZXggKiBzaXpl KSk7Ci0gICAgICAgIG1lbWNweShkZXN0aW5hdGlvbiwgY2hhbm5lbC5kYXRhKCksIHNpemUpOwor ICAgICAgICBjb25zdCBhdXRvJiBjaGFubmVsID0gKmJ1cy5jaGFubmVsKGNoYW5uZWxJbmRleCk7 CisgICAgICAgIGF1dG8gb2Zmc2V0ID0gcmVpbnRlcnByZXRfY2FzdDxzaXplX3Q+KGNoYW5uZWxJ bmRleCAqIHNpemUpOworICAgICAgICBtZW1jcHkocmVpbnRlcnByZXRfY2FzdDxmbG9hdCo+KG1h cHBlZEJ1ZmZlci5kYXRhKCkgKyBvZmZzZXQpLCBjaGFubmVsLmRhdGEoKSwgc2l6ZW9mKGZsb2F0 KSAqIGNoYW5uZWwubGVuZ3RoKCkpOworICAgICAgICBvZmZzZXRzLnVuY2hlY2tlZEFwcGVuZChv ZmZzZXQpOwogICAgIH0KKyAgICByZXR1cm4gb2Zmc2V0czsKIH0KIAogdm9pZCBNZWRpYVN0cmVh bUF1ZGlvU291cmNlOjpjb25zdW1lQXVkaW8oQXVkaW9CdXMmIGJ1cywgc2l6ZV90IG51bWJlck9m RnJhbWVzKQpAQCAtNjIsNyArNjYsMTIgQEAgdm9pZCBNZWRpYVN0cmVhbUF1ZGlvU291cmNlOjpj b25zdW1lQXVkaW8oQXVkaW9CdXMmIGJ1cywgc2l6ZV90IG51bWJlck9mRnJhbWVzKQogCiAgICAg YXV0byBjYXBzID0gYWRvcHRHUmVmKGdzdF9hdWRpb19pbmZvX3RvX2NhcHMoJmluZm8pKTsKICAg ICBhdXRvIGJ1ZmZlciA9IGFkb3B0R1JlZihnc3RfYnVmZmVyX25ld19hbGxvY2F0ZShudWxscHRy LCBzaXplLCBudWxscHRyKSk7Ci0gICAgY29weUJ1c0RhdGEoYnVzLCBidWZmZXIuZ2V0KCksIG11 dGVkKCkpOworICAgIGF1dG8gb2Zmc2V0cyA9IGNvcHlCdXNEYXRhKGJ1cywgYnVmZmVyLmdldCgp LCBtdXRlZCgpKTsKKyNpZiBHU1RfQ0hFQ0tfVkVSU0lPTigxLCAxNiwgMCkKKyAgICBnc3RfYnVm ZmVyX2FkZF9hdWRpb19tZXRhKGJ1ZmZlci5nZXQoKSwgJmluZm8sIG51bWJlck9mRnJhbWVzLCBv ZmZzZXRzLmRhdGEoKSk7CisjZWxzZQorICAgIFVOVVNFRF9WQVJJQUJMRShvZmZzZXRzKTsKKyNl bmRpZgogICAgIGF1dG8gc2FtcGxlID0gYWRvcHRHUmVmKGdzdF9zYW1wbGVfbmV3KGJ1ZmZlci5n ZXQoKSwgY2Fwcy5nZXQoKSwgbnVsbHB0ciwgbnVsbHB0cikpOwogICAgIEdTdHJlYW1lckF1ZGlv RGF0YSBhdWRpb0J1ZmZlcihXVEZNb3ZlKHNhbXBsZSksIGluZm8pOwogICAgIEdTdHJlYW1lckF1 ZGlvU3RyZWFtRGVzY3JpcHRpb24gZGVzY3JpcHRpb24oJmluZm8pOwo= 425161 2021-04-05 09:41:43 -0700 2021-04-06 06:24:37 -0700 Patch bug-224180-20210405094142.patch text/plain 3426 pnormand U3VidmVyc2lvbiBSZXZpc2lvbjogMjc1NDUwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYzA5ZmRjYzBkZWVkYmI0 NDFlOGI3MWEyZTliYjQ5OTliY2IwZjQ2Ni4uMGVlMmJlOTUxNzNhNDMxNzU3ZTZiZTA0OTRmN2Ni NWQwOTJhYWY4ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDIxLTA0LTA1ICBQaGls aXBwZSBOb3JtYW5kICA8cG5vcm1hbmRAaWdhbGlhLmNvbT4KKworICAgICAgICBbR1N0cmVhbWVy XVtNZWRpYVN0cmVhbV0gQXVkaW9Tb3VyY2UgdHJpZ2dlcmluZyBjcml0aWNhbCB3YXJuaW5ncwor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjI0MTgwCisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgS2VlcCB0cmFj ayBvZiBhdWRpbyBjaGFubmVsIG9mZnNldHMgYW5kIHN0b3JlIHRoZW0gYXMgbWV0YWRhdGEgaW4g YXVkaW8gYnVmZmVycy4gVGhpcyBpcworICAgICAgICB1c2VkIGJ5IGRvd25zdHJlYW0gZWxlbWVu dHMgc3VjaCBhcyB0aGUgYXVkaW8gY29udmVydCBlbGVtZW50cy4KKworICAgICAgICAqIE1vZHVs ZXMvd2ViYXVkaW8vTWVkaWFTdHJlYW1BdWRpb1NvdXJjZUdTdHJlYW1lci5jcHA6CisgICAgICAg IChXZWJDb3JlOjpjb3B5QnVzRGF0YSk6CisgICAgICAgIChXZWJDb3JlOjpNZWRpYVN0cmVhbUF1 ZGlvU291cmNlOjpjb25zdW1lQXVkaW8pOgorCiAyMDIxLTA0LTAyICBSeW9zdWtlIE5pd2EgIDxy bml3YUB3ZWJraXQub3JnPgogCiAgICAgICAgIFBlbmRpbmdJbWFnZUJpdG1hcCBnZXRzIGNyZWF0 ZWQgb24gYSBzdG9wcGVkIHNjcmlwdCBleGVjdXRpb24gY29udGV4dC4KZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL01vZHVsZXMvd2ViYXVkaW8vTWVkaWFTdHJlYW1BdWRpb1NvdXJjZUdTdHJl YW1lci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL3dlYmF1ZGlvL01lZGlhU3RyZWFtQXVk aW9Tb3VyY2VHU3RyZWFtZXIuY3BwCmluZGV4IGE2NDhlNjkzMGE3ZmQ4YTA2ODc1YzNjZTJkOGE3 MzlhOThjMmFjMTEuLjU2ZWQ2MDFmNDY1YTAxYzBhNzQzYTU5MjU3YTc1NTljMTY3MWUzODUgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvd2ViYXVkaW8vTWVkaWFTdHJlYW1BdWRp b1NvdXJjZUdTdHJlYW1lci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy93ZWJhdWRp by9NZWRpYVN0cmVhbUF1ZGlvU291cmNlR1N0cmVhbWVyLmNwcApAQCAtMjksMjAgKzI5LDI1IEBA CiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAotc3RhdGljIHZvaWQgY29weUJ1c0RhdGEoQXVkaW9C dXMmIGJ1cywgR3N0QnVmZmVyKiBidWZmZXIsIGJvb2wgaXNNdXRlZCkKK3N0YXRpYyBWZWN0b3I8 c2l6ZV90PiBjb3B5QnVzRGF0YShBdWRpb0J1cyYgYnVzLCBHc3RCdWZmZXIqIGJ1ZmZlciwgYm9v bCBpc011dGVkKQogeworICAgIFZlY3RvcjxzaXplX3Q+IG9mZnNldHM7CiAgICAgR3N0TWFwcGVk QnVmZmVyIG1hcHBlZEJ1ZmZlcihidWZmZXIsIEdTVF9NQVBfV1JJVEUpOwogICAgIGlmIChpc011 dGVkKSB7CiAgICAgICAgIG1lbXNldChtYXBwZWRCdWZmZXIuZGF0YSgpLCAwLCBtYXBwZWRCdWZm ZXIuc2l6ZSgpKTsKLSAgICAgICAgcmV0dXJuOworICAgICAgICByZXR1cm4gb2Zmc2V0czsKICAg ICB9CiAKKyAgICBEaXNhYmxlTWFsbG9jUmVzdHJpY3Rpb25zRm9yQ3VycmVudFRocmVhZFNjb3Bl IGRpc2FibGVNYWxsb2NSZXN0cmljdGlvbnM7CisgICAgb2Zmc2V0cy5yZXNlcnZlSW5pdGlhbENh cGFjaXR5KHNpemVvZihzaXplX3QpICogYnVzLm51bWJlck9mQ2hhbm5lbHMoKSk7CiAgICAgc2l6 ZV90IHNpemUgPSBtYXBwZWRCdWZmZXIuc2l6ZSgpIC8gYnVzLm51bWJlck9mQ2hhbm5lbHMoKTsK ICAgICBmb3IgKHNpemVfdCBjaGFubmVsSW5kZXggPSAwOyBjaGFubmVsSW5kZXggPCBidXMubnVt YmVyT2ZDaGFubmVscygpOyArK2NoYW5uZWxJbmRleCkgewotICAgICAgICBBdWRpb0NoYW5uZWwm IGNoYW5uZWwgPSAqYnVzLmNoYW5uZWwoY2hhbm5lbEluZGV4KTsKLSAgICAgICAgZmxvYXQqIGRl c3RpbmF0aW9uID0gcmVpbnRlcnByZXRfY2FzdDxmbG9hdCo+KG1hcHBlZEJ1ZmZlci5kYXRhKCkg KyAoY2hhbm5lbEluZGV4ICogc2l6ZSkpOwotICAgICAgICBtZW1jcHkoZGVzdGluYXRpb24sIGNo YW5uZWwuZGF0YSgpLCBzaXplKTsKKyAgICAgICAgY29uc3QgYXV0byYgY2hhbm5lbCA9ICpidXMu Y2hhbm5lbChjaGFubmVsSW5kZXgpOworICAgICAgICBhdXRvIG9mZnNldCA9IHJlaW50ZXJwcmV0 X2Nhc3Q8c2l6ZV90PihjaGFubmVsSW5kZXggKiBzaXplKTsKKyAgICAgICAgbWVtY3B5KHJlaW50 ZXJwcmV0X2Nhc3Q8ZmxvYXQqPihtYXBwZWRCdWZmZXIuZGF0YSgpICsgb2Zmc2V0KSwgY2hhbm5l bC5kYXRhKCksIHNpemVvZihmbG9hdCkgKiBjaGFubmVsLmxlbmd0aCgpKTsKKyAgICAgICAgb2Zm c2V0cy51bmNoZWNrZWRBcHBlbmQob2Zmc2V0KTsKICAgICB9CisgICAgcmV0dXJuIG9mZnNldHM7 CiB9CiAKIHZvaWQgTWVkaWFTdHJlYW1BdWRpb1NvdXJjZTo6Y29uc3VtZUF1ZGlvKEF1ZGlvQnVz JiBidXMsIHNpemVfdCBudW1iZXJPZkZyYW1lcykKQEAgLTYyLDcgKzY3LDEyIEBAIHZvaWQgTWVk aWFTdHJlYW1BdWRpb1NvdXJjZTo6Y29uc3VtZUF1ZGlvKEF1ZGlvQnVzJiBidXMsIHNpemVfdCBu dW1iZXJPZkZyYW1lcykKIAogICAgIGF1dG8gY2FwcyA9IGFkb3B0R1JlZihnc3RfYXVkaW9faW5m b190b19jYXBzKCZpbmZvKSk7CiAgICAgYXV0byBidWZmZXIgPSBhZG9wdEdSZWYoZ3N0X2J1ZmZl cl9uZXdfYWxsb2NhdGUobnVsbHB0ciwgc2l6ZSwgbnVsbHB0cikpOwotICAgIGNvcHlCdXNEYXRh KGJ1cywgYnVmZmVyLmdldCgpLCBtdXRlZCgpKTsKKyAgICBhdXRvIG9mZnNldHMgPSBjb3B5QnVz RGF0YShidXMsIGJ1ZmZlci5nZXQoKSwgbXV0ZWQoKSk7CisjaWYgR1NUX0NIRUNLX1ZFUlNJT04o MSwgMTYsIDApCisgICAgZ3N0X2J1ZmZlcl9hZGRfYXVkaW9fbWV0YShidWZmZXIuZ2V0KCksICZp bmZvLCBudW1iZXJPZkZyYW1lcywgb2Zmc2V0cy5kYXRhKCkpOworI2Vsc2UKKyAgICBVTlVTRURf VkFSSUFCTEUob2Zmc2V0cyk7CisjZW5kaWYKICAgICBhdXRvIHNhbXBsZSA9IGFkb3B0R1JlZihn c3Rfc2FtcGxlX25ldyhidWZmZXIuZ2V0KCksIGNhcHMuZ2V0KCksIG51bGxwdHIsIG51bGxwdHIp KTsKICAgICBHU3RyZWFtZXJBdWRpb0RhdGEgYXVkaW9CdWZmZXIoV1RGTW92ZShzYW1wbGUpLCBp bmZvKTsKICAgICBHU3RyZWFtZXJBdWRpb1N0cmVhbURlc2NyaXB0aW9uIGRlc2NyaXB0aW9uKCZp bmZvKTsK