228636 2021-07-30 06:34:38 -0700 softlink nw_parameters_allow_sharing_port_with_listener 2021-07-30 11:09:19 -0700 1 1 1 Unclassified WebKit WebRTC WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 youennf youennf darin eric.carlson ews-watchlist webkit-bug-importer youennf oldest_to_newest 1780748 0 youennf 2021-07-30 06:34:38 -0700 softlink nw_parameters_allow_sharing_port_with_listener 1780749 1 434619 youennf 2021-07-30 06:37:16 -0700 Created attachment 434619 Patch 1780814 2 434619 darin 2021-07-30 09:02:12 -0700 Comment on attachment 434619 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=434619&action=review > Source/WebKit/NetworkProcess/webrtc/NetworkRTCUDPSocketCocoa.mm:292 > + String portString; > + const char* portValue; > +#if HAVE(NWPARAMETERS_TRACKER_API) > + if (nw_parameters_allow_sharing_port_with_listenerPtr()) { > + nw_parameters_allow_sharing_port_with_listenerPtr()(parameters.get(), m_nwListener.get()); > + portString = String::number(m_address.port()); > + portValue = portString.utf8().data(); This code is wrong, and already was, and I am surprised it works. To keep around a pointer to the UTF-8 data we need a CString for the local variable, not a String. portString = String::number(m_address.port()).utf8(); portValue = portString.data(); There are also ways to write this that don’t allocate memory on the heap, using writeIntegerToBuffer, but the above should at least fix the dangerous lifetime bug. 1780818 3 youennf 2021-07-30 09:31:56 -0700 Right, I'll fix this or move to nw_endpoint_create_host_with_numeric_port if possible 1780820 4 434636 youennf 2021-07-30 09:37:01 -0700 Created attachment 434636 Patch for landing 1780821 5 434637 youennf 2021-07-30 09:39:57 -0700 Created attachment 434637 Patch for landing 1780879 6 434646 youennf 2021-07-30 10:40:48 -0700 Created attachment 434646 Rebasing 1780890 7 ews-feeder 2021-07-30 11:08:28 -0700 Committed r280484 (240119@main): <https://commits.webkit.org/240119@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 434646. 1780891 8 webkit-bug-importer 2021-07-30 11:09:19 -0700 <rdar://problem/81334175> 434619 2021-07-30 06:37:16 -0700 2021-07-30 09:36:57 -0700 Patch bug-228636-20210730153713.patch text/plain 3396 youennf U3VidmVyc2lvbiBSZXZpc2lvbjogMjgwNDE4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGM3YmNkNGI2MzlhNWVjYzM2 NmVhZmE2YTE4ZGU4ODA2ODI4Mjc3ZWEuLjMxODM3NjJjZmY1Zjc1MDA1YmE5NTAwMWM1ZWNjZjM0 ZGEwZmM2NzcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAKKzIwMjEtMDctMzAgIFlvdWVubiBG YWJsZXQgIDx5b3Vlbm5AYXBwbGUuY29tPgorCisgICAgICAgIHNvZnRsaW5rIG53X3BhcmFtZXRl cnNfYWxsb3dfc2hhcmluZ19wb3J0X3dpdGhfbGlzdGVuZXIKKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyODYzNgorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogTmV0d29ya1Byb2Nlc3Mvd2VicnRjL05ldHdv cmtSVENVRFBTb2NrZXRDb2NvYS5tbToKKyAgICAgICAgKFdlYktpdDo6TmV0d29ya1JUQ1VEUFNv Y2tldENvY29hQ29ubmVjdGlvbnM6OmNyZWF0ZU5XQ29ubmVjdGlvbik6CisgICAgICAgIFRoaXMg aGVscHMgY29tcGlsaW5nL3J1bm5pbmcgV2ViS2l0IG9uIG9sZGVyIE9TZXMuCisKIDIwMjEtMDct MzAgIFlvdWVubiBGYWJsZXQgIDx5b3Vlbm5AYXBwbGUuY29tPgogCiAgICAgICAgIFJlbW90ZUF1 ZGlvTWVkaWFTdHJlYW1UcmFja1JlbmRlcmVySW50ZXJuYWxVbml0IHNob3VsZCBoYW5kbGUgY2hh bmdlcyBvZiByZXF1ZXN0ZWQgc2FtcGxlQ291bnQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQv TmV0d29ya1Byb2Nlc3Mvd2VicnRjL05ldHdvcmtSVENVRFBTb2NrZXRDb2NvYS5tbSBiL1NvdXJj ZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3Mvd2VicnRjL05ldHdvcmtSVENVRFBTb2NrZXRDb2NvYS5t bQppbmRleCA3ZjdkYzljNzhmOGYzZmQ0NWJiZTA5NThiMGE2YWQyYjQ2MTlkNjU4Li4wZDYxYjUw YWFmMDBhZDU1ODkzNTgzZTY4MjRiZDNjZTY1ZTQ4MWM4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi S2l0L05ldHdvcmtQcm9jZXNzL3dlYnJ0Yy9OZXR3b3JrUlRDVURQU29ja2V0Q29jb2EubW0KKysr IGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy93ZWJydGMvTmV0d29ya1JUQ1VEUFNvY2tl dENvY29hLm1tCkBAIC00NSw2ICs0NSw5IEBAIFNPRlRfTElOS19DTEFTUyhsaWJuZXR3b3JrZXh0 ZW5zaW9uLCBORUhlbHBlclRyYWNrZXJEaXNwb3NpdGlvbl90KQogU09GVF9MSU5LX0NMQVNTKGxp Ym5ldHdvcmtleHRlbnNpb24sIE5FSGVscGVyVHJhY2tlckFwcEluZm9SZWYpCiBTT0ZUX0xJTktf Q0xBU1MobGlibmV0d29ya2V4dGVuc2lvbiwgTkVIZWxwZXJUcmFja2VyRG9tYWluQ29udGV4dFJl ZikKIFNPRlRfTElOSyhsaWJuZXR3b3JrZXh0ZW5zaW9uLCBORUhlbHBlclRyYWNrZXJHZXREaXNw b3NpdGlvbiwgTkVIZWxwZXJUcmFja2VyRGlzcG9zaXRpb25fdCosIChORUhlbHBlclRyYWNrZXJB cHBJbmZvUmVmICphcHBfaW5mb19yZWYsIENGQXJyYXlSZWYgZG9tYWlucywgTkVIZWxwZXJUcmFj a2VyRG9tYWluQ29udGV4dFJlZiAqdHJhY2tlckRvbWFpbkNvbnRleHRSZWYsIENGSW5kZXggKnRy YWNrZXJEb21haW5JbmRleCksIChhcHBfaW5mb19yZWYsIGRvbWFpbnMsIHRyYWNrZXJEb21haW5D b250ZXh0UmVmLCB0cmFja2VyRG9tYWluSW5kZXgpKQorCitTT0ZUX0xJTktfTElCUkFSWV9PUFRJ T05BTChsaWJuZXR3b3JrKQorU09GVF9MSU5LX09QVElPTkFMKGxpYm5ldHdvcmssIG53X3BhcmFt ZXRlcnNfYWxsb3dfc2hhcmluZ19wb3J0X3dpdGhfbGlzdGVuZXIsIHZvaWQsIF9fY2RlY2wsIChu d19wYXJhbWV0ZXJzX3QsIG53X2xpc3RlbmVyX3QpKQogI2VuZGlmCiAKIG5hbWVzcGFjZSBXZWJL aXQgewpAQCAtMjc5LDEzICsyODIsMjAgQEAgUmV0YWluUHRyPG53X2Nvbm5lY3Rpb25fdD4gTmV0 d29ya1JUQ1VEUFNvY2tldENvY29hQ29ubmVjdGlvbnM6OmNyZWF0ZU5XQ29ubmVjdGkKICAgICAg ICAgYXV0byBob3N0QWRkcmVzcyA9IG1fYWRkcmVzcy5pcGFkZHIoKS5Ub1N0cmluZygpOwogICAg ICAgICBpZiAobV9hZGRyZXNzLmlwYWRkcigpLklzTmlsKCkpCiAgICAgICAgICAgICBob3N0QWRk cmVzcyA9IG1fYWRkcmVzcy5ob3N0bmFtZSgpOwotI2lmIGRlZmluZWQoTldfSEFTX1NIQVJFX0xJ U1RFTkVSX1BPUlQpICYmIE5XX0hBU19TSEFSRV9MSVNURU5FUl9QT1JUCi0gICAgICAgIG53X3Bh cmFtZXRlcnNfYWxsb3dfc2hhcmluZ19wb3J0X3dpdGhfbGlzdGVuZXIocGFyYW1ldGVycy5nZXQo KSwgbV9ud0xpc3RlbmVyLmdldCgpKTsKLSAgICAgICAgYXV0byBwb3J0U3RyaW5nID0gU3RyaW5n OjpudW1iZXIobV9hZGRyZXNzLnBvcnQoKSk7Ci0gICAgICAgIGF1dG8gcG9ydFZhbHVlID0gcG9y dFN0cmluZy51dGY4KCkuZGF0YSgpOwotI2Vsc2UKLSAgICAgICAgLy8gcmRhcjovLzgwMTc2Njc2 OiB3ZSB3b3JrYXJvdW5kIGxvY2FsIGxvb3AgcG9ydCByZXVzZSBieSB1c2luZyAwIGluc3RlYWQg b2YgbV9hZGRyZXNzLnBvcnQoKS4KLSAgICAgICAgYXV0byBwb3J0VmFsdWUgPSAiMCI7CisKKyAg ICAgICAgU3RyaW5nIHBvcnRTdHJpbmc7CisgICAgICAgIGNvbnN0IGNoYXIqIHBvcnRWYWx1ZTsK KyNpZiBIQVZFKE5XUEFSQU1FVEVSU19UUkFDS0VSX0FQSSkKKyAgICAgICAgaWYgKG53X3BhcmFt ZXRlcnNfYWxsb3dfc2hhcmluZ19wb3J0X3dpdGhfbGlzdGVuZXJQdHIoKSkgeworICAgICAgICAg ICAgbndfcGFyYW1ldGVyc19hbGxvd19zaGFyaW5nX3BvcnRfd2l0aF9saXN0ZW5lclB0cigpKHBh cmFtZXRlcnMuZ2V0KCksIG1fbndMaXN0ZW5lci5nZXQoKSk7CisgICAgICAgICAgICBwb3J0U3Ry aW5nID0gU3RyaW5nOjpudW1iZXIobV9hZGRyZXNzLnBvcnQoKSk7CisgICAgICAgICAgICBwb3J0 VmFsdWUgPSBwb3J0U3RyaW5nLnV0ZjgoKS5kYXRhKCk7CisgICAgICAgIH0gZWxzZSB7CisjZW5k aWYKKyAgICAgICAgICAgIC8vIHJkYXI6Ly84MDE3NjY3Njogd2Ugd29ya2Fyb3VuZCBsb2NhbCBs b29wIHBvcnQgcmV1c2UgYnkgdXNpbmcgMCBpbnN0ZWFkIG9mIG1fYWRkcmVzcy5wb3J0KCkuCisg ICAgICAgICAgICBwb3J0VmFsdWUgPSAiMCI7CisjaWYgSEFWRShOV1BBUkFNRVRFUlNfVFJBQ0tF Ul9BUEkpCisgICAgICAgIH0KICNlbmRpZgogICAgICAgICBhdXRvIGxvY2FsRW5kcG9pbnQgPSBh ZG9wdE5TKG53X2VuZHBvaW50X2NyZWF0ZV9ob3N0KGhvc3RBZGRyZXNzLmNfc3RyKCksIHBvcnRW YWx1ZSkpOwogICAgICAgICBud19wYXJhbWV0ZXJzX3NldF9sb2NhbF9lbmRwb2ludChwYXJhbWV0 ZXJzLmdldCgpLCBsb2NhbEVuZHBvaW50LmdldCgpKTsK 434636 2021-07-30 09:37:01 -0700 2021-07-30 09:39:51 -0700 Patch for landing bug-228636-20210730183659.patch text/plain 4828 youennf U3VidmVyc2lvbiBSZXZpc2lvbjogMjgwNDE4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGM3YmNkNGI2MzlhNWVjYzM2 NmVhZmE2YTE4ZGU4ODA2ODI4Mjc3ZWEuLjA3MGEyZjIzNmYxMzEzZWU3ZjE2NmM5MDg0NGRkM2Ex MTAxMmQ4ZDYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAKKzIwMjEtMDctMzAgIFlvdWVubiBG YWJsZXQgIDx5b3Vlbm5AYXBwbGUuY29tPgorCisgICAgICAgIHNvZnRsaW5rIG53X3BhcmFtZXRl cnNfYWxsb3dfc2hhcmluZ19wb3J0X3dpdGhfbGlzdGVuZXIKKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyODYzNgorCisgICAgICAgIFJldmlld2VkIGJ5 IEVyaWMgQ2FybHNvbi4KKworICAgICAgICAqIE5ldHdvcmtQcm9jZXNzL3dlYnJ0Yy9OZXR3b3Jr UlRDVURQU29ja2V0Q29jb2EubW06CisgICAgICAgIChXZWJLaXQ6Ok5ldHdvcmtSVENVRFBTb2Nr ZXRDb2NvYUNvbm5lY3Rpb25zOjpjcmVhdGVOV0Nvbm5lY3Rpb24pOgorICAgICAgICBUaGlzIGhl bHBzIGNvbXBpbGluZy9ydW5uaW5nIFdlYktpdCBvbiBvbGRlciBPU2VzLgorCiAyMDIxLTA3LTMw ICBZb3Vlbm4gRmFibGV0ICA8eW91ZW5uQGFwcGxlLmNvbT4KIAogICAgICAgICBSZW1vdGVBdWRp b01lZGlhU3RyZWFtVHJhY2tSZW5kZXJlckludGVybmFsVW5pdCBzaG91bGQgaGFuZGxlIGNoYW5n ZXMgb2YgcmVxdWVzdGVkIHNhbXBsZUNvdW50CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L05l dHdvcmtQcm9jZXNzL3dlYnJ0Yy9OZXR3b3JrUlRDVURQU29ja2V0Q29jb2EubW0gYi9Tb3VyY2Uv V2ViS2l0L05ldHdvcmtQcm9jZXNzL3dlYnJ0Yy9OZXR3b3JrUlRDVURQU29ja2V0Q29jb2EubW0K aW5kZXggN2Y3ZGM5Yzc4ZjhmM2ZkNDViYmUwOTU4YjBhNmFkMmI0NjE5ZDY1OC4uM2Q4NjUzN2Uw MWJkMjk3ODZmNDdmNGI4NDAxMWRkN2M2ZTY2MDZiNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktp dC9OZXR3b3JrUHJvY2Vzcy93ZWJydGMvTmV0d29ya1JUQ1VEUFNvY2tldENvY29hLm1tCisrKyBi L1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3Mvd2VicnRjL05ldHdvcmtSVENVRFBTb2NrZXRD b2NvYS5tbQpAQCAtNDUsNiArNDUsOSBAQCBTT0ZUX0xJTktfQ0xBU1MobGlibmV0d29ya2V4dGVu c2lvbiwgTkVIZWxwZXJUcmFja2VyRGlzcG9zaXRpb25fdCkKIFNPRlRfTElOS19DTEFTUyhsaWJu ZXR3b3JrZXh0ZW5zaW9uLCBORUhlbHBlclRyYWNrZXJBcHBJbmZvUmVmKQogU09GVF9MSU5LX0NM QVNTKGxpYm5ldHdvcmtleHRlbnNpb24sIE5FSGVscGVyVHJhY2tlckRvbWFpbkNvbnRleHRSZWYp CiBTT0ZUX0xJTksobGlibmV0d29ya2V4dGVuc2lvbiwgTkVIZWxwZXJUcmFja2VyR2V0RGlzcG9z aXRpb24sIE5FSGVscGVyVHJhY2tlckRpc3Bvc2l0aW9uX3QqLCAoTkVIZWxwZXJUcmFja2VyQXBw SW5mb1JlZiAqYXBwX2luZm9fcmVmLCBDRkFycmF5UmVmIGRvbWFpbnMsIE5FSGVscGVyVHJhY2tl ckRvbWFpbkNvbnRleHRSZWYgKnRyYWNrZXJEb21haW5Db250ZXh0UmVmLCBDRkluZGV4ICp0cmFj a2VyRG9tYWluSW5kZXgpLCAoYXBwX2luZm9fcmVmLCBkb21haW5zLCB0cmFja2VyRG9tYWluQ29u dGV4dFJlZiwgdHJhY2tlckRvbWFpbkluZGV4KSkKKworU09GVF9MSU5LX0xJQlJBUllfT1BUSU9O QUwobGlibmV0d29yaykKK1NPRlRfTElOS19PUFRJT05BTChsaWJuZXR3b3JrLCBud19wYXJhbWV0 ZXJzX2FsbG93X3NoYXJpbmdfcG9ydF93aXRoX2xpc3RlbmVyLCB2b2lkLCBfX2NkZWNsLCAobndf cGFyYW1ldGVyc190LCBud19saXN0ZW5lcl90KSkKICNlbmRpZgogCiBuYW1lc3BhY2UgV2ViS2l0 IHsKQEAgLTE2NSw3ICsxNjgsNyBAQCBOZXR3b3JrUlRDVURQU29ja2V0Q29jb2FDb25uZWN0aW9u czo6TmV0d29ya1JUQ1VEUFNvY2tldENvY29hQ29ubmVjdGlvbnMoV2ViQ29yZQogICAgICAgICBh dXRvIGhvc3RBZGRyZXNzID0gYWRkcmVzcy5pcGFkZHIoKS5Ub1N0cmluZygpOwogICAgICAgICBp ZiAoYWRkcmVzcy5pcGFkZHIoKS5Jc05pbCgpKQogICAgICAgICAgICAgaG9zdEFkZHJlc3MgPSBh ZGRyZXNzLmhvc3RuYW1lKCk7Ci0gICAgICAgIGF1dG8gbG9jYWxFbmRwb2ludCA9IGFkb3B0TlMo bndfZW5kcG9pbnRfY3JlYXRlX2hvc3QoaG9zdEFkZHJlc3MuY19zdHIoKSwgIjAiKSk7CisgICAg ICAgIGF1dG8gbG9jYWxFbmRwb2ludCA9IGFkb3B0TlMobndfZW5kcG9pbnRfY3JlYXRlX2hvc3Rf d2l0aF9udW1lcmljX3BvcnQoaG9zdEFkZHJlc3MuY19zdHIoKSwgMCkpOwogICAgICAgICBtX2Fk ZHJlc3MgPSB7IG53X2VuZHBvaW50X2dldF9ob3N0bmFtZShsb2NhbEVuZHBvaW50LmdldCgpKSwg bndfZW5kcG9pbnRfZ2V0X3BvcnQobG9jYWxFbmRwb2ludC5nZXQoKSkgfTsKICAgICAgICAgbndf cGFyYW1ldGVyc19zZXRfbG9jYWxfZW5kcG9pbnQocGFyYW1ldGVycy5nZXQoKSwgbG9jYWxFbmRw b2ludC5nZXQoKSk7CiAgICAgfQpAQCAtMjc5LDE1ICsyODIsMTYgQEAgUmV0YWluUHRyPG53X2Nv bm5lY3Rpb25fdD4gTmV0d29ya1JUQ1VEUFNvY2tldENvY29hQ29ubmVjdGlvbnM6OmNyZWF0ZU5X Q29ubmVjdGkKICAgICAgICAgYXV0byBob3N0QWRkcmVzcyA9IG1fYWRkcmVzcy5pcGFkZHIoKS5U b1N0cmluZygpOwogICAgICAgICBpZiAobV9hZGRyZXNzLmlwYWRkcigpLklzTmlsKCkpCiAgICAg ICAgICAgICBob3N0QWRkcmVzcyA9IG1fYWRkcmVzcy5ob3N0bmFtZSgpOwotI2lmIGRlZmluZWQo TldfSEFTX1NIQVJFX0xJU1RFTkVSX1BPUlQpICYmIE5XX0hBU19TSEFSRV9MSVNURU5FUl9QT1JU Ci0gICAgICAgIG53X3BhcmFtZXRlcnNfYWxsb3dfc2hhcmluZ19wb3J0X3dpdGhfbGlzdGVuZXIo cGFyYW1ldGVycy5nZXQoKSwgbV9ud0xpc3RlbmVyLmdldCgpKTsKLSAgICAgICAgYXV0byBwb3J0 U3RyaW5nID0gU3RyaW5nOjpudW1iZXIobV9hZGRyZXNzLnBvcnQoKSk7Ci0gICAgICAgIGF1dG8g cG9ydFZhbHVlID0gcG9ydFN0cmluZy51dGY4KCkuZGF0YSgpOwotI2Vsc2UKLSAgICAgICAgLy8g cmRhcjovLzgwMTc2Njc2OiB3ZSB3b3JrYXJvdW5kIGxvY2FsIGxvb3AgcG9ydCByZXVzZSBieSB1 c2luZyAwIGluc3RlYWQgb2YgbV9hZGRyZXNzLnBvcnQoKS4KLSAgICAgICAgYXV0byBwb3J0VmFs dWUgPSAiMCI7CisKKyAgICAgICAgLy8gcmRhcjovLzgwMTc2Njc2OiB3ZSB3b3JrYXJvdW5kIGxv Y2FsIGxvb3AgcG9ydCByZXVzZSBieSB1c2luZyAwIGluc3RlYWQgb2YgbV9hZGRyZXNzLnBvcnQo KSB3aGVuIG53X3BhcmFtZXRlcnNfYWxsb3dfc2hhcmluZ19wb3J0X3dpdGhfbGlzdGVuZXIgaXMg bm90IGF2YWlsYWJsZS4KKyAgICAgICAgdWludDE2X3QgcG9ydCA9IDA7CisjaWYgSEFWRShOV1BB UkFNRVRFUlNfVFJBQ0tFUl9BUEkpCisgICAgICAgIGlmIChud19wYXJhbWV0ZXJzX2FsbG93X3No YXJpbmdfcG9ydF93aXRoX2xpc3RlbmVyUHRyKCkpIHsKKyAgICAgICAgICAgIG53X3BhcmFtZXRl cnNfYWxsb3dfc2hhcmluZ19wb3J0X3dpdGhfbGlzdGVuZXJQdHIoKShwYXJhbWV0ZXJzLmdldCgp LCBtX253TGlzdGVuZXIuZ2V0KCkpOworICAgICAgICAgICAgcG9ydCA9IG1fYWRkcmVzcy5wb3J0 KCk7CisgICAgICAgIH0KICNlbmRpZgotICAgICAgICBhdXRvIGxvY2FsRW5kcG9pbnQgPSBhZG9w dE5TKG53X2VuZHBvaW50X2NyZWF0ZV9ob3N0KGhvc3RBZGRyZXNzLmNfc3RyKCksIHBvcnRWYWx1 ZSkpOworICAgICAgICBhdXRvIGxvY2FsRW5kcG9pbnQgPSBhZG9wdE5TKG53X2VuZHBvaW50X2Ny ZWF0ZV9ob3N0X3dpdGhfbnVtZXJpY19wb3J0KGhvc3RBZGRyZXNzLmNfc3RyKCksIHBvcnQpKTsK ICAgICAgICAgbndfcGFyYW1ldGVyc19zZXRfbG9jYWxfZW5kcG9pbnQocGFyYW1ldGVycy5nZXQo KSwgbG9jYWxFbmRwb2ludC5nZXQoKSk7CiAgICAgfQogICAgIGNvbmZpZ3VyZVBhcmFtZXRlcnMo cGFyYW1ldGVycy5nZXQoKSwgcmVtb3RlQWRkcmVzcy5mYW1pbHkoKSA9PSBBRl9JTkVUID8gbndf aXBfdmVyc2lvbl80IDogbndfaXBfdmVyc2lvbl82KTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJL aXQvUGxhdGZvcm0vc3BpL0NvY29hL05XUGFyYW1ldGVyc1NQSS5oIGIvU291cmNlL1dlYktpdC9Q bGF0Zm9ybS9zcGkvQ29jb2EvTldQYXJhbWV0ZXJzU1BJLmgKaW5kZXggMWMyMWUzMmI0MGVkNWQ5 YzU5OWNlZmQ2MGVlODE1YTlhODFkOTdhZC4uNzdjM2I1MzI0MWFjYzc2NGZhODI3N2E3YjNkMTQ4 ZTFiYjU3ZGYwOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9QbGF0Zm9ybS9zcGkvQ29jb2Ev TldQYXJhbWV0ZXJzU1BJLmgKKysrIGIvU291cmNlL1dlYktpdC9QbGF0Zm9ybS9zcGkvQ29jb2Ev TldQYXJhbWV0ZXJzU1BJLmgKQEAgLTM0LDYgKzM0LDcgQEAKIFdURl9FWFRFUk5fQ19CRUdJTgog CiB2b2lkIG53X3BhcmFtZXRlcnNfc2V0X2FjY291bnRfaWQobndfcGFyYW1ldGVyc190LCBjb25z dCBjaGFyICogYWNjb3VudF9pZCk7Citud19lbmRwb2ludF90IG53X2VuZHBvaW50X2NyZWF0ZV9o b3N0X3dpdGhfbnVtZXJpY19wb3J0KGNvbnN0IGNoYXIgKmhvc3RuYW1lLCB1aW50MTZfdCBwb3J0 X2hvc3Rfb3JkZXIpOwogCiAjaWYgSEFWRShOV1BBUkFNRVRFUlNfVFJBQ0tFUl9BUEkpCiB2b2lk IG53X3BhcmFtZXRlcnNfc2V0X2lzX3RoaXJkX3BhcnR5X3dlYl9jb250ZW50KG53X3BhcmFtZXRl cnNfdCwgYm9vbCBpc190aGlyZF9wYXJ0eV93ZWJfY29udGVudCk7Cg== 434637 2021-07-30 09:39:57 -0700 2021-07-30 10:40:41 -0700 Patch for landing bug-228636-20210730183955.patch text/plain 5073 youennf U3VidmVyc2lvbiBSZXZpc2lvbjogMjgwNDE4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGM3YmNkNGI2MzlhNWVjYzM2 NmVhZmE2YTE4ZGU4ODA2ODI4Mjc3ZWEuLmNiYjEwYzQ0Zjc4NDY4OTQ3MjVlZjc3ODFiZWE4ZmUw MjVkYTlkM2QgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTYgQEAKKzIwMjEtMDctMzAgIFlvdWVubiBG YWJsZXQgIDx5b3Vlbm5AYXBwbGUuY29tPgorCisgICAgICAgIHNvZnRsaW5rIG53X3BhcmFtZXRl cnNfYWxsb3dfc2hhcmluZ19wb3J0X3dpdGhfbGlzdGVuZXIKKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyODYzNgorCisgICAgICAgIFJldmlld2VkIGJ5 IEVyaWMgQ2FybHNvbi4KKworICAgICAgICAqIE5ldHdvcmtQcm9jZXNzL3dlYnJ0Yy9OZXR3b3Jr UlRDVURQU29ja2V0Q29jb2EubW06CisgICAgICAgIChXZWJLaXQ6Ok5ldHdvcmtSVENVRFBTb2Nr ZXRDb2NvYUNvbm5lY3Rpb25zOjpjcmVhdGVOV0Nvbm5lY3Rpb24pOgorICAgICAgICBUaGlzIGhl bHBzIGNvbXBpbGluZy9ydW5uaW5nIFdlYktpdCBvbiBvbGRlciBPU2VzLgorICAgICAgICBBbHNv IG1ha2UgdXNlIG9mIG53X2VuZHBvaW50X2NyZWF0ZV9ob3N0X3dpdGhfbnVtZXJpY19wb3J0IHRv IHJlbW92ZSB0aGUgbmVlZCBmb3Igc3RyaW5nIHRvIGludCBjb252ZXJzaW9uLgorICAgICAgICAq IFBsYXRmb3JtL3NwaS9Db2NvYS9OV1BhcmFtZXRlcnNTUEkuaDoKKwogMjAyMS0wNy0zMCAgWW91 ZW5uIEZhYmxldCAgPHlvdWVubkBhcHBsZS5jb20+CiAKICAgICAgICAgUmVtb3RlQXVkaW9NZWRp YVN0cmVhbVRyYWNrUmVuZGVyZXJJbnRlcm5hbFVuaXQgc2hvdWxkIGhhbmRsZSBjaGFuZ2VzIG9m IHJlcXVlc3RlZCBzYW1wbGVDb3VudApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9OZXR3b3Jr UHJvY2Vzcy93ZWJydGMvTmV0d29ya1JUQ1VEUFNvY2tldENvY29hLm1tIGIvU291cmNlL1dlYktp dC9OZXR3b3JrUHJvY2Vzcy93ZWJydGMvTmV0d29ya1JUQ1VEUFNvY2tldENvY29hLm1tCmluZGV4 IDdmN2RjOWM3OGY4ZjNmZDQ1YmJlMDk1OGIwYTZhZDJiNDYxOWQ2NTguLjNkODY1MzdlMDFiZDI5 Nzg2ZjQ3ZjRiODQwMTFkZDdjNmU2NjA2YjQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvTmV0 d29ya1Byb2Nlc3Mvd2VicnRjL05ldHdvcmtSVENVRFBTb2NrZXRDb2NvYS5tbQorKysgYi9Tb3Vy Y2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL3dlYnJ0Yy9OZXR3b3JrUlRDVURQU29ja2V0Q29jb2Eu bW0KQEAgLTQ1LDYgKzQ1LDkgQEAgU09GVF9MSU5LX0NMQVNTKGxpYm5ldHdvcmtleHRlbnNpb24s IE5FSGVscGVyVHJhY2tlckRpc3Bvc2l0aW9uX3QpCiBTT0ZUX0xJTktfQ0xBU1MobGlibmV0d29y a2V4dGVuc2lvbiwgTkVIZWxwZXJUcmFja2VyQXBwSW5mb1JlZikKIFNPRlRfTElOS19DTEFTUyhs aWJuZXR3b3JrZXh0ZW5zaW9uLCBORUhlbHBlclRyYWNrZXJEb21haW5Db250ZXh0UmVmKQogU09G VF9MSU5LKGxpYm5ldHdvcmtleHRlbnNpb24sIE5FSGVscGVyVHJhY2tlckdldERpc3Bvc2l0aW9u LCBORUhlbHBlclRyYWNrZXJEaXNwb3NpdGlvbl90KiwgKE5FSGVscGVyVHJhY2tlckFwcEluZm9S ZWYgKmFwcF9pbmZvX3JlZiwgQ0ZBcnJheVJlZiBkb21haW5zLCBORUhlbHBlclRyYWNrZXJEb21h aW5Db250ZXh0UmVmICp0cmFja2VyRG9tYWluQ29udGV4dFJlZiwgQ0ZJbmRleCAqdHJhY2tlckRv bWFpbkluZGV4KSwgKGFwcF9pbmZvX3JlZiwgZG9tYWlucywgdHJhY2tlckRvbWFpbkNvbnRleHRS ZWYsIHRyYWNrZXJEb21haW5JbmRleCkpCisKK1NPRlRfTElOS19MSUJSQVJZX09QVElPTkFMKGxp Ym5ldHdvcmspCitTT0ZUX0xJTktfT1BUSU9OQUwobGlibmV0d29yaywgbndfcGFyYW1ldGVyc19h bGxvd19zaGFyaW5nX3BvcnRfd2l0aF9saXN0ZW5lciwgdm9pZCwgX19jZGVjbCwgKG53X3BhcmFt ZXRlcnNfdCwgbndfbGlzdGVuZXJfdCkpCiAjZW5kaWYKIAogbmFtZXNwYWNlIFdlYktpdCB7CkBA IC0xNjUsNyArMTY4LDcgQEAgTmV0d29ya1JUQ1VEUFNvY2tldENvY29hQ29ubmVjdGlvbnM6Ok5l dHdvcmtSVENVRFBTb2NrZXRDb2NvYUNvbm5lY3Rpb25zKFdlYkNvcmUKICAgICAgICAgYXV0byBo b3N0QWRkcmVzcyA9IGFkZHJlc3MuaXBhZGRyKCkuVG9TdHJpbmcoKTsKICAgICAgICAgaWYgKGFk ZHJlc3MuaXBhZGRyKCkuSXNOaWwoKSkKICAgICAgICAgICAgIGhvc3RBZGRyZXNzID0gYWRkcmVz cy5ob3N0bmFtZSgpOwotICAgICAgICBhdXRvIGxvY2FsRW5kcG9pbnQgPSBhZG9wdE5TKG53X2Vu ZHBvaW50X2NyZWF0ZV9ob3N0KGhvc3RBZGRyZXNzLmNfc3RyKCksICIwIikpOworICAgICAgICBh dXRvIGxvY2FsRW5kcG9pbnQgPSBhZG9wdE5TKG53X2VuZHBvaW50X2NyZWF0ZV9ob3N0X3dpdGhf bnVtZXJpY19wb3J0KGhvc3RBZGRyZXNzLmNfc3RyKCksIDApKTsKICAgICAgICAgbV9hZGRyZXNz ID0geyBud19lbmRwb2ludF9nZXRfaG9zdG5hbWUobG9jYWxFbmRwb2ludC5nZXQoKSksIG53X2Vu ZHBvaW50X2dldF9wb3J0KGxvY2FsRW5kcG9pbnQuZ2V0KCkpIH07CiAgICAgICAgIG53X3BhcmFt ZXRlcnNfc2V0X2xvY2FsX2VuZHBvaW50KHBhcmFtZXRlcnMuZ2V0KCksIGxvY2FsRW5kcG9pbnQu Z2V0KCkpOwogICAgIH0KQEAgLTI3OSwxNSArMjgyLDE2IEBAIFJldGFpblB0cjxud19jb25uZWN0 aW9uX3Q+IE5ldHdvcmtSVENVRFBTb2NrZXRDb2NvYUNvbm5lY3Rpb25zOjpjcmVhdGVOV0Nvbm5l Y3RpCiAgICAgICAgIGF1dG8gaG9zdEFkZHJlc3MgPSBtX2FkZHJlc3MuaXBhZGRyKCkuVG9TdHJp bmcoKTsKICAgICAgICAgaWYgKG1fYWRkcmVzcy5pcGFkZHIoKS5Jc05pbCgpKQogICAgICAgICAg ICAgaG9zdEFkZHJlc3MgPSBtX2FkZHJlc3MuaG9zdG5hbWUoKTsKLSNpZiBkZWZpbmVkKE5XX0hB U19TSEFSRV9MSVNURU5FUl9QT1JUKSAmJiBOV19IQVNfU0hBUkVfTElTVEVORVJfUE9SVAotICAg ICAgICBud19wYXJhbWV0ZXJzX2FsbG93X3NoYXJpbmdfcG9ydF93aXRoX2xpc3RlbmVyKHBhcmFt ZXRlcnMuZ2V0KCksIG1fbndMaXN0ZW5lci5nZXQoKSk7Ci0gICAgICAgIGF1dG8gcG9ydFN0cmlu ZyA9IFN0cmluZzo6bnVtYmVyKG1fYWRkcmVzcy5wb3J0KCkpOwotICAgICAgICBhdXRvIHBvcnRW YWx1ZSA9IHBvcnRTdHJpbmcudXRmOCgpLmRhdGEoKTsKLSNlbHNlCi0gICAgICAgIC8vIHJkYXI6 Ly84MDE3NjY3Njogd2Ugd29ya2Fyb3VuZCBsb2NhbCBsb29wIHBvcnQgcmV1c2UgYnkgdXNpbmcg MCBpbnN0ZWFkIG9mIG1fYWRkcmVzcy5wb3J0KCkuCi0gICAgICAgIGF1dG8gcG9ydFZhbHVlID0g IjAiOworCisgICAgICAgIC8vIHJkYXI6Ly84MDE3NjY3Njogd2Ugd29ya2Fyb3VuZCBsb2NhbCBs b29wIHBvcnQgcmV1c2UgYnkgdXNpbmcgMCBpbnN0ZWFkIG9mIG1fYWRkcmVzcy5wb3J0KCkgd2hl biBud19wYXJhbWV0ZXJzX2FsbG93X3NoYXJpbmdfcG9ydF93aXRoX2xpc3RlbmVyIGlzIG5vdCBh dmFpbGFibGUuCisgICAgICAgIHVpbnQxNl90IHBvcnQgPSAwOworI2lmIEhBVkUoTldQQVJBTUVU RVJTX1RSQUNLRVJfQVBJKQorICAgICAgICBpZiAobndfcGFyYW1ldGVyc19hbGxvd19zaGFyaW5n X3BvcnRfd2l0aF9saXN0ZW5lclB0cigpKSB7CisgICAgICAgICAgICBud19wYXJhbWV0ZXJzX2Fs bG93X3NoYXJpbmdfcG9ydF93aXRoX2xpc3RlbmVyUHRyKCkocGFyYW1ldGVycy5nZXQoKSwgbV9u d0xpc3RlbmVyLmdldCgpKTsKKyAgICAgICAgICAgIHBvcnQgPSBtX2FkZHJlc3MucG9ydCgpOwor ICAgICAgICB9CiAjZW5kaWYKLSAgICAgICAgYXV0byBsb2NhbEVuZHBvaW50ID0gYWRvcHROUyhu d19lbmRwb2ludF9jcmVhdGVfaG9zdChob3N0QWRkcmVzcy5jX3N0cigpLCBwb3J0VmFsdWUpKTsK KyAgICAgICAgYXV0byBsb2NhbEVuZHBvaW50ID0gYWRvcHROUyhud19lbmRwb2ludF9jcmVhdGVf aG9zdF93aXRoX251bWVyaWNfcG9ydChob3N0QWRkcmVzcy5jX3N0cigpLCBwb3J0KSk7CiAgICAg ICAgIG53X3BhcmFtZXRlcnNfc2V0X2xvY2FsX2VuZHBvaW50KHBhcmFtZXRlcnMuZ2V0KCksIGxv Y2FsRW5kcG9pbnQuZ2V0KCkpOwogICAgIH0KICAgICBjb25maWd1cmVQYXJhbWV0ZXJzKHBhcmFt ZXRlcnMuZ2V0KCksIHJlbW90ZUFkZHJlc3MuZmFtaWx5KCkgPT0gQUZfSU5FVCA/IG53X2lwX3Zl cnNpb25fNCA6IG53X2lwX3ZlcnNpb25fNik7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1Bs YXRmb3JtL3NwaS9Db2NvYS9OV1BhcmFtZXRlcnNTUEkuaCBiL1NvdXJjZS9XZWJLaXQvUGxhdGZv cm0vc3BpL0NvY29hL05XUGFyYW1ldGVyc1NQSS5oCmluZGV4IDFjMjFlMzJiNDBlZDVkOWM1OTlj ZWZkNjBlZTgxNWE5YTgxZDk3YWQuLjU2OWFkMmM5M2QzMmYwNTczMzExNmNiYjRlNDgwNzM3Y2Qx ZWJhMGQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvUGxhdGZvcm0vc3BpL0NvY29hL05XUGFy YW1ldGVyc1NQSS5oCisrKyBiL1NvdXJjZS9XZWJLaXQvUGxhdGZvcm0vc3BpL0NvY29hL05XUGFy YW1ldGVyc1NQSS5oCkBAIC0zMyw3ICszMyw4IEBACiAKIFdURl9FWFRFUk5fQ19CRUdJTgogCi12 b2lkIG53X3BhcmFtZXRlcnNfc2V0X2FjY291bnRfaWQobndfcGFyYW1ldGVyc190LCBjb25zdCBj aGFyICogYWNjb3VudF9pZCk7Cit2b2lkIG53X3BhcmFtZXRlcnNfc2V0X2FjY291bnRfaWQobndf cGFyYW1ldGVyc190LCBjb25zdCBjaGFyKiBhY2NvdW50X2lkKTsKK253X2VuZHBvaW50X3Qgbndf ZW5kcG9pbnRfY3JlYXRlX2hvc3Rfd2l0aF9udW1lcmljX3BvcnQoY29uc3QgY2hhciogaG9zdG5h bWUsIHVpbnQxNl90IHBvcnRfaG9zdF9vcmRlcik7CiAKICNpZiBIQVZFKE5XUEFSQU1FVEVSU19U UkFDS0VSX0FQSSkKIHZvaWQgbndfcGFyYW1ldGVyc19zZXRfaXNfdGhpcmRfcGFydHlfd2ViX2Nv bnRlbnQobndfcGFyYW1ldGVyc190LCBib29sIGlzX3RoaXJkX3BhcnR5X3dlYl9jb250ZW50KTsK 434646 2021-07-30 10:40:48 -0700 2021-07-30 11:08:29 -0700 Rebasing bug-228636-20210730194046.patch text/plain 5025 youennf U3VidmVyc2lvbiBSZXZpc2lvbjogMjgwNDgxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDliNzgwM2VmMjgxMTc4OTg0 ZWY5YTJmZTY2ZGY5MGQ4MDQ2ZmVlMTAuLjFiM2ZkYTMzMTFjMTNjNGU4ODE3NzJlYzk0YzdjODk3 NTBhYjAwNjUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTYgQEAKKzIwMjEtMDctMzAgIFlvdWVubiBG YWJsZXQgIDx5b3Vlbm5AYXBwbGUuY29tPgorCisgICAgICAgIHNvZnRsaW5rIG53X3BhcmFtZXRl cnNfYWxsb3dfc2hhcmluZ19wb3J0X3dpdGhfbGlzdGVuZXIKKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyODYzNgorCisgICAgICAgIFJldmlld2VkIGJ5 IEVyaWMgQ2FybHNvbi4KKworICAgICAgICAqIE5ldHdvcmtQcm9jZXNzL3dlYnJ0Yy9OZXR3b3Jr UlRDVURQU29ja2V0Q29jb2EubW06CisgICAgICAgIChXZWJLaXQ6Ok5ldHdvcmtSVENVRFBTb2Nr ZXRDb2NvYUNvbm5lY3Rpb25zOjpjcmVhdGVOV0Nvbm5lY3Rpb24pOgorICAgICAgICBUaGlzIGhl bHBzIGNvbXBpbGluZy9ydW5uaW5nIFdlYktpdCBvbiBvbGRlciBPU2VzLgorICAgICAgICBBbHNv IG1ha2UgdXNlIG9mIG53X2VuZHBvaW50X2NyZWF0ZV9ob3N0X3dpdGhfbnVtZXJpY19wb3J0IHRv IHJlbW92ZSB0aGUgbmVlZCBmb3Igc3RyaW5nIHRvIGludCBjb252ZXJzaW9uLgorICAgICAgICAq IFBsYXRmb3JtL3NwaS9Db2NvYS9OV1BhcmFtZXRlcnNTUEkuaDoKKwogMjAyMS0wNy0zMCAgWW91 ZW5uIEZhYmxldCAgPHlvdWVubkBhcHBsZS5jb20+CiAKICAgICAgICAgQXR0cmlidXRlIG53IGNv bm5lY3Rpb25zIHRvIHRoZSBzb3VyY2UgYXBwbGljYXRpb24KZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJLaXQvTmV0d29ya1Byb2Nlc3Mvd2VicnRjL05ldHdvcmtSVENVRFBTb2NrZXRDb2NvYS5tbSBi L1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3Mvd2VicnRjL05ldHdvcmtSVENVRFBTb2NrZXRD b2NvYS5tbQppbmRleCBjY2IwOTgwZmFlNmNiOWI4NjhjMjQxZTU3ZDQ3NGMwNzhmNzhlNGQ5Li5k NDU2NjQ1OGNiNTIzMzA3ODVlMTRkZGQyMWY0NzcxODZiMTA4MWE1IDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL3dlYnJ0Yy9OZXR3b3JrUlRDVURQU29ja2V0Q29jb2Eu bW0KKysrIGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy93ZWJydGMvTmV0d29ya1JUQ1VE UFNvY2tldENvY29hLm1tCkBAIC00NSw2ICs0NSw5IEBAIFNPRlRfTElOS19DTEFTUyhsaWJuZXR3 b3JrZXh0ZW5zaW9uLCBORUhlbHBlclRyYWNrZXJEaXNwb3NpdGlvbl90KQogU09GVF9MSU5LX0NM QVNTKGxpYm5ldHdvcmtleHRlbnNpb24sIE5FSGVscGVyVHJhY2tlckFwcEluZm9SZWYpCiBTT0ZU X0xJTktfQ0xBU1MobGlibmV0d29ya2V4dGVuc2lvbiwgTkVIZWxwZXJUcmFja2VyRG9tYWluQ29u dGV4dFJlZikKIFNPRlRfTElOSyhsaWJuZXR3b3JrZXh0ZW5zaW9uLCBORUhlbHBlclRyYWNrZXJH ZXREaXNwb3NpdGlvbiwgTkVIZWxwZXJUcmFja2VyRGlzcG9zaXRpb25fdCosIChORUhlbHBlclRy YWNrZXJBcHBJbmZvUmVmICphcHBfaW5mb19yZWYsIENGQXJyYXlSZWYgZG9tYWlucywgTkVIZWxw ZXJUcmFja2VyRG9tYWluQ29udGV4dFJlZiAqdHJhY2tlckRvbWFpbkNvbnRleHRSZWYsIENGSW5k ZXggKnRyYWNrZXJEb21haW5JbmRleCksIChhcHBfaW5mb19yZWYsIGRvbWFpbnMsIHRyYWNrZXJE b21haW5Db250ZXh0UmVmLCB0cmFja2VyRG9tYWluSW5kZXgpKQorCitTT0ZUX0xJTktfTElCUkFS WV9PUFRJT05BTChsaWJuZXR3b3JrKQorU09GVF9MSU5LX09QVElPTkFMKGxpYm5ldHdvcmssIG53 X3BhcmFtZXRlcnNfYWxsb3dfc2hhcmluZ19wb3J0X3dpdGhfbGlzdGVuZXIsIHZvaWQsIF9fY2Rl Y2wsIChud19wYXJhbWV0ZXJzX3QsIG53X2xpc3RlbmVyX3QpKQogI2VuZGlmCiAKIG5hbWVzcGFj ZSBXZWJLaXQgewpAQCAtMTY5LDcgKzE3Miw3IEBAIE5ldHdvcmtSVENVRFBTb2NrZXRDb2NvYUNv bm5lY3Rpb25zOjpOZXR3b3JrUlRDVURQU29ja2V0Q29jb2FDb25uZWN0aW9ucyhXZWJDb3JlCiAg ICAgICAgIGF1dG8gaG9zdEFkZHJlc3MgPSBhZGRyZXNzLmlwYWRkcigpLlRvU3RyaW5nKCk7CiAg ICAgICAgIGlmIChhZGRyZXNzLmlwYWRkcigpLklzTmlsKCkpCiAgICAgICAgICAgICBob3N0QWRk cmVzcyA9IGFkZHJlc3MuaG9zdG5hbWUoKTsKLSAgICAgICAgYXV0byBsb2NhbEVuZHBvaW50ID0g YWRvcHROUyhud19lbmRwb2ludF9jcmVhdGVfaG9zdChob3N0QWRkcmVzcy5jX3N0cigpLCAiMCIp KTsKKyAgICAgICAgYXV0byBsb2NhbEVuZHBvaW50ID0gYWRvcHROUyhud19lbmRwb2ludF9jcmVh dGVfaG9zdF93aXRoX251bWVyaWNfcG9ydChob3N0QWRkcmVzcy5jX3N0cigpLCAwKSk7CiAgICAg ICAgIG1fYWRkcmVzcyA9IHsgbndfZW5kcG9pbnRfZ2V0X2hvc3RuYW1lKGxvY2FsRW5kcG9pbnQu Z2V0KCkpLCBud19lbmRwb2ludF9nZXRfcG9ydChsb2NhbEVuZHBvaW50LmdldCgpKSB9OwogICAg ICAgICBud19wYXJhbWV0ZXJzX3NldF9sb2NhbF9lbmRwb2ludChwYXJhbWV0ZXJzLmdldCgpLCBs b2NhbEVuZHBvaW50LmdldCgpKTsKICAgICB9CkBAIC0yODgsMTUgKzI5MSwxNiBAQCBSZXRhaW5Q dHI8bndfY29ubmVjdGlvbl90PiBOZXR3b3JrUlRDVURQU29ja2V0Q29jb2FDb25uZWN0aW9uczo6 Y3JlYXRlTldDb25uZWN0aQogICAgICAgICBhdXRvIGhvc3RBZGRyZXNzID0gbV9hZGRyZXNzLmlw YWRkcigpLlRvU3RyaW5nKCk7CiAgICAgICAgIGlmIChtX2FkZHJlc3MuaXBhZGRyKCkuSXNOaWwo KSkKICAgICAgICAgICAgIGhvc3RBZGRyZXNzID0gbV9hZGRyZXNzLmhvc3RuYW1lKCk7Ci0jaWYg ZGVmaW5lZChOV19IQVNfU0hBUkVfTElTVEVORVJfUE9SVCkgJiYgTldfSEFTX1NIQVJFX0xJU1RF TkVSX1BPUlQKLSAgICAgICAgbndfcGFyYW1ldGVyc19hbGxvd19zaGFyaW5nX3BvcnRfd2l0aF9s aXN0ZW5lcihwYXJhbWV0ZXJzLmdldCgpLCBtX253TGlzdGVuZXIuZ2V0KCkpOwotICAgICAgICBh dXRvIHBvcnRTdHJpbmcgPSBTdHJpbmc6Om51bWJlcihtX2FkZHJlc3MucG9ydCgpKTsKLSAgICAg ICAgYXV0byBwb3J0VmFsdWUgPSBwb3J0U3RyaW5nLnV0ZjgoKS5kYXRhKCk7Ci0jZWxzZQotICAg ICAgICAvLyByZGFyOi8vODAxNzY2NzY6IHdlIHdvcmthcm91bmQgbG9jYWwgbG9vcCBwb3J0IHJl dXNlIGJ5IHVzaW5nIDAgaW5zdGVhZCBvZiBtX2FkZHJlc3MucG9ydCgpLgotICAgICAgICBhdXRv IHBvcnRWYWx1ZSA9ICIwIjsKKworICAgICAgICAvLyByZGFyOi8vODAxNzY2NzY6IHdlIHdvcmth cm91bmQgbG9jYWwgbG9vcCBwb3J0IHJldXNlIGJ5IHVzaW5nIDAgaW5zdGVhZCBvZiBtX2FkZHJl c3MucG9ydCgpIHdoZW4gbndfcGFyYW1ldGVyc19hbGxvd19zaGFyaW5nX3BvcnRfd2l0aF9saXN0 ZW5lciBpcyBub3QgYXZhaWxhYmxlLgorICAgICAgICB1aW50MTZfdCBwb3J0ID0gMDsKKyNpZiBI QVZFKE5XUEFSQU1FVEVSU19UUkFDS0VSX0FQSSkKKyAgICAgICAgaWYgKG53X3BhcmFtZXRlcnNf YWxsb3dfc2hhcmluZ19wb3J0X3dpdGhfbGlzdGVuZXJQdHIoKSkgeworICAgICAgICAgICAgbndf cGFyYW1ldGVyc19hbGxvd19zaGFyaW5nX3BvcnRfd2l0aF9saXN0ZW5lclB0cigpKHBhcmFtZXRl cnMuZ2V0KCksIG1fbndMaXN0ZW5lci5nZXQoKSk7CisgICAgICAgICAgICBwb3J0ID0gbV9hZGRy ZXNzLnBvcnQoKTsKKyAgICAgICAgfQogI2VuZGlmCi0gICAgICAgIGF1dG8gbG9jYWxFbmRwb2lu dCA9IGFkb3B0TlMobndfZW5kcG9pbnRfY3JlYXRlX2hvc3QoaG9zdEFkZHJlc3MuY19zdHIoKSwg cG9ydFZhbHVlKSk7CisgICAgICAgIGF1dG8gbG9jYWxFbmRwb2ludCA9IGFkb3B0TlMobndfZW5k cG9pbnRfY3JlYXRlX2hvc3Rfd2l0aF9udW1lcmljX3BvcnQoaG9zdEFkZHJlc3MuY19zdHIoKSwg cG9ydCkpOwogICAgICAgICBud19wYXJhbWV0ZXJzX3NldF9sb2NhbF9lbmRwb2ludChwYXJhbWV0 ZXJzLmdldCgpLCBsb2NhbEVuZHBvaW50LmdldCgpKTsKICAgICB9CiAgICAgY29uZmlndXJlUGFy YW1ldGVycyhwYXJhbWV0ZXJzLmdldCgpLCByZW1vdGVBZGRyZXNzLmZhbWlseSgpID09IEFGX0lO RVQgPyBud19pcF92ZXJzaW9uXzQgOiBud19pcF92ZXJzaW9uXzYpOwpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYktpdC9QbGF0Zm9ybS9zcGkvQ29jb2EvTldQYXJhbWV0ZXJzU1BJLmggYi9Tb3VyY2Uv V2ViS2l0L1BsYXRmb3JtL3NwaS9Db2NvYS9OV1BhcmFtZXRlcnNTUEkuaAppbmRleCA1ODQ5OTZl ZGJjMGZiNzdkM2I3NDJlMWI5MTE3OWFmM2YyNTYwMmU2Li5jMWY3MDk3MDIxMGE3ODNmNWU2OWNl MmQ1ZmU2ZGJkZjBkNDhiYWVhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1BsYXRmb3JtL3Nw aS9Db2NvYS9OV1BhcmFtZXRlcnNTUEkuaAorKysgYi9Tb3VyY2UvV2ViS2l0L1BsYXRmb3JtL3Nw aS9Db2NvYS9OV1BhcmFtZXRlcnNTUEkuaApAQCAtMzUsNiArMzUsNyBAQCBXVEZfRVhURVJOX0Nf QkVHSU4KIAogdm9pZCBud19wYXJhbWV0ZXJzX3NldF9hY2NvdW50X2lkKG53X3BhcmFtZXRlcnNf dCwgY29uc3QgY2hhciAqIGFjY291bnRfaWQpOwogdm9pZCBud19wYXJhbWV0ZXJzX3NldF9zb3Vy Y2VfYXBwbGljYXRpb24obndfcGFyYW1ldGVyc190LCBhdWRpdF90b2tlbl90KTsKK253X2VuZHBv aW50X3QgbndfZW5kcG9pbnRfY3JlYXRlX2hvc3Rfd2l0aF9udW1lcmljX3BvcnQoY29uc3QgY2hh ciogaG9zdG5hbWUsIHVpbnQxNl90IHBvcnRfaG9zdF9vcmRlcik7CiAKICNpZiBIQVZFKE5XUEFS QU1FVEVSU19UUkFDS0VSX0FQSSkKIHZvaWQgbndfcGFyYW1ldGVyc19zZXRfaXNfdGhpcmRfcGFy dHlfd2ViX2NvbnRlbnQobndfcGFyYW1ldGVyc190LCBib29sIGlzX3RoaXJkX3BhcnR5X3dlYl9j b250ZW50KTsK