230679 2021-09-23 02:01:06 -0700 RTCDataChannelHandlerClient does not need to be ref counted 2021-09-24 10:32:22 -0700 1 1 1 Unclassified WebKit WebRTC WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 youennf youennf eric.carlson ews-watchlist glenn hta jer.noble philipj sergio tommyw webkit-bug-importer youennf oldest_to_newest 1796423 0 youennf 2021-09-23 02:01:06 -0700 Instead we can simply use WeakPtr since we hop to the client thread before using it anyway. 1796432 1 439029 youennf 2021-09-23 02:20:32 -0700 Created attachment 439029 Patch 1796939 2 ews-feeder 2021-09-24 10:31:35 -0700 Committed r283046 (242106@main): <https://commits.webkit.org/242106@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 439029. 1796940 3 webkit-bug-importer 2021-09-24 10:32:22 -0700 <rdar://problem/83501920> 439029 2021-09-23 02:20:32 -0700 2021-09-24 10:31:37 -0700 Patch bug-230679-20210923112030.patch text/plain 12265 youennf U3VidmVyc2lvbiBSZXZpc2lvbjogMjgyODY1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOGJmNWFiMWI0NDhjNGM1 MjJhNDFhZGRiNDM3MzY5ZDE3ZmJmY2ZjMS4uMTA1NDhkNGM5YjdjNWUwYzQ2OTk3Y2NiMzdlMjJj Yjk5ZDIzNzNmOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDIxLTA5LTIzICBZb3Vl bm4gRmFibGV0ICA8eW91ZW5uQGFwcGxlLmNvbT4KKworICAgICAgICBSVENEYXRhQ2hhbm5lbEhh bmRsZXJDbGllbnQgZG9lcyBub3QgbmVlZCB0byBiZSByZWYgY291bnRlZAorICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjMwNjc5CisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgV2UgY2FuIG1vdmUgZnJvbSB1c2lu ZyBhIHByb3RlY3RlZCByZWYgY291bnRlZCBjbGllbnQgdG8gdXNpbmcgYSBXZWFrUHRyIGNsaWVu dAorICAgICAgICBhcyB3ZSBhbHdheXMgaG9wIHRvIHRoZSBjbGllbnQncyB0aHJlYWQgYmVmb3Jl IGFjY2Vzc2luZyBpdC4KKyAgICAgICAgVGhpcyByZWR1Y2VzIHJlZiBjb3VudGluZyBhbmQgc2lt cGxpZmllcyBsaWZldGltZSBtYW5hZ2VtZW50LgorCisgICAgICAgICogTW9kdWxlcy9tZWRpYXN0 cmVhbS9SVENEYXRhQ2hhbm5lbC5oOgorICAgICAgICAqIE1vZHVsZXMvbWVkaWFzdHJlYW0vUlRD RGF0YUNoYW5uZWxSZW1vdGVTb3VyY2UuaDoKKyAgICAgICAgKiBNb2R1bGVzL21lZGlhc3RyZWFt L2xpYndlYnJ0Yy9MaWJXZWJSVENEYXRhQ2hhbm5lbEhhbmRsZXIuY3BwOgorICAgICAgICAoV2Vi Q29yZTo6TGliV2ViUlRDRGF0YUNoYW5uZWxIYW5kbGVyOjpzZXRDbGllbnQpOgorICAgICAgICAo V2ViQ29yZTo6TGliV2ViUlRDRGF0YUNoYW5uZWxIYW5kbGVyOjpjaGVja1N0YXRlKToKKyAgICAg ICAgKFdlYkNvcmU6OkxpYldlYlJUQ0RhdGFDaGFubmVsSGFuZGxlcjo6T25NZXNzYWdlKToKKyAg ICAgICAgKFdlYkNvcmU6OkxpYldlYlJUQ0RhdGFDaGFubmVsSGFuZGxlcjo6T25CdWZmZXJlZEFt b3VudENoYW5nZSk6CisgICAgICAgICogTW9kdWxlcy9tZWRpYXN0cmVhbS9saWJ3ZWJydGMvTGli V2ViUlRDRGF0YUNoYW5uZWxIYW5kbGVyLmg6CisgICAgICAgICogcGxhdGZvcm0vbWVkaWFzdHJl YW0vUlRDRGF0YUNoYW5uZWxIYW5kbGVyQ2xpZW50Lmg6CisKIDIwMjEtMDktMjEgIEplYW4tWXZl cyBBdmVuYXJkICA8anlhQGFwcGxlLmNvbT4KIAogICAgICAgICBVc2UgU2hhcmVkTWVtb3J5IGZv ciB0cmFuc2ZlcnJpbmcgYXBwZW5kZWQgYnVmZmVycyBmcm9tIFNvdXJjZUJ1ZmZlciB0byB0aGUg R1BVIHByb2Nlc3MKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nIGIvU291cmNl L1dlYktpdC9DaGFuZ2VMb2cKaW5kZXggZTQ2NjkzMmM0ZDAxZmJiMDU5YzU2MTFiOTNmY2I1OTE4 MGRhNDRmZC4uZjM1N2I1MzFjYTcwYTExZDBkNDk0YWZkZmI3Mjc1NTc2MGUyZjM2ZSAxMDA2NDQK LS0tIGEvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9DaGFuZ2VM b2cKQEAgLTEsMyArMSwxNiBAQAorMjAyMS0wOS0yMyAgWW91ZW5uIEZhYmxldCAgPHlvdWVubkBh cHBsZS5jb20+CisKKyAgICAgICAgUlRDRGF0YUNoYW5uZWxIYW5kbGVyQ2xpZW50IGRvZXMgbm90 IG5lZWQgdG8gYmUgcmVmIGNvdW50ZWQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTIzMDY3OQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgIE1vdmUgdG8gVW5pcXVlUmVmIG5vdyB0aGF0IGl0IGlzIG5vIGxvbmdl ciByZWYgY291bnRlZC4KKworICAgICAgICAqIFdlYlByb2Nlc3MvTmV0d29yay93ZWJydGMvUlRD RGF0YUNoYW5uZWxSZW1vdGVNYW5hZ2VyLmNwcDoKKyAgICAgICAgKFdlYktpdDo6UlRDRGF0YUNo YW5uZWxSZW1vdGVNYW5hZ2VyOjpjb25uZWN0VG9SZW1vdGVTb3VyY2UpOgorICAgICAgICAqIFdl YlByb2Nlc3MvTmV0d29yay93ZWJydGMvUlRDRGF0YUNoYW5uZWxSZW1vdGVNYW5hZ2VyLmg6CisK IDIwMjEtMDktMjEgIEplYW4tWXZlcyBBdmVuYXJkICA8anlhQGFwcGxlLmNvbT4KIAogICAgICAg ICBVc2UgU2hhcmVkTWVtb3J5IGZvciB0cmFuc2ZlcnJpbmcgYXBwZW5kZWQgYnVmZmVycyBmcm9t IFNvdXJjZUJ1ZmZlciB0byB0aGUgR1BVIHByb2Nlc3MKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL01vZHVsZXMvbWVkaWFzdHJlYW0vUlRDRGF0YUNoYW5uZWwuaCBiL1NvdXJjZS9XZWJDb3Jl L01vZHVsZXMvbWVkaWFzdHJlYW0vUlRDRGF0YUNoYW5uZWwuaAppbmRleCBhNTIxMmU4ZGE3Njkz NGIzYzYwNjgzOTQyNTliY2E3NWYzZjdkYjgxLi5jYTBjNTU2Yjg5MGY1MmM5ODhlZGFhZGY3YjJm OTk2MWJmYjJlOWNhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhc3Ry ZWFtL1JUQ0RhdGFDaGFubmVsLmgKKysrIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYXN0 cmVhbS9SVENEYXRhQ2hhbm5lbC5oCkBAIC01MCw3ICs1MCw3IEBAIG5hbWVzcGFjZSBXZWJDb3Jl IHsKIGNsYXNzIEJsb2I7CiBjbGFzcyBSVENQZWVyQ29ubmVjdGlvbkhhbmRsZXI7CiAKLWNsYXNz IFJUQ0RhdGFDaGFubmVsIGZpbmFsIDogcHVibGljIEFjdGl2ZURPTU9iamVjdCwgcHVibGljIFJU Q0RhdGFDaGFubmVsSGFuZGxlckNsaWVudCwgcHVibGljIEV2ZW50VGFyZ2V0V2l0aElubGluZURh dGEgeworY2xhc3MgUlRDRGF0YUNoYW5uZWwgZmluYWwgOiBwdWJsaWMgUmVmQ291bnRlZDxSVENE YXRhQ2hhbm5lbD4sIHB1YmxpYyBBY3RpdmVET01PYmplY3QsIHB1YmxpYyBSVENEYXRhQ2hhbm5l bEhhbmRsZXJDbGllbnQsIHB1YmxpYyBFdmVudFRhcmdldFdpdGhJbmxpbmVEYXRhIHsKICAgICBX VEZfTUFLRV9JU09fQUxMT0NBVEVEKFJUQ0RhdGFDaGFubmVsKTsKIHB1YmxpYzoKICAgICBzdGF0 aWMgUmVmPFJUQ0RhdGFDaGFubmVsPiBjcmVhdGUoU2NyaXB0RXhlY3V0aW9uQ29udGV4dCYsIHN0 ZDo6dW5pcXVlX3B0cjxSVENEYXRhQ2hhbm5lbEhhbmRsZXI+JiYsIFN0cmluZyYmLCBSVENEYXRh Q2hhbm5lbEluaXQmJik7CkBAIC04NSw4ICs4NSw4IEBAIHB1YmxpYzoKICAgICBib29sIGNhbkRl dGFjaCgpIGNvbnN0OwogICAgIHN0ZDo6dW5pcXVlX3B0cjxEZXRhY2hlZFJUQ0RhdGFDaGFubmVs PiBkZXRhY2goKTsKIAotICAgIHVzaW5nIFJUQ0RhdGFDaGFubmVsSGFuZGxlckNsaWVudDo6cmVm OwotICAgIHVzaW5nIFJUQ0RhdGFDaGFubmVsSGFuZGxlckNsaWVudDo6ZGVyZWY7CisgICAgdXNp bmcgUmVmQ291bnRlZDxSVENEYXRhQ2hhbm5lbD46OnJlZjsKKyAgICB1c2luZyBSZWZDb3VudGVk PFJUQ0RhdGFDaGFubmVsPjo6ZGVyZWY7CiAKICAgICBXRUJDT1JFX0VYUE9SVCBzdGF0aWMgc3Rk Ojp1bmlxdWVfcHRyPFJUQ0RhdGFDaGFubmVsSGFuZGxlcj4gaGFuZGxlckZyb21JZGVudGlmaWVy KFJUQ0RhdGFDaGFubmVsTG9jYWxJZGVudGlmaWVyKTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvTW9kdWxlcy9tZWRpYXN0cmVhbS9SVENEYXRhQ2hhbm5lbFJlbW90ZVNvdXJjZS5oIGIv U291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYXN0cmVhbS9SVENEYXRhQ2hhbm5lbFJlbW90ZVNv dXJjZS5oCmluZGV4IDE0NDZhNTg5NTRiYWU5NTFhNGEzZjM4ZTVmN2E1Zjk1YjUwZWNjMDYuLmMw NDc1NDMwZjE0YTgwMjdkMzE0ZWE5ZWMzYTgxYzU4ZWVjYjNhNTIgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFzdHJlYW0vUlRDRGF0YUNoYW5uZWxSZW1vdGVTb3VyY2Uu aAorKysgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhc3RyZWFtL1JUQ0RhdGFDaGFubmVs UmVtb3RlU291cmNlLmgKQEAgLTM2LDggKzM2LDkgQEAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAog Y2xhc3MgUlRDRGF0YUNoYW5uZWxSZW1vdGVTb3VyY2UgOiBwdWJsaWMgUlRDRGF0YUNoYW5uZWxI YW5kbGVyQ2xpZW50IHsKKyAgICBXVEZfTUFLRV9GQVNUX0FMTE9DQVRFRDsKIHB1YmxpYzoKLSAg ICBzdGF0aWMgUmVmPFJUQ0RhdGFDaGFubmVsUmVtb3RlU291cmNlPiBjcmVhdGUoUlRDRGF0YUNo YW5uZWxJZGVudGlmaWVyIGlkZW50aWZpZXIsIFVuaXF1ZVJlZjxSVENEYXRhQ2hhbm5lbEhhbmRs ZXI+JiYgaGFuZGxlciwgUmVmPFJUQ0RhdGFDaGFubmVsUmVtb3RlU291cmNlQ29ubmVjdGlvbj4m JiBjb25uZWN0aW9uKSB7IHJldHVybiBhZG9wdFJlZigqbmV3IFJUQ0RhdGFDaGFubmVsUmVtb3Rl U291cmNlKGlkZW50aWZpZXIsIFdURk1vdmUoaGFuZGxlciksIFdURk1vdmUoY29ubmVjdGlvbikp KTsgfQorICAgIFdFQkNPUkVfRVhQT1JUIFJUQ0RhdGFDaGFubmVsUmVtb3RlU291cmNlKFJUQ0Rh dGFDaGFubmVsSWRlbnRpZmllciwgVW5pcXVlUmVmPFJUQ0RhdGFDaGFubmVsSGFuZGxlcj4mJiwg UmVmPFJUQ0RhdGFDaGFubmVsUmVtb3RlU291cmNlQ29ubmVjdGlvbj4mJik7CiAgICAgflJUQ0Rh dGFDaGFubmVsUmVtb3RlU291cmNlKCk7CiAKICAgICB2b2lkIHNlbmRTdHJpbmdEYXRhKGNvbnN0 IENTdHJpbmcmIHRleHQpIHsgbV9oYW5kbGVyLT5zZW5kU3RyaW5nRGF0YSh0ZXh0KTsgfQpAQCAt NDUsNyArNDYsNiBAQCBwdWJsaWM6CiAgICAgdm9pZCBjbG9zZSgpIHsgbV9oYW5kbGVyLT5jbG9z ZSgpOyB9CiAKIHByaXZhdGU6Ci0gICAgV0VCQ09SRV9FWFBPUlQgUlRDRGF0YUNoYW5uZWxSZW1v dGVTb3VyY2UoUlRDRGF0YUNoYW5uZWxJZGVudGlmaWVyLCBVbmlxdWVSZWY8UlRDRGF0YUNoYW5u ZWxIYW5kbGVyPiYmLCBSZWY8UlRDRGF0YUNoYW5uZWxSZW1vdGVTb3VyY2VDb25uZWN0aW9uPiYm KTsKIAogICAgIC8vIFJUQ0RhdGFDaGFubmVsSGFuZGxlckNsaWVudAogICAgIHZvaWQgZGlkQ2hh bmdlUmVhZHlTdGF0ZShSVENEYXRhQ2hhbm5lbFN0YXRlIHN0YXRlKSBmaW5hbCB7IG1fY29ubmVj dGlvbi0+ZGlkQ2hhbmdlUmVhZHlTdGF0ZShtX2lkZW50aWZpZXIsIHN0YXRlKTsgfQpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYXN0cmVhbS9saWJ3ZWJydGMvTGliV2Vi UlRDRGF0YUNoYW5uZWxIYW5kbGVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFz dHJlYW0vbGlid2VicnRjL0xpYldlYlJUQ0RhdGFDaGFubmVsSGFuZGxlci5jcHAKaW5kZXggMTlh YjllMzI4NjViYzdlNTQ0ZTJmNjgwYjBkNGNlZmZkMjE2YTdhNy4uNTI3NDA2MzQzMTZmOWQ4YmQ4 M2M2YzQ2N2RjNmRiNWI3NTJhNTc1MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvTW9kdWxl cy9tZWRpYXN0cmVhbS9saWJ3ZWJydGMvTGliV2ViUlRDRGF0YUNoYW5uZWxIYW5kbGVyLmNwcAor KysgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhc3RyZWFtL2xpYndlYnJ0Yy9MaWJXZWJS VENEYXRhQ2hhbm5lbEhhbmRsZXIuY3BwCkBAIC05MSw3ICs5MSw5IEBAIHZvaWQgTGliV2ViUlRD RGF0YUNoYW5uZWxIYW5kbGVyOjpzZXRDbGllbnQoUlRDRGF0YUNoYW5uZWxIYW5kbGVyQ2xpZW50 JiBjbGllbnQsCiB7CiAgICAgTG9ja2VyIGxvY2tlciB7IG1fY2xpZW50TG9jayB9OwogICAgIEFT U0VSVCghbV9jbGllbnQpOwotICAgIG1fY2xpZW50ID0gJmNsaWVudDsKKyAgICBBU1NFUlQoIW1f aGFzQ2xpZW50KTsKKyAgICBtX2hhc0NsaWVudCA9IHRydWU7CisgICAgbV9jbGllbnQgPSBtYWtl V2Vha1B0cihjbGllbnQpOwogICAgIG1fY29udGV4dElkZW50aWZpZXIgPSBjb250ZXh0SWRlbnRp ZmllcjsKIAogICAgIGZvciAoYXV0byYgbWVzc2FnZSA6IG1fYnVmZmVyZWRNZXNzYWdlcykgewpA QCAtMTUxLDI1ICsxNTMsMjcgQEAgdm9pZCBMaWJXZWJSVENEYXRhQ2hhbm5lbEhhbmRsZXI6OmNo ZWNrU3RhdGUoKQogICAgIH0KIAogICAgIExvY2tlciBsb2NrZXIgeyBtX2NsaWVudExvY2sgfTsK LSAgICBpZiAoIW1fY2xpZW50KSB7CisgICAgaWYgKCFtX2hhc0NsaWVudCkgewogICAgICAgICBt X2J1ZmZlcmVkTWVzc2FnZXMuYXBwZW5kKFN0YXRlQ2hhbmdlIHsgc3RhdGUsIFdURk1vdmUoZXJy b3IpIH0pOwogICAgICAgICByZXR1cm47CiAgICAgfQotICAgIHBvc3RUYXNrKFtwcm90ZWN0ZWRD bGllbnQgPSBSZWYgeyAqbV9jbGllbnQgfSwgc3RhdGUsIGVycm9yID0gV1RGTW92ZShlcnJvcild IHsKKyAgICBwb3N0VGFzayhbY2xpZW50ID0gbV9jbGllbnQsIHN0YXRlLCBlcnJvciA9IFdURk1v dmUoZXJyb3IpXSB7CisgICAgICAgIGlmICghY2xpZW50KQorICAgICAgICAgICAgcmV0dXJuOwog ICAgICAgICBpZiAoZXJyb3IgJiYgIWVycm9yLT5vaygpKSB7CiAgICAgICAgICAgICBhdXRvIHJ0 Y0Vycm9yID0gdG9SVENFcnJvcigqZXJyb3IpOwogICAgICAgICAgICAgaWYgKCFydGNFcnJvcikK ICAgICAgICAgICAgICAgICBydGNFcnJvciA9IFJUQ0Vycm9yOjpjcmVhdGUoUlRDRXJyb3I6Oklu aXQgeyBSVENFcnJvckRldGFpbFR5cGU6OkRhdGFDaGFubmVsRmFpbHVyZSwgeyB9LCB7IH0sIHsg fSwgeyB9IH0sIFN0cmluZyB7IH0pOwotICAgICAgICAgICAgcHJvdGVjdGVkQ2xpZW50LT5kaWRE ZXRlY3RFcnJvcihydGNFcnJvci5yZWxlYXNlTm9uTnVsbCgpKTsKKyAgICAgICAgICAgIGNsaWVu dC0+ZGlkRGV0ZWN0RXJyb3IocnRjRXJyb3IucmVsZWFzZU5vbk51bGwoKSk7CiAgICAgICAgIH0K LSAgICAgICAgcHJvdGVjdGVkQ2xpZW50LT5kaWRDaGFuZ2VSZWFkeVN0YXRlKHN0YXRlKTsKKyAg ICAgICAgY2xpZW50LT5kaWRDaGFuZ2VSZWFkeVN0YXRlKHN0YXRlKTsKICAgICB9KTsKIH0KIAog dm9pZCBMaWJXZWJSVENEYXRhQ2hhbm5lbEhhbmRsZXI6Ok9uTWVzc2FnZShjb25zdCB3ZWJydGM6 OkRhdGFCdWZmZXImIGJ1ZmZlcikKIHsKICAgICBMb2NrZXIgbG9ja2VyIHsgbV9jbGllbnRMb2Nr IH07Ci0gICAgaWYgKCFtX2NsaWVudCkgeworICAgIGlmICghbV9oYXNDbGllbnQpIHsKICAgICAg ICAgYXV0byogZGF0YSA9IGJ1ZmZlci5kYXRhLmRhdGE8dWludDhfdD4oKTsKICAgICAgICAgaWYg KGJ1ZmZlci5iaW5hcnkpCiAgICAgICAgICAgICBtX2J1ZmZlcmVkTWVzc2FnZXMuYXBwZW5kKFNo YXJlZEJ1ZmZlcjo6Y3JlYXRlKGRhdGEsIGJ1ZmZlci5zaXplKCkpKTsKQEAgLTE3OSwyMyArMTgz LDI3IEBAIHZvaWQgTGliV2ViUlRDRGF0YUNoYW5uZWxIYW5kbGVyOjpPbk1lc3NhZ2UoY29uc3Qg d2VicnRjOjpEYXRhQnVmZmVyJiBidWZmZXIpCiAgICAgfQogCiAgICAgc3RkOjp1bmlxdWVfcHRy PHdlYnJ0Yzo6RGF0YUJ1ZmZlcj4gcHJvdGVjdGVkQnVmZmVyKG5ldyB3ZWJydGM6OkRhdGFCdWZm ZXIoYnVmZmVyKSk7Ci0gICAgcG9zdFRhc2soW3Byb3RlY3RlZENsaWVudCA9IFJlZiB7ICptX2Ns aWVudCB9LCBidWZmZXIgPSBXVEZNb3ZlKHByb3RlY3RlZEJ1ZmZlcildIHsKKyAgICBwb3N0VGFz ayhbY2xpZW50ID0gbV9jbGllbnQsIGJ1ZmZlciA9IFdURk1vdmUocHJvdGVjdGVkQnVmZmVyKV0g eworICAgICAgICBpZiAoIWNsaWVudCkKKyAgICAgICAgICAgIHJldHVybjsKKwogICAgICAgICBh dXRvKiBkYXRhID0gYnVmZmVyLT5kYXRhLmRhdGE8dWludDhfdD4oKTsKICAgICAgICAgaWYgKGJ1 ZmZlci0+YmluYXJ5KQotICAgICAgICAgICAgcHJvdGVjdGVkQ2xpZW50LT5kaWRSZWNlaXZlUmF3 RGF0YShkYXRhLCBidWZmZXItPnNpemUoKSk7CisgICAgICAgICAgICBjbGllbnQtPmRpZFJlY2Vp dmVSYXdEYXRhKGRhdGEsIGJ1ZmZlci0+c2l6ZSgpKTsKICAgICAgICAgZWxzZQotICAgICAgICAg ICAgcHJvdGVjdGVkQ2xpZW50LT5kaWRSZWNlaXZlU3RyaW5nRGF0YShTdHJpbmc6OmZyb21VVEY4 KGRhdGEsIGJ1ZmZlci0+c2l6ZSgpKSk7CisgICAgICAgICAgICBjbGllbnQtPmRpZFJlY2VpdmVT dHJpbmdEYXRhKFN0cmluZzo6ZnJvbVVURjgoZGF0YSwgYnVmZmVyLT5zaXplKCkpKTsKICAgICB9 KTsKIH0KIAogdm9pZCBMaWJXZWJSVENEYXRhQ2hhbm5lbEhhbmRsZXI6Ok9uQnVmZmVyZWRBbW91 bnRDaGFuZ2UodWludDY0X3QgYW1vdW50KQogewogICAgIExvY2tlciBsb2NrZXIgeyBtX2NsaWVu dExvY2sgfTsKLSAgICBpZiAoIW1fY2xpZW50KQorICAgIGlmICghbV9oYXNDbGllbnQpCiAgICAg ICAgIHJldHVybjsKIAotICAgIHBvc3RUYXNrKFtwcm90ZWN0ZWRDbGllbnQgPSBSZWYgeyAqbV9j bGllbnQgfSwgYW1vdW50XSB7Ci0gICAgICAgIHByb3RlY3RlZENsaWVudC0+YnVmZmVyZWRBbW91 bnRJc0RlY3JlYXNpbmcoc3RhdGljX2Nhc3Q8c2l6ZV90PihhbW91bnQpKTsKKyAgICBwb3N0VGFz ayhbY2xpZW50ID0gbV9jbGllbnQsIGFtb3VudF0geworICAgICAgICBpZiAoY2xpZW50KQorICAg ICAgICAgICAgY2xpZW50LT5idWZmZXJlZEFtb3VudElzRGVjcmVhc2luZyhzdGF0aWNfY2FzdDxz aXplX3Q+KGFtb3VudCkpOwogICAgIH0pOwogfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9Nb2R1bGVzL21lZGlhc3RyZWFtL2xpYndlYnJ0Yy9MaWJXZWJSVENEYXRhQ2hhbm5lbEhhbmRs ZXIuaCBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFzdHJlYW0vbGlid2VicnRjL0xpYldl YlJUQ0RhdGFDaGFubmVsSGFuZGxlci5oCmluZGV4IDcwMWVmYzA4YjFjOTNlNTNiMDNmOTgwY2Iw NGIwNTBhYzUzZjEyY2IuLmE2YzhjZDAwMzg1MzlhYzExNDc0MDY3MzJjODc5OGQwZDA4ZjUyZjMg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFzdHJlYW0vbGlid2VicnRj L0xpYldlYlJUQ0RhdGFDaGFubmVsSGFuZGxlci5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL01vZHVs ZXMvbWVkaWFzdHJlYW0vbGlid2VicnRjL0xpYldlYlJUQ0RhdGFDaGFubmVsSGFuZGxlci5oCkBA IC04OSw3ICs4OSw4IEBAIHByaXZhdGU6CiAKICAgICBydGM6OnNjb3BlZF9yZWZwdHI8d2VicnRj OjpEYXRhQ2hhbm5lbEludGVyZmFjZT4gbV9jaGFubmVsOwogICAgIExvY2sgbV9jbGllbnRMb2Nr OwotICAgIFJUQ0RhdGFDaGFubmVsSGFuZGxlckNsaWVudCogbV9jbGllbnQgV1RGX0dVQVJERURf QllfTE9DSyhtX2NsaWVudExvY2spIHsgbnVsbHB0ciB9OworICAgIGJvb2wgbV9oYXNDbGllbnQg V1RGX0dVQVJERURfQllfTE9DSyhtX2NsaWVudExvY2spICB7IGZhbHNlIH07CisgICAgV2Vha1B0 cjxSVENEYXRhQ2hhbm5lbEhhbmRsZXJDbGllbnQ+IG1fY2xpZW50IFdURl9HVUFSREVEX0JZX0xP Q0sobV9jbGllbnRMb2NrKSB7IG51bGxwdHIgfTsKICAgICBTY3JpcHRFeGVjdXRpb25Db250ZXh0 SWRlbnRpZmllciBtX2NvbnRleHRJZGVudGlmaWVyOwogICAgIFBlbmRpbmdNZXNzYWdlcyBtX2J1 ZmZlcmVkTWVzc2FnZXMgV1RGX0dVQVJERURfQllfTE9DSyhtX2NsaWVudExvY2spOwogfTsKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21lZGlhc3RyZWFtL1JUQ0RhdGFDaGFu bmVsSGFuZGxlckNsaWVudC5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWVkaWFzdHJlYW0v UlRDRGF0YUNoYW5uZWxIYW5kbGVyQ2xpZW50LmgKaW5kZXggNWNmNjhiMjRhOWI3MGI5OTA0NGZm YmNjNzMxN2NkMWQ0MTRjOWE1NS4uM2FiZTQxY2ZmNGYzNmRhOWZjNDQyZGExZWVjZjZjMjc1ZWU1 NmFlMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWVkaWFzdHJlYW0vUlRD RGF0YUNoYW5uZWxIYW5kbGVyQ2xpZW50LmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v bWVkaWFzdHJlYW0vUlRDRGF0YUNoYW5uZWxIYW5kbGVyQ2xpZW50LmgKQEAgLTI5LDEzICsyOSwx NCBAQAogCiAjaW5jbHVkZSAiUlRDRGF0YUNoYW5uZWxTdGF0ZS5oIgogI2luY2x1ZGUgPHd0Zi9U aHJlYWRTYWZlUmVmQ291bnRlZC5oPgorI2luY2x1ZGUgPHd0Zi9XZWFrUHRyLmg+CiAjaW5jbHVk ZSA8d3RmL3RleHQvV1RGU3RyaW5nLmg+CiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAogY2xhc3Mg UlRDRXJyb3I7CiAKLWNsYXNzIFJUQ0RhdGFDaGFubmVsSGFuZGxlckNsaWVudCA6IHB1YmxpYyBU aHJlYWRTYWZlUmVmQ291bnRlZDxSVENEYXRhQ2hhbm5lbEhhbmRsZXJDbGllbnQ+IHsKK2NsYXNz IFJUQ0RhdGFDaGFubmVsSGFuZGxlckNsaWVudCA6IHB1YmxpYyBDYW5NYWtlV2Vha1B0cjxSVENE YXRhQ2hhbm5lbEhhbmRsZXJDbGllbnQsIFdlYWtQdHJGYWN0b3J5SW5pdGlhbGl6YXRpb246OkVh Z2VyPiB7CiBwdWJsaWM6CiAgICAgdmlydHVhbCB+UlRDRGF0YUNoYW5uZWxIYW5kbGVyQ2xpZW50 KCkgPSBkZWZhdWx0OwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvTmV0 d29yay93ZWJydGMvUlRDRGF0YUNoYW5uZWxSZW1vdGVNYW5hZ2VyLmNwcCBiL1NvdXJjZS9XZWJL aXQvV2ViUHJvY2Vzcy9OZXR3b3JrL3dlYnJ0Yy9SVENEYXRhQ2hhbm5lbFJlbW90ZU1hbmFnZXIu Y3BwCmluZGV4IDJhNTRiNjEwODZjYmNhNTNjNDk1MGViMzg0NDBhNmU3NWZmY2ExN2YuLjUwY2Qw Njc3M2NjMmM3ZmJhZjhkNWYyNjdkMWUxMjVjNTNmZmI5NjUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJLaXQvV2ViUHJvY2Vzcy9OZXR3b3JrL3dlYnJ0Yy9SVENEYXRhQ2hhbm5lbFJlbW90ZU1hbmFn ZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9OZXR3b3JrL3dlYnJ0Yy9SVENE YXRhQ2hhbm5lbFJlbW90ZU1hbmFnZXIuY3BwCkBAIC03Myw3ICs3Myw3IEBAIGJvb2wgUlRDRGF0 YUNoYW5uZWxSZW1vdGVNYW5hZ2VyOjpjb25uZWN0VG9SZW1vdGVTb3VyY2UoV2ViQ29yZTo6UlRD RGF0YUNoYW5uZWxJCiAgICAgaWYgKCFoYW5kbGVyKQogICAgICAgICByZXR1cm4gZmFsc2U7CiAK LSAgICBhdXRvIGl0ZXJhdG9yID0gbV9zb3VyY2VzLmFkZChyZW1vdGVJZGVudGlmaWVyLmNoYW5u ZWxJZGVudGlmaWVyLCBXZWJDb3JlOjpSVENEYXRhQ2hhbm5lbFJlbW90ZVNvdXJjZTo6Y3JlYXRl KHJlbW90ZUlkZW50aWZpZXIsIG1ha2VVbmlxdWVSZWZGcm9tTm9uTnVsbFVuaXF1ZVB0cihXVEZN b3ZlKGhhbmRsZXIpKSwgcmVtb3RlU291cmNlQ29ubmVjdGlvbigpKSk7CisgICAgYXV0byBpdGVy YXRvciA9IG1fc291cmNlcy5hZGQocmVtb3RlSWRlbnRpZmllci5jaGFubmVsSWRlbnRpZmllciwg bWFrZVVuaXF1ZVJlZjxXZWJDb3JlOjpSVENEYXRhQ2hhbm5lbFJlbW90ZVNvdXJjZT4ocmVtb3Rl SWRlbnRpZmllciwgbWFrZVVuaXF1ZVJlZkZyb21Ob25OdWxsVW5pcXVlUHRyKFdURk1vdmUoaGFu ZGxlcikpLCByZW1vdGVTb3VyY2VDb25uZWN0aW9uKCkpKTsKICAgICByZXR1cm4gaXRlcmF0b3Iu aXNOZXdFbnRyeTsKIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL05l dHdvcmsvd2VicnRjL1JUQ0RhdGFDaGFubmVsUmVtb3RlTWFuYWdlci5oIGIvU291cmNlL1dlYktp dC9XZWJQcm9jZXNzL05ldHdvcmsvd2VicnRjL1JUQ0RhdGFDaGFubmVsUmVtb3RlTWFuYWdlci5o CmluZGV4IGIwOGMwYjYxZjYxOWMyZTc3NzAxNDNkZThkNzVkNjg0NDQ3NjAyOWEuLmU1OTYxN2Nl MDY1MjM0ZmQwYmMwMjNlZWNjMGM1NzliZTQ1ZTRjYjEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJL aXQvV2ViUHJvY2Vzcy9OZXR3b3JrL3dlYnJ0Yy9SVENEYXRhQ2hhbm5lbFJlbW90ZU1hbmFnZXIu aAorKysgYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvTmV0d29yay93ZWJydGMvUlRDRGF0YUNo YW5uZWxSZW1vdGVNYW5hZ2VyLmgKQEAgLTEwNCw3ICsxMDQsNyBAQCBwcml2YXRlOgogICAgIFJl ZlB0cjxJUEM6OkNvbm5lY3Rpb24+IG1fY29ubmVjdGlvbjsKICAgICBSZWZQdHI8UmVtb3RlSGFu ZGxlckNvbm5lY3Rpb24+IG1fcmVtb3RlSGFuZGxlckNvbm5lY3Rpb247CiAgICAgUmVmUHRyPFJl bW90ZVNvdXJjZUNvbm5lY3Rpb24+IG1fcmVtb3RlU291cmNlQ29ubmVjdGlvbjsKLSAgICBIYXNo TWFwPFdlYkNvcmU6OlJUQ0RhdGFDaGFubmVsTG9jYWxJZGVudGlmaWVyLCBSZWY8V2ViQ29yZTo6 UlRDRGF0YUNoYW5uZWxSZW1vdGVTb3VyY2U+PiBtX3NvdXJjZXM7CisgICAgSGFzaE1hcDxXZWJD b3JlOjpSVENEYXRhQ2hhbm5lbExvY2FsSWRlbnRpZmllciwgVW5pcXVlUmVmPFdlYkNvcmU6OlJU Q0RhdGFDaGFubmVsUmVtb3RlU291cmNlPj4gbV9zb3VyY2VzOwogICAgIEhhc2hNYXA8V2ViQ29y ZTo6UlRDRGF0YUNoYW5uZWxMb2NhbElkZW50aWZpZXIsIFJlbW90ZUhhbmRsZXI+IG1faGFuZGxl cnM7CiB9OwogCg==