211980 2020-05-16 03:01:25 -0700 [GStreamer][MediaStream] Remove orphaned tracks in updateTracks() 2020-05-18 02:09:35 -0700 1 1 1 Unclassified WebKit WebKitGTK WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=211946 P2 Normal --- 1 aboya aboya bugs-noreply calvaris cgarcia eric.carlson ews-watchlist glenn gustavo jer.noble menard philipj pnormand sergio vjaquez oldest_to_newest 1653301 0 aboya 2020-05-16 03:01:25 -0700 This patch ensures tracks missing from a subsequent updateTracks() calls are removed from the player. This fixes the following tests regressed by the track switch rework: imported/w3c/web-platform-tests/mediacapture-streams/MediaStream-removetrack.https.html imported/w3c/web-platform-tests/mediacapture-streams/MediaStreamTrack-applyConstraints.https.html 1653305 1 399548 aboya 2020-05-16 05:26:31 -0700 Created attachment 399548 Patch 1653319 2 399555 aboya 2020-05-16 09:17:18 -0700 Created attachment 399555 Patch 1653515 3 399555 pnormand 2020-05-18 01:15:46 -0700 Comment on attachment 399555 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=399555&action=review > Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:1512 > +template<typename K, typename V> > +HashSet<K> hashSetFromHashMapKeys(const HashMap<K, V>& hashMap) > +{ > + HashSet<K> keys; > + for (auto& key : hashMap.keys()) > + keys.add(key); > + return keys; > +} Would this be worth moving to HashMap as a new method? 1653523 4 399555 aboya 2020-05-18 01:52:04 -0700 Comment on attachment 399555 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=399555&action=review >> Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:1512 >> +} > > Would this be worth moving to HashMap as a new method? I don't know, all HashMap methods are pretty basic, so maybe someone would oppose this in WTF, or maybe a function already exists and I just didn't find it. I wanted a self-contained fix that didn't need a potentially stalling WTF review, so this was a reasonable solution. I've asked in the WebKit slack, if it turns out there was an existing function or there wasn't but people really want it in WTF another patch can be made that moves it there. For now I'm using this. 1653529 5 ews-feeder 2020-05-18 02:09:34 -0700 Committed r261803: <https://trac.webkit.org/changeset/261803> All reviewed patches have been landed. Closing bug and clearing flags on attachment 399555. 399548 2020-05-16 05:26:31 -0700 2020-05-16 09:17:14 -0700 Patch bug-211980-20200516142630.patch text/plain 6743 aboya U3VidmVyc2lvbiBSZXZpc2lvbjogMjYxNzM4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOTZiYTEwNDE3NmQ5ZDAw OTNkNzBjYTUwNjg2NTZkNmRlM2MxYWM4Mi4uOWRiMjdhMjc4YzA1MjYxYjYwZmViMjAwNzg4MjQ4 YWIwYjc5OTU1MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDIwLTA1LTE1ICBBbGlj aWEgQm95YSBHYXJjw61hICA8YWJveWFAaWdhbGlhLmNvbT4KKworICAgICAgICBbR1N0cmVhbWVy XSBSZW1vdmUgb3JwaGFuZWQgdHJhY2tzIGluIHVwZGF0ZVRyYWNrcygpCisgICAgICAgIE5lZWQg dGhlIGJ1ZyBVUkwgKE9PUFMhKS4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICBUaGlzIHBhdGNoIGVuc3VyZXMgdHJhY2tzIG1pc3NpbmcgZnJvbSBhIHN1 YnNlcXVlbnQgdXBkYXRlVHJhY2tzKCkKKyAgICAgICAgY2FsbHMgYXJlIHJlbW92ZWQgZnJvbSB0 aGUgcGxheWVyLgorCisgICAgICAgIFRoaXMgZml4ZXMgdGhlIGZvbGxvd2luZyB0ZXN0cyByZWdy ZXNzZWQgYnkgdGhlIHRyYWNrIHN3aXRjaCByZXdvcms6CisKKyAgICAgICAgaW1wb3J0ZWQvdzNj L3dlYi1wbGF0Zm9ybS10ZXN0cy9tZWRpYWNhcHR1cmUtc3RyZWFtcy9NZWRpYVN0cmVhbS1yZW1v dmV0cmFjay5odHRwcy5odG1sCisgICAgICAgIGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVz dHMvbWVkaWFjYXB0dXJlLXN0cmVhbXMvTWVkaWFTdHJlYW1UcmFjay1hcHBseUNvbnN0cmFpbnRz Lmh0dHBzLmh0bWwKKworICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9NZWRp YVBsYXllclByaXZhdGVHU3RyZWFtZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6aGFzaFNldEZy b21IYXNoTWFwS2V5cyk6CisgICAgICAgIChXZWJDb3JlOjpNZWRpYVBsYXllclByaXZhdGVHU3Ry ZWFtZXI6OnVwZGF0ZVRyYWNrcyk6CisKIDIwMjAtMDUtMTUgIEFsaWNpYSBCb3lhIEdhcmPDrWEg IDxhYm95YUBpZ2FsaWEuY29tPgogCiAgICAgICAgIFtHU3RyZWFtZXJdW01lZGlhU3RyZWFtXSBG aXggbWlzc2luZyB2aWRlbyBzaXplCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9ncmFwaGljcy9nc3RyZWFtZXIvTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyLmNwcCBiL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9NZWRpYVBsYXllclByaXZh dGVHU3RyZWFtZXIuY3BwCmluZGV4IGZjZGJiNzVhMmRkYmI0MDY4ZTg0MjhlNzEwN2VlOTE2NWE0 ZWMxNDYuLjhiNDljODM0ODBjNDEzMjczMzFmNmYxMzFkOWM2NjU5NWIwNGZmMDkgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9NZWRpYVBsYXll clByaXZhdGVHU3RyZWFtZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBo aWNzL2dzdHJlYW1lci9NZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXIuY3BwCkBAIC0xMTUsMTEg KzExNSw2IEBACiAgICAgICAgICAgICBtX3BsYXllci0+YWRkIyNUeXBlIyNUcmFjaygqdHJhY2sp OyAgICAgICAgICAgICAgICAgICAgICAgICBcCiAgICAgICAgIH0gICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBcCiAgICAgfSBHX1NU TVRfRU5ECi0KLSNkZWZpbmUgQ0xFQVJfVFJBQ0tTKHRyYWNrcywgbWV0aG9kKSBcCi0gICAgZm9y IChhdXRvJiB0cmFjayA6IHRyYWNrcy52YWx1ZXMoKSlcCi0gICAgICAgIG1ldGhvZCgqdHJhY2sp O1wKLSAgICB0cmFja3MuY2xlYXIoKTsKICNlbHNlCiAjZGVmaW5lIENSRUFURV9UUkFDSyh0eXBl LCBUeXBlKSBHX1NUTVRfU1RBUlQgeyBcCiAgICAgICAgIG1faGFzIyNUeXBlIyMgPSB0cnVlOyAg ICAgICAgICAgICAgICAgICBcCkBAIC0xNTA3LDYgKzE1MDIsMTUgQEAgdm9pZCBNZWRpYVBsYXll clByaXZhdGVHU3RyZWFtZXI6OnBsYXliaW4zU2VuZFNlbGVjdFN0cmVhbXNJZkFwcHJvcHJpYXRl KCkKICAgICBnX2xpc3RfZnJlZV9mdWxsKHN0cmVhbXMsIHJlaW50ZXJwcmV0X2Nhc3Q8R0Rlc3Ry b3lOb3RpZnk+KGdfZnJlZSkpOwogfQogCit0ZW1wbGF0ZTx0eXBlbmFtZSBLLCB0eXBlbmFtZSBW PgorSGFzaFNldDxLPiBoYXNoU2V0RnJvbUhhc2hNYXBLZXlzKGNvbnN0IEhhc2hNYXA8SywgVj4m IGhhc2hNYXApCit7CisgICAgSGFzaFNldDxLPiBrZXlzOworICAgIGZvciAoYXV0byYga2V5IDog aGFzaE1hcC5rZXlzKCkpCisgICAgICAgIGtleXMuYWRkKGtleSk7CisgICAgcmV0dXJuIGtleXM7 Cit9CisKIHZvaWQgTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyOjp1cGRhdGVUcmFja3MoR1Jl ZlB0cjxHc3RTdHJlYW1Db2xsZWN0aW9uPiYmIHN0cmVhbUNvbGxlY3Rpb24pCiB7CiAgICAgQVNT RVJUKCFtX2lzTGVnYWN5UGxheWJpbik7CkBAIC0xNTIyLDExICsxNTI2LDE4IEBAIHZvaWQgTWVk aWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyOjp1cGRhdGVUcmFja3MoR1JlZlB0cjxHc3RTdHJlYW1D b2xsZWN0aW9uPiYmIHN0CiAgICAgdW5zaWduZWQgYXVkaW9UcmFja0luZGV4ID0gMDsKICAgICB1 bnNpZ25lZCB2aWRlb1RyYWNrSW5kZXggPSAwOwogICAgIHVuc2lnbmVkIHRleHRUcmFja0luZGV4 ID0gMDsKKyAgICBIYXNoU2V0PEF0b21TdHJpbmc+IG9ycGhhbmVkQXVkaW9UcmFja0lkcyA9IGhh c2hTZXRGcm9tSGFzaE1hcEtleXMobV9hdWRpb1RyYWNrcyk7CisgICAgSGFzaFNldDxBdG9tU3Ry aW5nPiBvcnBoYW5lZFZpZGVvVHJhY2tJZHMgPSBoYXNoU2V0RnJvbUhhc2hNYXBLZXlzKG1fdmlk ZW9UcmFja3MpOworICAgIEhhc2hTZXQ8QXRvbVN0cmluZz4gb3JwaGFuZWRUZXh0VHJhY2tJZHMg PSBoYXNoU2V0RnJvbUhhc2hNYXBLZXlzKG1fdGV4dFRyYWNrcyk7CiAgICAgZm9yICh1bnNpZ25l ZCBpID0gMDsgaSA8IGxlbmd0aDsgaSsrKSB7CiAgICAgICAgIEdSZWZQdHI8R3N0U3RyZWFtPiBz dHJlYW0gPSBnc3Rfc3RyZWFtX2NvbGxlY3Rpb25fZ2V0X3N0cmVhbShzdHJlYW1Db2xsZWN0aW9u LmdldCgpLCBpKTsKICAgICAgICAgU3RyaW5nIHN0cmVhbUlkKGdzdF9zdHJlYW1fZ2V0X3N0cmVh bV9pZChzdHJlYW0uZ2V0KCkpKTsKICAgICAgICAgR3N0U3RyZWFtVHlwZSB0eXBlID0gZ3N0X3N0 cmVhbV9nZXRfc3RyZWFtX3R5cGUoc3RyZWFtLmdldCgpKTsKIAorICAgICAgICBvcnBoYW5lZEF1 ZGlvVHJhY2tJZHMucmVtb3ZlKHN0cmVhbUlkKTsKKyAgICAgICAgb3JwaGFuZWRWaWRlb1RyYWNr SWRzLnJlbW92ZShzdHJlYW1JZCk7CisgICAgICAgIG9ycGhhbmVkVGV4dFRyYWNrSWRzLnJlbW92 ZShzdHJlYW1JZCk7CisKICAgICAgICAgR1NUX0RFQlVHX09CSkVDVChwaXBlbGluZSgpLCAiSW5z cGVjdGluZyAlcyB0cmFjayB3aXRoIElEICVzIiwgZ3N0X3N0cmVhbV90eXBlX2dldF9uYW1lKHR5 cGUpLCBzdHJlYW1JZC51dGY4KCkuZGF0YSgpKTsKICAgICAgICAgaWYgKCh0eXBlICYgR1NUX1NU UkVBTV9UWVBFX0FVRElPICYmIG1fYXVkaW9UcmFja3MuY29udGFpbnMoc3RyZWFtSWQpKSB8fCAo dHlwZSAmIEdTVF9TVFJFQU1fVFlQRV9WSURFTyAmJiBtX3ZpZGVvVHJhY2tzLmNvbnRhaW5zKHN0 cmVhbUlkKSkKICAgICAgICAgICAgIHx8ICh0eXBlICYgR1NUX1NUUkVBTV9UWVBFX1RFWFQgJiYg bV90ZXh0VHJhY2tzLmNvbnRhaW5zKHN0cmVhbUlkKSkpCkBAIC0xNTQ5LDYgKzE1NjAsMTcgQEAg dm9pZCBNZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXI6OnVwZGF0ZVRyYWNrcyhHUmVmUHRyPEdz dFN0cmVhbUNvbGxlY3Rpb24+JiYgc3QKICAgICAgICAgICAgIEdTVF9XQVJOSU5HKCJVbmtub3du IHRyYWNrIHR5cGUgZm91bmQgZm9yIHN0cmVhbSAlcyIsIHN0cmVhbUlkLnV0ZjgoKS5kYXRhKCkp OwogICAgIH0KIAorI2RlZmluZSBSRU1PVkVfT1JQSEFORURfVFJBQ0tTKHR5cGUsIFR5cGUpICAg ICAgICAgICAgXAorICAgIGZvciAoYXV0byYgdHJhY2tJZCA6IG9ycGhhbmVkIyNUeXBlIyNUcmFj a0lkcykgeyAgXAorICAgICAgICBhdXRvIGl0ZXIgPSBtXyMjdHlwZSMjVHJhY2tzLmZpbmQodHJh Y2tJZCk7ICAgXAorICAgICAgICBtX3BsYXllci0+cmVtb3ZlIyNUeXBlIyNUcmFjaygqaXRlci0+ dmFsdWUpOyAgXAorICAgICAgICBtXyMjdHlwZSMjVHJhY2tzLnJlbW92ZShpdGVyLT5rZXkpOyAg ICAgICAgICAgXAorICAgIH0KKworICAgIFJFTU9WRV9PUlBIQU5FRF9UUkFDS1MoYXVkaW8sIEF1 ZGlvKTsKKyAgICBSRU1PVkVfT1JQSEFORURfVFJBQ0tTKHZpZGVvLCBWaWRlbyk7CisgICAgUkVN T1ZFX09SUEhBTkVEX1RSQUNLUyh0ZXh0LCBUZXh0KTsKKwogICAgIGlmIChvbGRIYXNWaWRlbyAh PSBtX2hhc1ZpZGVvIHx8IG9sZEhhc0F1ZGlvICE9IG1faGFzQXVkaW8pCiAgICAgICAgIG1fcGxh eWVyLT5jaGFyYWN0ZXJpc3RpY0NoYW5nZWQoKTsKIApkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMv Q2hhbmdlTG9nIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCmluZGV4IGZhYmY1NGNlMzAxMDNiNjRh MmUxNjhiYThkYjRiMzEzMDMxODUxZTIuLjBiY2YwZWNjNDNiNjg4OGNjMjY4NmVjZDI2YWFkYmYy Nzg3MWVmNDUgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL0NoYW5nZUxvZworKysgYi9MYXlvdXRU ZXN0cy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNCBAQAorMjAyMC0wNS0xNSAgQWxpY2lhIEJveWEg R2FyY8OtYSAgPGFib3lhQGlnYWxpYS5jb20+CisKKyAgICAgICAgW0dTdHJlYW1lcl0gUmVtb3Zl IG9ycGhhbmVkIHRyYWNrcyBpbiB1cGRhdGVUcmFja3MoKQorICAgICAgICBOZWVkIHRoZSBidWcg VVJMIChPT1BTISkuCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgVXBkYXRlZCB0ZXN0IGV4cGVjdGF0aW9ucy4KKworICAgICAgICAqIHBsYXRmb3JtL2d0 ay9UZXN0RXhwZWN0YXRpb25zOgorCiAyMDIwLTA1LTE1ICBBbGljaWEgQm95YSBHYXJjw61hICA8 YWJveWFAaWdhbGlhLmNvbT4KIAogICAgICAgICBbR1N0cmVhbWVyXVtNZWRpYVN0cmVhbV0gRml4 IG1pc3NpbmcgdmlkZW8gc2l6ZQpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvcGxhdGZvcm0vZ3Rr L1Rlc3RFeHBlY3RhdGlvbnMgYi9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9ndGsvVGVzdEV4cGVjdGF0 aW9ucwppbmRleCA4OGRkZDY4MWE2NWY3MGRkNTBlMjFhOTJlNTY2MDAyMWY1NDYyYjU4Li4wNTM0 ODIzYmI3Y2I0ZjM3M2VkNDJiZWQ4NDhlNjFlZTBhMzkyNjNhIDEwMDY0NAotLS0gYS9MYXlvdXRU ZXN0cy9wbGF0Zm9ybS9ndGsvVGVzdEV4cGVjdGF0aW9ucworKysgYi9MYXlvdXRUZXN0cy9wbGF0 Zm9ybS9ndGsvVGVzdEV4cGVjdGF0aW9ucwpAQCAtMTI3Miw3ICsxMjcyLDcgQEAgd2Via2l0Lm9y Zy9iLzIwNjY1MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2NsaXBib2FyZC1hcGlz L2FzeW5jLXdyaXRlLXQKIAogd2Via2l0Lm9yZy9iLzIwNjY1NSBpbnNwZWN0b3IvcGFnZS9vdmVy cmlkZVNldHRpbmctTW9ja0NhcHR1cmVEZXZpY2VzRW5hYmxlZC5odG1sIFsgRmFpbHVyZSBdCiAK LXdlYmtpdC5vcmcvYi8yMDY2NTYgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9tZWRp YWNhcHR1cmUtc3RyZWFtcy9NZWRpYVN0cmVhbS1yZW1vdmV0cmFjay5odHRwcy5odG1sIFsgRmFp bHVyZSBDcmFzaCBUaW1lb3V0IF0KK3dlYmtpdC5vcmcvYi8yMDY2NTYgaW1wb3J0ZWQvdzNjL3dl Yi1wbGF0Zm9ybS10ZXN0cy9tZWRpYWNhcHR1cmUtc3RyZWFtcy9NZWRpYVN0cmVhbS1yZW1vdmV0 cmFjay5odHRwcy5odG1sIFsgRmFpbHVyZSBDcmFzaCBdCiB3ZWJraXQub3JnL2IvMjA2NjU2IGlt cG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvbWVkaWFjYXB0dXJlLXN0cmVhbXMvTWVkaWFT dHJlYW1UcmFjay1NZWRpYUVsZW1lbnQtZGlzYWJsZWQtdmlkZW8taXMtYmxhY2suaHR0cHMuaHRt bCBbIEZhaWx1cmUgXQogd2Via2l0Lm9yZy9iLzIwNjY1NiBpbXBvcnRlZC93M2Mvd2ViLXBsYXRm b3JtLXRlc3RzL21lZGlhY2FwdHVyZS1zdHJlYW1zL01lZGlhU3RyZWFtLU1lZGlhRWxlbWVudC1w cmVsb2FkLW5vbmUtbWFudWFsLmh0dHBzLmh0bWwgWyBDcmFzaCBGYWlsdXJlIFBhc3MgXQogCkBA IC0yOTI1LDggKzI5MjUsNiBAQCB3ZWJraXQub3JnL2IvMjExODM1IGh0dHAvd3B0L3dlYnJ0Yy90 aGlyZC1wYXJ0eS1mcmFtZS1pY2UtY2FuZGlkYXRlLWZpbHRlcmluZy5odAogCiB3ZWJraXQub3Jn L2IvMjExODM2IGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvZmV0Y2gvYXBpL2Fib3J0 L2dlbmVyYWwuYW55Lndvcmtlci5odG1sIFsgRmFpbHVyZSBQYXNzIF0KIAotd2Via2l0Lm9yZy9i LzIxMTk0NiBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL21lZGlhY2FwdHVyZS1zdHJl YW1zL01lZGlhU3RyZWFtVHJhY2stYXBwbHlDb25zdHJhaW50cy5odHRwcy5odG1sIFsgUGFzcyBD cmFzaCBdCi0KIHdlYmtpdC5vcmcvYi8yMTE5NDggd2ViYW5pbWF0aW9ucy9hY2NlbGVyYXRlZC1h bmltYXRpb24tcGxheWJhY2stcmF0ZS5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBUaW1lb3V0IFBh c3MgXQogCiB3ZWJraXQub3JnL2IvMjExMTY2IHdlYnJ0Yy9kaXNhYmxlLWVuY3J5cHRpb24uaHRt bCBbIENyYXNoIFBhc3MgXQo= 399555 2020-05-16 09:17:18 -0700 2020-05-18 02:09:34 -0700 Patch bug-211980-20200516181717.patch text/plain 6794 aboya U3VidmVyc2lvbiBSZXZpc2lvbjogMjYxNzM4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOTZiYTEwNDE3NmQ5ZDAw OTNkNzBjYTUwNjg2NTZkNmRlM2MxYWM4Mi4uYzE3MDY5M2YzM2FiNjZmZjQ1NmE3YmQ3NTM4OGI3 ZTU5ZmIwMTI2MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDIwLTA1LTE1ICBBbGlj aWEgQm95YSBHYXJjw61hICA8YWJveWFAaWdhbGlhLmNvbT4KKworICAgICAgICBbR1N0cmVhbWVy XVtNZWRpYVNvdXJjZV0gUmVtb3ZlIG9ycGhhbmVkIHRyYWNrcyBpbiB1cGRhdGVUcmFja3MoKQor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjExOTgwCisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhpcyBwYXRj aCBlbnN1cmVzIHRyYWNrcyBtaXNzaW5nIGZyb20gYSBzdWJzZXF1ZW50IHVwZGF0ZVRyYWNrcygp CisgICAgICAgIGNhbGxzIGFyZSByZW1vdmVkIGZyb20gdGhlIHBsYXllci4KKworICAgICAgICBU aGlzIGZpeGVzIHJlZ3Jlc3Npb25zIG9uIHRoZSBmb2xsb3dpbmcgdGVzdHMgY2F1c2VkIG9uIHIy NjE2ODMuCisKKyAgICAgICAgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9tZWRpYWNh cHR1cmUtc3RyZWFtcy9NZWRpYVN0cmVhbS1yZW1vdmV0cmFjay5odHRwcy5odG1sCisgICAgICAg IGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvbWVkaWFjYXB0dXJlLXN0cmVhbXMvTWVk aWFTdHJlYW1UcmFjay1hcHBseUNvbnN0cmFpbnRzLmh0dHBzLmh0bWwKKworICAgICAgICAqIHBs YXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9NZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXIuY3Bw OgorICAgICAgICAoV2ViQ29yZTo6aGFzaFNldEZyb21IYXNoTWFwS2V5cyk6CisgICAgICAgIChX ZWJDb3JlOjpNZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXI6OnVwZGF0ZVRyYWNrcyk6CisKIDIw MjAtMDUtMTUgIEFsaWNpYSBCb3lhIEdhcmPDrWEgIDxhYm95YUBpZ2FsaWEuY29tPgogCiAgICAg ICAgIFtHU3RyZWFtZXJdW01lZGlhU3RyZWFtXSBGaXggbWlzc2luZyB2aWRlbyBzaXplCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvTWVkaWFQ bGF5ZXJQcml2YXRlR1N0cmVhbWVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBo aWNzL2dzdHJlYW1lci9NZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXIuY3BwCmluZGV4IGZjZGJi NzVhMmRkYmI0MDY4ZTg0MjhlNzEwN2VlOTE2NWE0ZWMxNDYuLjhiNDljODM0ODBjNDEzMjczMzFm NmYxMzFkOWM2NjU5NWIwNGZmMDkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L2dyYXBoaWNzL2dzdHJlYW1lci9NZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXIuY3BwCisrKyBi L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9NZWRpYVBsYXllclBy aXZhdGVHU3RyZWFtZXIuY3BwCkBAIC0xMTUsMTEgKzExNSw2IEBACiAgICAgICAgICAgICBtX3Bs YXllci0+YWRkIyNUeXBlIyNUcmFjaygqdHJhY2spOyAgICAgICAgICAgICAgICAgICAgICAgICBc CiAgICAgICAgIH0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICBcCiAgICAgfSBHX1NUTVRfRU5ECi0KLSNkZWZpbmUgQ0xFQVJfVFJB Q0tTKHRyYWNrcywgbWV0aG9kKSBcCi0gICAgZm9yIChhdXRvJiB0cmFjayA6IHRyYWNrcy52YWx1 ZXMoKSlcCi0gICAgICAgIG1ldGhvZCgqdHJhY2spO1wKLSAgICB0cmFja3MuY2xlYXIoKTsKICNl bHNlCiAjZGVmaW5lIENSRUFURV9UUkFDSyh0eXBlLCBUeXBlKSBHX1NUTVRfU1RBUlQgeyBcCiAg ICAgICAgIG1faGFzIyNUeXBlIyMgPSB0cnVlOyAgICAgICAgICAgICAgICAgICBcCkBAIC0xNTA3 LDYgKzE1MDIsMTUgQEAgdm9pZCBNZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXI6OnBsYXliaW4z U2VuZFNlbGVjdFN0cmVhbXNJZkFwcHJvcHJpYXRlKCkKICAgICBnX2xpc3RfZnJlZV9mdWxsKHN0 cmVhbXMsIHJlaW50ZXJwcmV0X2Nhc3Q8R0Rlc3Ryb3lOb3RpZnk+KGdfZnJlZSkpOwogfQogCit0 ZW1wbGF0ZTx0eXBlbmFtZSBLLCB0eXBlbmFtZSBWPgorSGFzaFNldDxLPiBoYXNoU2V0RnJvbUhh c2hNYXBLZXlzKGNvbnN0IEhhc2hNYXA8SywgVj4mIGhhc2hNYXApCit7CisgICAgSGFzaFNldDxL PiBrZXlzOworICAgIGZvciAoYXV0byYga2V5IDogaGFzaE1hcC5rZXlzKCkpCisgICAgICAgIGtl eXMuYWRkKGtleSk7CisgICAgcmV0dXJuIGtleXM7Cit9CisKIHZvaWQgTWVkaWFQbGF5ZXJQcml2 YXRlR1N0cmVhbWVyOjp1cGRhdGVUcmFja3MoR1JlZlB0cjxHc3RTdHJlYW1Db2xsZWN0aW9uPiYm IHN0cmVhbUNvbGxlY3Rpb24pCiB7CiAgICAgQVNTRVJUKCFtX2lzTGVnYWN5UGxheWJpbik7CkBA IC0xNTIyLDExICsxNTI2LDE4IEBAIHZvaWQgTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyOjp1 cGRhdGVUcmFja3MoR1JlZlB0cjxHc3RTdHJlYW1Db2xsZWN0aW9uPiYmIHN0CiAgICAgdW5zaWdu ZWQgYXVkaW9UcmFja0luZGV4ID0gMDsKICAgICB1bnNpZ25lZCB2aWRlb1RyYWNrSW5kZXggPSAw OwogICAgIHVuc2lnbmVkIHRleHRUcmFja0luZGV4ID0gMDsKKyAgICBIYXNoU2V0PEF0b21TdHJp bmc+IG9ycGhhbmVkQXVkaW9UcmFja0lkcyA9IGhhc2hTZXRGcm9tSGFzaE1hcEtleXMobV9hdWRp b1RyYWNrcyk7CisgICAgSGFzaFNldDxBdG9tU3RyaW5nPiBvcnBoYW5lZFZpZGVvVHJhY2tJZHMg PSBoYXNoU2V0RnJvbUhhc2hNYXBLZXlzKG1fdmlkZW9UcmFja3MpOworICAgIEhhc2hTZXQ8QXRv bVN0cmluZz4gb3JwaGFuZWRUZXh0VHJhY2tJZHMgPSBoYXNoU2V0RnJvbUhhc2hNYXBLZXlzKG1f dGV4dFRyYWNrcyk7CiAgICAgZm9yICh1bnNpZ25lZCBpID0gMDsgaSA8IGxlbmd0aDsgaSsrKSB7 CiAgICAgICAgIEdSZWZQdHI8R3N0U3RyZWFtPiBzdHJlYW0gPSBnc3Rfc3RyZWFtX2NvbGxlY3Rp b25fZ2V0X3N0cmVhbShzdHJlYW1Db2xsZWN0aW9uLmdldCgpLCBpKTsKICAgICAgICAgU3RyaW5n IHN0cmVhbUlkKGdzdF9zdHJlYW1fZ2V0X3N0cmVhbV9pZChzdHJlYW0uZ2V0KCkpKTsKICAgICAg ICAgR3N0U3RyZWFtVHlwZSB0eXBlID0gZ3N0X3N0cmVhbV9nZXRfc3RyZWFtX3R5cGUoc3RyZWFt LmdldCgpKTsKIAorICAgICAgICBvcnBoYW5lZEF1ZGlvVHJhY2tJZHMucmVtb3ZlKHN0cmVhbUlk KTsKKyAgICAgICAgb3JwaGFuZWRWaWRlb1RyYWNrSWRzLnJlbW92ZShzdHJlYW1JZCk7CisgICAg ICAgIG9ycGhhbmVkVGV4dFRyYWNrSWRzLnJlbW92ZShzdHJlYW1JZCk7CisKICAgICAgICAgR1NU X0RFQlVHX09CSkVDVChwaXBlbGluZSgpLCAiSW5zcGVjdGluZyAlcyB0cmFjayB3aXRoIElEICVz IiwgZ3N0X3N0cmVhbV90eXBlX2dldF9uYW1lKHR5cGUpLCBzdHJlYW1JZC51dGY4KCkuZGF0YSgp KTsKICAgICAgICAgaWYgKCh0eXBlICYgR1NUX1NUUkVBTV9UWVBFX0FVRElPICYmIG1fYXVkaW9U cmFja3MuY29udGFpbnMoc3RyZWFtSWQpKSB8fCAodHlwZSAmIEdTVF9TVFJFQU1fVFlQRV9WSURF TyAmJiBtX3ZpZGVvVHJhY2tzLmNvbnRhaW5zKHN0cmVhbUlkKSkKICAgICAgICAgICAgIHx8ICh0 eXBlICYgR1NUX1NUUkVBTV9UWVBFX1RFWFQgJiYgbV90ZXh0VHJhY2tzLmNvbnRhaW5zKHN0cmVh bUlkKSkpCkBAIC0xNTQ5LDYgKzE1NjAsMTcgQEAgdm9pZCBNZWRpYVBsYXllclByaXZhdGVHU3Ry ZWFtZXI6OnVwZGF0ZVRyYWNrcyhHUmVmUHRyPEdzdFN0cmVhbUNvbGxlY3Rpb24+JiYgc3QKICAg ICAgICAgICAgIEdTVF9XQVJOSU5HKCJVbmtub3duIHRyYWNrIHR5cGUgZm91bmQgZm9yIHN0cmVh bSAlcyIsIHN0cmVhbUlkLnV0ZjgoKS5kYXRhKCkpOwogICAgIH0KIAorI2RlZmluZSBSRU1PVkVf T1JQSEFORURfVFJBQ0tTKHR5cGUsIFR5cGUpICAgICAgICAgICAgXAorICAgIGZvciAoYXV0byYg dHJhY2tJZCA6IG9ycGhhbmVkIyNUeXBlIyNUcmFja0lkcykgeyAgXAorICAgICAgICBhdXRvIGl0 ZXIgPSBtXyMjdHlwZSMjVHJhY2tzLmZpbmQodHJhY2tJZCk7ICAgXAorICAgICAgICBtX3BsYXll ci0+cmVtb3ZlIyNUeXBlIyNUcmFjaygqaXRlci0+dmFsdWUpOyAgXAorICAgICAgICBtXyMjdHlw ZSMjVHJhY2tzLnJlbW92ZShpdGVyLT5rZXkpOyAgICAgICAgICAgXAorICAgIH0KKworICAgIFJF TU9WRV9PUlBIQU5FRF9UUkFDS1MoYXVkaW8sIEF1ZGlvKTsKKyAgICBSRU1PVkVfT1JQSEFORURf VFJBQ0tTKHZpZGVvLCBWaWRlbyk7CisgICAgUkVNT1ZFX09SUEhBTkVEX1RSQUNLUyh0ZXh0LCBU ZXh0KTsKKwogICAgIGlmIChvbGRIYXNWaWRlbyAhPSBtX2hhc1ZpZGVvIHx8IG9sZEhhc0F1ZGlv ICE9IG1faGFzQXVkaW8pCiAgICAgICAgIG1fcGxheWVyLT5jaGFyYWN0ZXJpc3RpY0NoYW5nZWQo KTsKIApkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nIGIvTGF5b3V0VGVzdHMvQ2hh bmdlTG9nCmluZGV4IGZhYmY1NGNlMzAxMDNiNjRhMmUxNjhiYThkYjRiMzEzMDMxODUxZTIuLjdh YTc3ODM4ZGNhMWJiNDI1ZjhiYjJhNDU5M2M2ZGRkN2ZkYmQxY2QgMTAwNjQ0Ci0tLSBhL0xheW91 dFRlc3RzL0NoYW5nZUxvZworKysgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwx NCBAQAorMjAyMC0wNS0xNSAgQWxpY2lhIEJveWEgR2FyY8OtYSAgPGFib3lhQGlnYWxpYS5jb20+ CisKKyAgICAgICAgW0dTdHJlYW1lcl0gUmVtb3ZlIG9ycGhhbmVkIHRyYWNrcyBpbiB1cGRhdGVU cmFja3MoKQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MjExOTgwCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg VXBkYXRlZCB0ZXN0IGV4cGVjdGF0aW9ucy4KKworICAgICAgICAqIHBsYXRmb3JtL2d0ay9UZXN0 RXhwZWN0YXRpb25zOgorCiAyMDIwLTA1LTE1ICBBbGljaWEgQm95YSBHYXJjw61hICA8YWJveWFA aWdhbGlhLmNvbT4KIAogICAgICAgICBbR1N0cmVhbWVyXVtNZWRpYVN0cmVhbV0gRml4IG1pc3Np bmcgdmlkZW8gc2l6ZQpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvcGxhdGZvcm0vZ3RrL1Rlc3RF eHBlY3RhdGlvbnMgYi9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9ndGsvVGVzdEV4cGVjdGF0aW9ucwpp bmRleCA4OGRkZDY4MWE2NWY3MGRkNTBlMjFhOTJlNTY2MDAyMWY1NDYyYjU4Li4wNTM0ODIzYmI3 Y2I0ZjM3M2VkNDJiZWQ4NDhlNjFlZTBhMzkyNjNhIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9w bGF0Zm9ybS9ndGsvVGVzdEV4cGVjdGF0aW9ucworKysgYi9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9n dGsvVGVzdEV4cGVjdGF0aW9ucwpAQCAtMTI3Miw3ICsxMjcyLDcgQEAgd2Via2l0Lm9yZy9iLzIw NjY1MyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL2NsaXBib2FyZC1hcGlzL2FzeW5j LXdyaXRlLXQKIAogd2Via2l0Lm9yZy9iLzIwNjY1NSBpbnNwZWN0b3IvcGFnZS9vdmVycmlkZVNl dHRpbmctTW9ja0NhcHR1cmVEZXZpY2VzRW5hYmxlZC5odG1sIFsgRmFpbHVyZSBdCiAKLXdlYmtp dC5vcmcvYi8yMDY2NTYgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9tZWRpYWNhcHR1 cmUtc3RyZWFtcy9NZWRpYVN0cmVhbS1yZW1vdmV0cmFjay5odHRwcy5odG1sIFsgRmFpbHVyZSBD cmFzaCBUaW1lb3V0IF0KK3dlYmtpdC5vcmcvYi8yMDY2NTYgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0 Zm9ybS10ZXN0cy9tZWRpYWNhcHR1cmUtc3RyZWFtcy9NZWRpYVN0cmVhbS1yZW1vdmV0cmFjay5o dHRwcy5odG1sIFsgRmFpbHVyZSBDcmFzaCBdCiB3ZWJraXQub3JnL2IvMjA2NjU2IGltcG9ydGVk L3czYy93ZWItcGxhdGZvcm0tdGVzdHMvbWVkaWFjYXB0dXJlLXN0cmVhbXMvTWVkaWFTdHJlYW1U cmFjay1NZWRpYUVsZW1lbnQtZGlzYWJsZWQtdmlkZW8taXMtYmxhY2suaHR0cHMuaHRtbCBbIEZh aWx1cmUgXQogd2Via2l0Lm9yZy9iLzIwNjY1NiBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRl c3RzL21lZGlhY2FwdHVyZS1zdHJlYW1zL01lZGlhU3RyZWFtLU1lZGlhRWxlbWVudC1wcmVsb2Fk LW5vbmUtbWFudWFsLmh0dHBzLmh0bWwgWyBDcmFzaCBGYWlsdXJlIFBhc3MgXQogCkBAIC0yOTI1 LDggKzI5MjUsNiBAQCB3ZWJraXQub3JnL2IvMjExODM1IGh0dHAvd3B0L3dlYnJ0Yy90aGlyZC1w YXJ0eS1mcmFtZS1pY2UtY2FuZGlkYXRlLWZpbHRlcmluZy5odAogCiB3ZWJraXQub3JnL2IvMjEx ODM2IGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvZmV0Y2gvYXBpL2Fib3J0L2dlbmVy YWwuYW55Lndvcmtlci5odG1sIFsgRmFpbHVyZSBQYXNzIF0KIAotd2Via2l0Lm9yZy9iLzIxMTk0 NiBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL21lZGlhY2FwdHVyZS1zdHJlYW1zL01l ZGlhU3RyZWFtVHJhY2stYXBwbHlDb25zdHJhaW50cy5odHRwcy5odG1sIFsgUGFzcyBDcmFzaCBd Ci0KIHdlYmtpdC5vcmcvYi8yMTE5NDggd2ViYW5pbWF0aW9ucy9hY2NlbGVyYXRlZC1hbmltYXRp b24tcGxheWJhY2stcmF0ZS5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBUaW1lb3V0IFBhc3MgXQog CiB3ZWJraXQub3JnL2IvMjExMTY2IHdlYnJ0Yy9kaXNhYmxlLWVuY3J5cHRpb24uaHRtbCBbIENy YXNoIFBhc3MgXQo=