231022 2021-09-30 09:08:08 -0700 Regression (r283238)[ MacOS wk1 ] fast/mediacapturefromelement/CanvasCaptureMediaStream-webgl-events.html is timing out 2021-10-04 00:48:24 -0700 1 1 1 Unclassified WebKit Media WebKit Nightly Build Mac (Intel) Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=230613 InRadar P2 Normal --- 1 ayumi_kojima kkinnunen cdumez changseok dino eric.carlson esprehn+autocc ews-watchlist glenn gyuyoung.kim hta jer.noble kkinnunen kondapallykalyan philipj sergio tommyw webkit-bot-watchers-bugzilla webkit-bug-importer youennf oldest_to_newest 1798889 0 ayumi_kojima 2021-09-30 09:08:08 -0700 fast/mediacapturefromelement/CanvasCaptureMediaStream-webgl-events.html Is timing out on macOS wk1. History: https://results.webkit.org/?suite=layout-tests&test=fast%2Fmediacapturefromelement%2FCanvasCaptureMediaStream-webgl-events.html Diff: --- /Volumes/Data/worker/bigsur-release-applesilicon-tests-wk1/build/layout-test-results/fast/mediacapturefromelement/CanvasCaptureMediaStream-webgl-events-expected.txt +++ /Volumes/Data/worker/bigsur-release-applesilicon-tests-wk1/build/layout-test-results/fast/mediacapturefromelement/CanvasCaptureMediaStream-webgl-events-actual.txt @@ -1,3 +1,4 @@ +FAIL: Timed out waiting for notifyDone to be called Exercises the potential events on CanvasCaptureMediaStream. On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE". @@ -9,8 +10,4 @@ PASS Plugged stream to video tag. PASS Drawing to canvas. PASS Video play callback succeeded. -PASS Video canplaythrough callback succeeded. -PASS successfullyParsed is true -TEST COMPLETE - 1798890 1 webkit-bug-importer 2021-09-30 09:08:55 -0700 <rdar://problem/83722125> 1798898 2 ayumi_kojima 2021-09-30 09:28:39 -0700 I was able to reproduce the timeout using run-webkit-tests fast/mediacapturefromelement/CanvasCaptureMediaStream-webgl-events.html -1 Test timed out with r283238 and passed with r283234. I was not able to test in-between because there are no revisions available to test. 1798900 3 youennf 2021-09-30 09:35:51 -0700 Probably https://trac.webkit.org/changeset/283238/webkit where WK2 impl is different from WK1. 1799219 4 kkinnunen 2021-10-01 02:56:43 -0700 *** Bug 230624 has been marked as a duplicate of this bug. *** 1799222 5 439836 kkinnunen 2021-10-01 03:23:31 -0700 Created attachment 439836 Patch 1799225 6 439836 youennf 2021-10-01 03:37:11 -0700 Comment on attachment 439836 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=439836&action=review > Source/WebCore/Modules/mediastream/CanvasCaptureMediaStreamTrack.h:81 > + Unnecessary > Source/WebCore/html/CanvasBase.h:146 > + HashSet<CanvasDisplayBufferObserver*> m_displayBufferObservers; Can we make these WeakHashSet by making CanvasDisplayBufferObserver a CanMakeWeakPtr<>? > Source/WebCore/html/HTMLCanvasElement.cpp:1062 > + // composited and thus doesn't need preparation. Unfortunately I am not sure we have tests with detached canvas, that might be worth adding, and making sure we match the spec or other browsers. 1799232 7 439839 kkinnunen 2021-10-01 05:03:21 -0700 Created attachment 439839 Patch 1799982 8 ews-feeder 2021-10-04 00:48:19 -0700 Committed r283489 (242462@main): <https://commits.webkit.org/242462@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 439839. 439836 2021-10-01 03:23:31 -0700 2021-10-01 05:03:15 -0700 Patch bug-231022-20211001132329.patch text/plain 10982 kkinnunen U3VidmVyc2lvbiBSZXZpc2lvbjogMjgzMzAzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMmRiZDQ2ZDQ2ZTU1ODQ3 MDMzMzQxYWIxMWFhZjllNzhmNDhiNzM3NS4uMjA3YjBkYzg2YjI3ZmZhMjZjOGE5MGMxNDE5YWY1 ZmQ0YzMzNzFiNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQyIEBACisyMDIxLTEwLTAxICBLaW1t byBLaW5udW5lbiAgPGtraW5udW5lbkBhcHBsZS5jb20+CisKKyAgICAgICAgUmVncmVzc2lvbiAo cjI4MzIzOClbIE1hY09TIHdrMSBdIGZhc3QvbWVkaWFjYXB0dXJlZnJvbWVsZW1lbnQvQ2FudmFz Q2FwdHVyZU1lZGlhU3RyZWFtLXdlYmdsLWV2ZW50cy5odG1sIGlzIHRpbWluZyBvdXQKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzMTAyMgorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIE9yaWdpbmFsbHkgdGhl IGltcGxlbWVudGF0aW9uIHdvdWxkIGFsd2F5cyByZXR1cm4gcmVkIGZyYW1lLCBhbmQgdGhlIHRl c3Qgd291bGQgcGFzcy4KKyAgICAgICAgcjI4MzIzOCBjaGFuZ2VkIHRoZSBpbXBsZW1lbnRhdGlv biB0byBub3QgcmV0dXJuIGEgc2FtcGxlIGlmIHRoZXJlIGlzIG5vdCBhIGRpc3BsYXkgYnVmZmVy LAorICAgICAgICBhcyBsb2dpY2FsbHkgc3VjaCBjYW5ub3QgYmUgdXNlZCBhcyBhIHNhbXBsZS4K KyAgICAgICAgVGhpcyBicm9rZSB0aGUgdGVzdCBjYXNlIHNpbmNlIHRoZSBDYW52YXNDYXB0dXJl TWVkaWFTdHJlYW1UcmFjayB3b3VsZCB0cnkgdG8gY2FwdHVyZQorICAgICAgICB0aGUgY2FudmFz IGRpc3BsYXkgYnVmZmVyIGR1cmluZyBuZXh0IHJ1bmxvb3AgaXRlcmF0aW9uICgwcyB0aW1lb3V0 KSBhZnRlciBlYWNoIG1vZGlmaWNhdGlvbi4KKyAgICAgICAgVGhpcyBkb2VzIG5vdCB3b3JrLCBh cyB0aGUgZGlzcGxheSBidWZmZXIgaXMgY29tcG9zZWQgZHVyaW5nICJwcmVwYXJlIGZvciBkaXNw bGF5IgorICAgICAgICBwaGFzZS4KKworICAgICAgICBBZGQgQ2FudmFzQmFzZSBvYnNlcnZlcnMg dG8gb2JzZXJ2ZSB0aGF0IGRpc3BsYXkgYnVmZmVyIGhhcyBiZWVuIHByZXBhcmVkLCBhbmQgY2Fw dHVyZQorICAgICAgICB0aGUgbWVkaWEgc2FtcGxlIGFmdGVyIHRoYXQgb2JzZXJ2ZXIgaGFzIGZp cmVkLgorCisgICAgICAgIFRoZSB0ZXN0IHdvdWxkIHdvcmsgZm9yIHdrMiBkdWUgdG8gdGltaW5n IHJlbGF0ZWQgZGlmZmVyZW5jZXMsIHByZXBhcmF0aW9uIHdvdWxkIGhhdmUKKyAgICAgICAgdHlw aWNhbGx5IHJ1biBiZWZvcmUgdGhlIGNhbnZhcyBjYXB0dXJlIDBzIHRpbWVvdXQuCisKKyAgICAg ICAgRml4ZXMgZmFzdC9tZWRpYXN0cmVhbS9jYXB0dXJlU3RyZWFtL2NhbnZhczNkLmh0bWwgZm9y IHdrMS4KKworICAgICAgICAqIE1vZHVsZXMvbWVkaWFzdHJlYW0vQ2FudmFzQ2FwdHVyZU1lZGlh U3RyZWFtVHJhY2suY3BwOgorICAgICAgICAoV2ViQ29yZTo6Q2FudmFzQ2FwdHVyZU1lZGlhU3Ry ZWFtVHJhY2s6OlNvdXJjZTo6c3RhcnRQcm9kdWNpbmdEYXRhKToKKyAgICAgICAgKFdlYkNvcmU6 OkNhbnZhc0NhcHR1cmVNZWRpYVN0cmVhbVRyYWNrOjpTb3VyY2U6OmNhbnZhc0NoYW5nZWQpOgor ICAgICAgICAoV2ViQ29yZTo6Q2FudmFzQ2FwdHVyZU1lZGlhU3RyZWFtVHJhY2s6OlNvdXJjZTo6 Y2FudmFzRGlzcGxheUJ1ZmZlclByZXBhcmVkKToKKyAgICAgICAgKiBNb2R1bGVzL21lZGlhc3Ry ZWFtL0NhbnZhc0NhcHR1cmVNZWRpYVN0cmVhbVRyYWNrLmg6CisgICAgICAgICogaHRtbC9DYW52 YXNCYXNlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkNhbnZhc0Jhc2U6OmFkZERpc3BsYXlCdWZm ZXJPYnNlcnZlcik6CisgICAgICAgIChXZWJDb3JlOjpDYW52YXNCYXNlOjpyZW1vdmVEaXNwbGF5 QnVmZmVyT2JzZXJ2ZXIpOgorICAgICAgICAoV2ViQ29yZTo6Q2FudmFzQmFzZTo6bm90aWZ5T2Jz ZXJ2ZXJzQ2FudmFzRGlzcGxheUJ1ZmZlclByZXBhcmVkKToKKyAgICAgICAgKiBodG1sL0NhbnZh c0Jhc2UuaDoKKyAgICAgICAgKFdlYkNvcmU6OkNhbnZhc0Jhc2U6Omhhc0Rpc3BsYXlCdWZmZXJP YnNlcnZlcnMgY29uc3QpOgorICAgICAgICAqIGh0bWwvY2FudmFzL1dlYkdMUmVuZGVyaW5nQ29u dGV4dEJhc2UuY3BwOgorICAgICAgICAoV2ViQ29yZTo6V2ViR0xSZW5kZXJpbmdDb250ZXh0QmFz ZTo6cHJlcGFyZUZvckRpc3BsYXkpOgorICAgICAgICBNb3ZlIHRoZSAicHJlcGFyZSBvbmx5IHdo ZW4gdGhlIG93bmVyIGVsZW1lbnQgaXMgaW4gdGhlIHRyZWUiIGxvZ2ljIHRvCisgICAgICAgIGl0 cyBjb3JyZWN0IHBsYWNlIHRvIHRoZSBjYWxsZXIsIGUuZy4gdG8gdGhlIGVsZW1lbnQgaXRzZWxm LgorCiAyMDIxLTA5LTMwICBLaW1tbyBLaW5udW5lbiAgPGtraW5udW5lbkBhcHBsZS5jb20+CiAK ICAgICAgICAgU2NvcGVkRUdMRGVmYXVsdERpc3BsYXkgc2hvdWxkIGJlIHJlbW92ZWQKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFzdHJlYW0vQ2FudmFzQ2FwdHVyZU1l ZGlhU3RyZWFtVHJhY2suY3BwIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYXN0cmVhbS9D YW52YXNDYXB0dXJlTWVkaWFTdHJlYW1UcmFjay5jcHAKaW5kZXggNGI1NmQ5YzFmOTFmZWRjZmIy NmNkYzRiMmYwYzdmZWEyNmIzNWM1Yi4uNWMwYjU2YzBmMzIzYTU5Mjc3MGE4NGViYjRlNjkwMWVk ODI4NWE4NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYXN0cmVhbS9D YW52YXNDYXB0dXJlTWVkaWFTdHJlYW1UcmFjay5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvTW9k dWxlcy9tZWRpYXN0cmVhbS9DYW52YXNDYXB0dXJlTWVkaWFTdHJlYW1UcmFjay5jcHAKQEAgLTg5 LDYgKzg5LDcgQEAgdm9pZCBDYW52YXNDYXB0dXJlTWVkaWFTdHJlYW1UcmFjazo6U291cmNlOjpz dGFydFByb2R1Y2luZ0RhdGEoKQogICAgIGlmICghbV9jYW52YXMpCiAgICAgICAgIHJldHVybjsK ICAgICBtX2NhbnZhcy0+YWRkT2JzZXJ2ZXIoKnRoaXMpOworICAgIG1fY2FudmFzLT5hZGREaXNw bGF5QnVmZmVyT2JzZXJ2ZXIoKnRoaXMpOwogCiAgICAgaWYgKCFtX2ZyYW1lUmVxdWVzdFJhdGUp CiAgICAgICAgIHJldHVybjsKQEAgLTEwNCw2ICsxMDUsNyBAQCB2b2lkIENhbnZhc0NhcHR1cmVN ZWRpYVN0cmVhbVRyYWNrOjpTb3VyY2U6OnN0b3BQcm9kdWNpbmdEYXRhKCkKICAgICBpZiAoIW1f Y2FudmFzKQogICAgICAgICByZXR1cm47CiAgICAgbV9jYW52YXMtPnJlbW92ZU9ic2VydmVyKCp0 aGlzKTsKKyAgICBtX2NhbnZhcy0+cmVtb3ZlRGlzcGxheUJ1ZmZlck9ic2VydmVyKCp0aGlzKTsK IH0KIAogdm9pZCBDYW52YXNDYXB0dXJlTWVkaWFTdHJlYW1UcmFjazo6U291cmNlOjpyZXF1ZXN0 RnJhbWVUaW1lckZpcmVkKCkKQEAgLTE1MiwxMyArMTU0LDI4IEBAIHZvaWQgQ2FudmFzQ2FwdHVy ZU1lZGlhU3RyZWFtVHJhY2s6OlNvdXJjZTo6Y2FudmFzUmVzaXplZChDYW52YXNCYXNlJiBjYW52 YXMpCiB2b2lkIENhbnZhc0NhcHR1cmVNZWRpYVN0cmVhbVRyYWNrOjpTb3VyY2U6OmNhbnZhc0No YW5nZWQoQ2FudmFzQmFzZSYgY2FudmFzLCBjb25zdCBzdGQ6Om9wdGlvbmFsPEZsb2F0UmVjdD4m KQogewogICAgIEFTU0VSVF9VTlVTRUQoY2FudmFzLCBtX2NhbnZhcyA9PSAmY2FudmFzKTsKKyAg ICBpZiAobV9jYW52YXMtPnJlbmRlcmluZ0NvbnRleHQoKSAmJiBtX2NhbnZhcy0+cmVuZGVyaW5n Q29udGV4dCgpLT5uZWVkc1ByZXBhcmF0aW9uRm9yRGlzcGxheSgpKQorICAgICAgICByZXR1cm47 CisgICAgc2NoZWR1bGVDYXB0dXJlQ2FudmFzKCk7Cit9CiAKK3ZvaWQgQ2FudmFzQ2FwdHVyZU1l ZGlhU3RyZWFtVHJhY2s6OlNvdXJjZTo6c2NoZWR1bGVDYXB0dXJlQ2FudmFzKCkKK3sKICAgICAv LyBGSVhNRTogV2Ugc2hvdWxkIHRyeSB0byBnZW5lcmF0ZSB0aGUgZnJhbWUgYXQgdGhlIHRpbWUg dGhlIHNjcmVlbiBpcyBiZWluZyB1cGRhdGVkLgogICAgIGlmIChtX2NhcHR1cmVDYW52YXNUaW1l ci5pc0FjdGl2ZSgpKQogICAgICAgICByZXR1cm47CiAgICAgbV9jYXB0dXJlQ2FudmFzVGltZXIu c3RhcnRPbmVTaG90KDBfcyk7CiB9CiAKK3ZvaWQgQ2FudmFzQ2FwdHVyZU1lZGlhU3RyZWFtVHJh Y2s6OlNvdXJjZTo6Y2FudmFzRGlzcGxheUJ1ZmZlclByZXBhcmVkKENhbnZhc0Jhc2UmIGNhbnZh cykKK3sKKyAgICBBU1NFUlRfVU5VU0VEKGNhbnZhcywgbV9jYW52YXMgPT0gJmNhbnZhcyk7Cisg ICAgLy8gRklYTUU6IEhlcmUgd2Ugc2hvdWxkIGNhcHR1cmUgdGhlIGltYWdlIGluc3RlYWQuCisg ICAgLy8gSG93ZXZlciwgc3VibWl0dGluZyB0aGUgc2FtcGxlIHRvIHRoZSByZWNlaXZlciBtaWdo dCBjYXVzZSBsYXlvdXQsCisgICAgLy8gYW5kIGN1cnJlbnRseSB0aGUgZGlzcGxheSBwcmVwYXJh dGlvbiBpcyBkb25lIGFmdGVyIGxheW91dC4KKyAgICBzY2hlZHVsZUNhcHR1cmVDYW52YXMoKTsK K30KKwogdm9pZCBDYW52YXNDYXB0dXJlTWVkaWFTdHJlYW1UcmFjazo6U291cmNlOjpjYXB0dXJl Q2FudmFzKCkKIHsKICAgICBBU1NFUlQobV9jYW52YXMpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvTW9kdWxlcy9tZWRpYXN0cmVhbS9DYW52YXNDYXB0dXJlTWVkaWFTdHJlYW1UcmFjay5o IGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYXN0cmVhbS9DYW52YXNDYXB0dXJlTWVkaWFT dHJlYW1UcmFjay5oCmluZGV4IGI3ZDA0ZGI0MDNhNmExODFiMTE1NzRkYWEwNGM3MjJhMTliMDQ5 NDEuLmM1MGIyODk0ZDcwYzYyMjljMGFkM2Y1MmFmZmFkYWI2MmE2ZTE0Y2QgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFzdHJlYW0vQ2FudmFzQ2FwdHVyZU1lZGlhU3Ry ZWFtVHJhY2suaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhc3RyZWFtL0NhbnZh c0NhcHR1cmVNZWRpYVN0cmVhbVRyYWNrLmgKQEAgLTUwLDcgKzUwLDcgQEAgcHVibGljOgogcHJp dmF0ZToKICAgICBjb25zdCBjaGFyKiBhY3RpdmVET01PYmplY3ROYW1lKCkgY29uc3Qgb3ZlcnJp ZGU7CiAKLSAgICBjbGFzcyBTb3VyY2UgZmluYWwgOiBwdWJsaWMgUmVhbHRpbWVNZWRpYVNvdXJj ZSwgcHJpdmF0ZSBDYW52YXNPYnNlcnZlciB7CisgICAgY2xhc3MgU291cmNlIGZpbmFsIDogcHVi bGljIFJlYWx0aW1lTWVkaWFTb3VyY2UsIHByaXZhdGUgQ2FudmFzT2JzZXJ2ZXIsIHByaXZhdGUg Q2FudmFzRGlzcGxheUJ1ZmZlck9ic2VydmVyIHsKICAgICBwdWJsaWM6CiAgICAgICAgIHN0YXRp YyBSZWY8U291cmNlPiBjcmVhdGUoSFRNTENhbnZhc0VsZW1lbnQmLCBzdGQ6Om9wdGlvbmFsPGRv dWJsZT4mJiBmcmFtZVJlcXVlc3RSYXRlKTsKICAgICAgICAgCkBAIC02MCwyMSArNjAsMjUgQEAg cHJpdmF0ZToKICAgICBwcml2YXRlOgogICAgICAgICBTb3VyY2UoSFRNTENhbnZhc0VsZW1lbnQm LCBzdGQ6Om9wdGlvbmFsPGRvdWJsZT4mJik7CiAKLSAgICAgICAgLy8gQ2FudmFzT2JzZXJ2ZXIg QVBJCisgICAgICAgIC8vIENhbnZhc09ic2VydmVyIG92ZXJyaWRlcy4KICAgICAgICAgdm9pZCBj YW52YXNDaGFuZ2VkKENhbnZhc0Jhc2UmLCBjb25zdCBzdGQ6Om9wdGlvbmFsPEZsb2F0UmVjdD4m KSBmaW5hbDsKICAgICAgICAgdm9pZCBjYW52YXNSZXNpemVkKENhbnZhc0Jhc2UmKSBmaW5hbDsK ICAgICAgICAgdm9pZCBjYW52YXNEZXN0cm95ZWQoQ2FudmFzQmFzZSYpIGZpbmFsOwogCi0gICAg ICAgIC8vIFJlYWx0aW1lTWVkaWFTb3VyY2UgQVBJCisgICAgICAgIC8vIENhbnZhc0Rpc3BsYXlC dWZmZXJPYnNlcnZlciBvdmVycmlkZXMuCisgICAgICAgIHZvaWQgY2FudmFzRGlzcGxheUJ1ZmZl clByZXBhcmVkKENhbnZhc0Jhc2UmKSBmaW5hbDsKKworICAgICAgICAvLyBSZWFsdGltZU1lZGlh U291cmNlIG92ZXJyaWRlcy4KICAgICAgICAgdm9pZCBzdGFydFByb2R1Y2luZ0RhdGEoKSBmaW5h bDsKICAgICAgICAgdm9pZCBzdG9wUHJvZHVjaW5nRGF0YSgpICBmaW5hbDsKICAgICAgICAgY29u c3QgUmVhbHRpbWVNZWRpYVNvdXJjZUNhcGFiaWxpdGllcyYgY2FwYWJpbGl0aWVzKCkgZmluYWwg eyByZXR1cm4gUmVhbHRpbWVNZWRpYVNvdXJjZUNhcGFiaWxpdGllczo6ZW1wdHlDYXBhYmlsaXRp ZXMoKTsgfQogICAgICAgICBjb25zdCBSZWFsdGltZU1lZGlhU291cmNlU2V0dGluZ3MmIHNldHRp bmdzKCkgZmluYWw7CiAgICAgICAgIHZvaWQgc2V0dGluZ3NEaWRDaGFuZ2UoT3B0aW9uU2V0PFJl YWx0aW1lTWVkaWFTb3VyY2VTZXR0aW5nczo6RmxhZz4pIGZpbmFsOwotCisgICAgICAgIHZvaWQg c2NoZWR1bGVDYXB0dXJlQ2FudmFzKCk7CiAgICAgICAgIHZvaWQgY2FwdHVyZUNhbnZhcygpOwog ICAgICAgICB2b2lkIHJlcXVlc3RGcmFtZVRpbWVyRmlyZWQoKTsKIAorCiAgICAgICAgIGJvb2wg bV9zaG91bGRFbWl0RnJhbWUgeyB0cnVlIH07CiAgICAgICAgIHN0ZDo6b3B0aW9uYWw8ZG91Ymxl PiBtX2ZyYW1lUmVxdWVzdFJhdGU7CiAgICAgICAgIFRpbWVyIG1fcmVxdWVzdEZyYW1lVGltZXI7 CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9odG1sL0NhbnZhc0Jhc2UuY3BwIGIvU291cmNl L1dlYkNvcmUvaHRtbC9DYW52YXNCYXNlLmNwcAppbmRleCA1YmJkOTdkMDBkNjg3YjZiOTI4M2E1 YmRhY2E1YmY4YjJkOTFiM2Q0Li45NDE1OWQwODEzMWZkYTE5OTE0ZTA1NTBlOWIzZmE2NmUzMmU5 ZmQyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9odG1sL0NhbnZhc0Jhc2UuY3BwCisrKyBi L1NvdXJjZS9XZWJDb3JlL2h0bWwvQ2FudmFzQmFzZS5jcHAKQEAgLTE2Miw2ICsxNjIsMjIgQEAg dm9pZCBDYW52YXNCYXNlOjpub3RpZnlPYnNlcnZlcnNDYW52YXNEZXN0cm95ZWQoKQogI2VuZGlm CiB9CiAKK3ZvaWQgQ2FudmFzQmFzZTo6YWRkRGlzcGxheUJ1ZmZlck9ic2VydmVyKENhbnZhc0Rp c3BsYXlCdWZmZXJPYnNlcnZlciYgb2JzZXJ2ZXIpCit7CisgICAgbV9kaXNwbGF5QnVmZmVyT2Jz ZXJ2ZXJzLmFkZCgmb2JzZXJ2ZXIpOworfQorCit2b2lkIENhbnZhc0Jhc2U6OnJlbW92ZURpc3Bs YXlCdWZmZXJPYnNlcnZlcihDYW52YXNEaXNwbGF5QnVmZmVyT2JzZXJ2ZXImIG9ic2VydmVyKQor eworICAgIG1fZGlzcGxheUJ1ZmZlck9ic2VydmVycy5yZW1vdmUoJm9ic2VydmVyKTsKK30KKwor dm9pZCBDYW52YXNCYXNlOjpub3RpZnlPYnNlcnZlcnNDYW52YXNEaXNwbGF5QnVmZmVyUHJlcGFy ZWQoKQoreworICAgIGZvciAoYXV0byYgb2JzZXJ2ZXIgOiBtX2Rpc3BsYXlCdWZmZXJPYnNlcnZl cnMpCisgICAgICAgIG9ic2VydmVyLT5jYW52YXNEaXNwbGF5QnVmZmVyUHJlcGFyZWQoKnRoaXMp OworfQorCiBIYXNoU2V0PEVsZW1lbnQqPiBDYW52YXNCYXNlOjpjc3NDYW52YXNDbGllbnRzKCkg Y29uc3QKIHsKICAgICBIYXNoU2V0PEVsZW1lbnQqPiBjc3NDYW52YXNDbGllbnRzOwpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvaHRtbC9DYW52YXNCYXNlLmggYi9Tb3VyY2UvV2ViQ29yZS9o dG1sL0NhbnZhc0Jhc2UuaAppbmRleCA4NGJiZGZkZmY3NjI1ZTc3NGQzZjIwZDc2ZTgwZWY4MGMy MmMzYWE3Li4yMTU3M2RlYzExY2IzZjUwNGU5N2Q0ZWI2NjE3YWE1YmNiOWQwZjU4IDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9odG1sL0NhbnZhc0Jhc2UuaAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9odG1sL0NhbnZhc0Jhc2UuaApAQCAtNTQsNiArNTQsMTMgQEAgcHVibGljOgogICAgIHZpcnR1 YWwgdm9pZCBjYW52YXNEZXN0cm95ZWQoQ2FudmFzQmFzZSYpID0gMDsKIH07CiAKK2NsYXNzIENh bnZhc0Rpc3BsYXlCdWZmZXJPYnNlcnZlciB7CitwdWJsaWM6CisgICAgdmlydHVhbCB+Q2FudmFz RGlzcGxheUJ1ZmZlck9ic2VydmVyKCkgPSBkZWZhdWx0OworCisgICAgdmlydHVhbCB2b2lkIGNh bnZhc0Rpc3BsYXlCdWZmZXJQcmVwYXJlZChDYW52YXNCYXNlJikgPSAwOworfTsKKwogY2xhc3Mg Q2FudmFzQmFzZSB7CiBwdWJsaWM6CiAgICAgdmlydHVhbCB+Q2FudmFzQmFzZSgpOwpAQCAtOTIs NiArOTksMTAgQEAgcHVibGljOgogICAgIHZvaWQgbm90aWZ5T2JzZXJ2ZXJzQ2FudmFzQ2hhbmdl ZChjb25zdCBzdGQ6Om9wdGlvbmFsPEZsb2F0UmVjdD4mKTsKICAgICB2b2lkIG5vdGlmeU9ic2Vy dmVyc0NhbnZhc1Jlc2l6ZWQoKTsKICAgICB2b2lkIG5vdGlmeU9ic2VydmVyc0NhbnZhc0Rlc3Ry b3llZCgpOyAvLyBNdXN0IGJlIGNhbGxlZCBpbiBkZXN0cnVjdGlvbiBiZWZvcmUgY2xlYXJpbmcg bV9jb250ZXh0LgorICAgIHZvaWQgYWRkRGlzcGxheUJ1ZmZlck9ic2VydmVyKENhbnZhc0Rpc3Bs YXlCdWZmZXJPYnNlcnZlciYpOworICAgIHZvaWQgcmVtb3ZlRGlzcGxheUJ1ZmZlck9ic2VydmVy KENhbnZhc0Rpc3BsYXlCdWZmZXJPYnNlcnZlciYpOworICAgIHZvaWQgbm90aWZ5T2JzZXJ2ZXJz Q2FudmFzRGlzcGxheUJ1ZmZlclByZXBhcmVkKCk7CisgICAgYm9vbCBoYXNEaXNwbGF5QnVmZmVy T2JzZXJ2ZXJzKCkgY29uc3QgeyByZXR1cm4gIW1fZGlzcGxheUJ1ZmZlck9ic2VydmVycy5pc0Vt cHR5KCk7IH0KIAogICAgIEhhc2hTZXQ8RWxlbWVudCo+IGNzc0NhbnZhc0NsaWVudHMoKSBjb25z dDsKIApAQCAtMTMyLDYgKzE0Myw3IEBAIHByaXZhdGU6CiAgICAgYm9vbCBtX2RpZE5vdGlmeU9i c2VydmVyc0NhbnZhc0Rlc3Ryb3llZCB7IGZhbHNlIH07CiAjZW5kaWYKICAgICBIYXNoU2V0PENh bnZhc09ic2VydmVyKj4gbV9vYnNlcnZlcnM7CisgICAgSGFzaFNldDxDYW52YXNEaXNwbGF5QnVm ZmVyT2JzZXJ2ZXIqPiBtX2Rpc3BsYXlCdWZmZXJPYnNlcnZlcnM7CiB9OwogCiB9IC8vIG5hbWVz cGFjZSBXZWJDb3JlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxDYW52YXNF bGVtZW50LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTENhbnZhc0VsZW1lbnQuY3BwCmlu ZGV4IDYyOTdhMGRkMjY4OGJiNWY3ODlhOTQ3ODM2ZGYxZGFmNmRiYzQyM2MuLjU0MjkzNTYxN2Jk Zjc1ODlhYmVmMWQ2NjViNzkzZTA1YzFhOGNhYmEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L2h0bWwvSFRNTENhbnZhc0VsZW1lbnQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRN TENhbnZhc0VsZW1lbnQuY3BwCkBAIC0xMDU0LDggKzEwNTQsMjEgQEAgdm9pZCBIVE1MQ2FudmFz RWxlbWVudDo6cHJlcGFyZUZvckRpc3BsYXkoKQogewogICAgIEFTU0VSVChuZWVkc1ByZXBhcmF0 aW9uRm9yRGlzcGxheSgpKTsKIAorICAgIGJvb2wgc2hvdWxkUHJlcGFyZSA9IHRydWU7CisgICAg Ly8gRklYTUU6IEN1cnJlbnRseSB0aGUgYmVsb3cgcHJlcGFyZSBza2lwIGxvZ2ljIGlzIGNvbnNl cnZhdGl2ZSBhbmQgYXBwbGllcyBvbmx5IHRvCisgICAgLy8gV2ViR0wgZWxlbWVudHMuCisgICAg aWYgKGlzPFdlYkdMUmVuZGVyaW5nQ29udGV4dEJhc2U+KG1fY29udGV4dCkpIHsKKyAgICAgICAg Ly8gSWYgdGhlIGNhbnZhcyBpcyBub3QgaW4gdGhlIGRvY3VtZW50IGJvZHksIHRoZW4gaXQgd29u J3QgYmUKKyAgICAgICAgLy8gY29tcG9zaXRlZCBhbmQgdGh1cyBkb2Vzbid0IG5lZWQgcHJlcGFy YXRpb24uIFVuZm9ydHVuYXRlbHkKKyAgICAgICAgLy8gaXQgY2FuJ3QgdGVsbCBhdCB0aGUgdGlt ZSBpdCB3YXMgYWRkZWQgdG8gdGhlIGxpc3QsIHNpbmNlIGl0CisgICAgICAgIC8vIGNvdWxkIGJl IGluc2VydGVkIG9yIHJlbW92ZWQgZnJvbSB0aGUgZG9jdW1lbnQgYm9keSBhZnRlcndhcmRzLgor ICAgICAgICBzaG91bGRQcmVwYXJlID0gaXNJblRyZWVTY29wZSgpIHx8IGhhc0Rpc3BsYXlCdWZm ZXJPYnNlcnZlcnMoKTsKKyAgICB9CisgICAgaWYgKCFzaG91bGRQcmVwYXJlKQorICAgICAgICBy ZXR1cm47CiAgICAgaWYgKG1fY29udGV4dCkKICAgICAgICAgbV9jb250ZXh0LT5wcmVwYXJlRm9y RGlzcGxheSgpOworICAgIG5vdGlmeU9ic2VydmVyc0NhbnZhc0Rpc3BsYXlCdWZmZXJQcmVwYXJl ZCgpOwogfQogCiBib29sIEhUTUxDYW52YXNFbGVtZW50Ojppc0NvbnRyb2xsZWRCeU9mZnNjcmVl bigpIGNvbnN0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9odG1sL2NhbnZhcy9XZWJHTFJl bmRlcmluZ0NvbnRleHRCYXNlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvY2FudmFzL1dlYkdM UmVuZGVyaW5nQ29udGV4dEJhc2UuY3BwCmluZGV4IDI4NGIwNTUzOTliZDBkMjNmZmEwNmNiNGJi MTdmN2E1NmMwNGNlMTIuLjM1Y2M3NzFjOWNmYWQyYWI1OTQwMWZlNTMxM2E0ZWE2NjQxNGFmYWYg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvY2FudmFzL1dlYkdMUmVuZGVyaW5nQ29u dGV4dEJhc2UuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvY2FudmFzL1dlYkdMUmVuZGVy aW5nQ29udGV4dEJhc2UuY3BwCkBAIC04MTc1LDE0ICs4MTc1LDYgQEAgdm9pZCBXZWJHTFJlbmRl cmluZ0NvbnRleHRCYXNlOjpwcmVwYXJlRm9yRGlzcGxheSgpCiAgICAgaWYgKCFtX2NvbnRleHQp CiAgICAgICAgIHJldHVybjsKIAotICAgIC8vIElmIHRoZSBjYW52YXMgaXMgbm90IGluIHRoZSBk b2N1bWVudCBib2R5LCB0aGVuIGl0IHdvbid0IGJlCi0gICAgLy8gY29tcG9zaXRlZCBhbmQgdGh1 cyBkb2Vzbid0IG5lZWQgcHJlcGFyYXRpb24uIFVuZm9ydHVuYXRlbHkKLSAgICAvLyBpdCBjYW4n dCB0ZWxsIGF0IHRoZSB0aW1lIGl0IHdhcyBhZGRlZCB0byB0aGUgbGlzdCwgc2luY2UgaXQKLSAg ICAvLyBjb3VsZCBiZSBpbnNlcnRlZCBvciByZW1vdmVkIGZyb20gdGhlIGRvY3VtZW50IGJvZHkg YWZ0ZXJ3YXJkcy4KLSAgICBhdXRvIGNhbnZhcyA9IGh0bWxDYW52YXMoKTsKLSAgICBpZiAoIWNh bnZhcyB8fCAhY2FudmFzLT5pc0luVHJlZVNjb3BlKCkpCi0gICAgICAgIHJldHVybjsKLQogICAg IG1fY29udGV4dC0+cHJlcGFyZUZvckRpc3BsYXkoKTsKIH0KIAo= 439839 2021-10-01 05:03:21 -0700 2021-10-04 00:48:21 -0700 Patch bug-231022-20211001150320.patch text/plain 11235 kkinnunen U3VidmVyc2lvbiBSZXZpc2lvbjogMjgzMzAzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMmRiZDQ2ZDQ2ZTU1ODQ3 MDMzMzQxYWIxMWFhZjllNzhmNDhiNzM3NS4uNTU5N2IxYTFhZmMyOGVjM2VhNjAwNzk4ODk4OGI1 Y2ExNzgzZjU0ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQyIEBACisyMDIxLTEwLTAxICBLaW1t byBLaW5udW5lbiAgPGtraW5udW5lbkBhcHBsZS5jb20+CisKKyAgICAgICAgUmVncmVzc2lvbiAo cjI4MzIzOClbIE1hY09TIHdrMSBdIGZhc3QvbWVkaWFjYXB0dXJlZnJvbWVsZW1lbnQvQ2FudmFz Q2FwdHVyZU1lZGlhU3RyZWFtLXdlYmdsLWV2ZW50cy5odG1sIGlzIHRpbWluZyBvdXQKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzMTAyMgorCisgICAg ICAgIFJldmlld2VkIGJ5IFlvdWVubiBGYWJsZXQuCisKKyAgICAgICAgT3JpZ2luYWxseSB0aGUg aW1wbGVtZW50YXRpb24gd291bGQgYWx3YXlzIHJldHVybiByZWQgZnJhbWUsIGFuZCB0aGUgdGVz dCB3b3VsZCBwYXNzLgorICAgICAgICByMjgzMjM4IGNoYW5nZWQgdGhlIGltcGxlbWVudGF0aW9u IHRvIG5vdCByZXR1cm4gYSBzYW1wbGUgaWYgdGhlcmUgaXMgbm90IGEgZGlzcGxheSBidWZmZXIs CisgICAgICAgIGFzIGxvZ2ljYWxseSBzdWNoIGNhbm5vdCBiZSB1c2VkIGFzIGEgc2FtcGxlLgor ICAgICAgICBUaGlzIGJyb2tlIHRoZSB0ZXN0IGNhc2Ugc2luY2UgdGhlIENhbnZhc0NhcHR1cmVN ZWRpYVN0cmVhbVRyYWNrIHdvdWxkIHRyeSB0byBjYXB0dXJlCisgICAgICAgIHRoZSBjYW52YXMg ZGlzcGxheSBidWZmZXIgZHVyaW5nIG5leHQgcnVubG9vcCBpdGVyYXRpb24gKDBzIHRpbWVvdXQp IGFmdGVyIGVhY2ggbW9kaWZpY2F0aW9uLgorICAgICAgICBUaGlzIGRvZXMgbm90IHdvcmssIGFz IHRoZSBkaXNwbGF5IGJ1ZmZlciBpcyBjb21wb3NlZCBkdXJpbmcgInByZXBhcmUgZm9yIGRpc3Bs YXkiCisgICAgICAgIHBoYXNlLgorCisgICAgICAgIEFkZCBDYW52YXNCYXNlIG9ic2VydmVycyB0 byBvYnNlcnZlIHRoYXQgZGlzcGxheSBidWZmZXIgaGFzIGJlZW4gcHJlcGFyZWQsIGFuZCBjYXB0 dXJlCisgICAgICAgIHRoZSBtZWRpYSBzYW1wbGUgYWZ0ZXIgdGhhdCBvYnNlcnZlciBoYXMgZmly ZWQuCisKKyAgICAgICAgVGhlIHRlc3Qgd291bGQgd29yayBmb3Igd2syIGR1ZSB0byB0aW1pbmcg cmVsYXRlZCBkaWZmZXJlbmNlcywgcHJlcGFyYXRpb24gd291bGQgaGF2ZQorICAgICAgICB0eXBp Y2FsbHkgcnVuIGJlZm9yZSB0aGUgY2FudmFzIGNhcHR1cmUgMHMgdGltZW91dC4KKworICAgICAg ICBGaXhlcyBmYXN0L21lZGlhc3RyZWFtL2NhcHR1cmVTdHJlYW0vY2FudmFzM2QuaHRtbCBmb3Ig d2sxLgorCisgICAgICAgICogTW9kdWxlcy9tZWRpYXN0cmVhbS9DYW52YXNDYXB0dXJlTWVkaWFT dHJlYW1UcmFjay5jcHA6CisgICAgICAgIChXZWJDb3JlOjpDYW52YXNDYXB0dXJlTWVkaWFTdHJl YW1UcmFjazo6U291cmNlOjpzdGFydFByb2R1Y2luZ0RhdGEpOgorICAgICAgICAoV2ViQ29yZTo6 Q2FudmFzQ2FwdHVyZU1lZGlhU3RyZWFtVHJhY2s6OlNvdXJjZTo6Y2FudmFzQ2hhbmdlZCk6Cisg ICAgICAgIChXZWJDb3JlOjpDYW52YXNDYXB0dXJlTWVkaWFTdHJlYW1UcmFjazo6U291cmNlOjpj YW52YXNEaXNwbGF5QnVmZmVyUHJlcGFyZWQpOgorICAgICAgICAqIE1vZHVsZXMvbWVkaWFzdHJl YW0vQ2FudmFzQ2FwdHVyZU1lZGlhU3RyZWFtVHJhY2suaDoKKyAgICAgICAgKiBodG1sL0NhbnZh c0Jhc2UuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Q2FudmFzQmFzZTo6YWRkRGlzcGxheUJ1ZmZl ck9ic2VydmVyKToKKyAgICAgICAgKFdlYkNvcmU6OkNhbnZhc0Jhc2U6OnJlbW92ZURpc3BsYXlC dWZmZXJPYnNlcnZlcik6CisgICAgICAgIChXZWJDb3JlOjpDYW52YXNCYXNlOjpub3RpZnlPYnNl cnZlcnNDYW52YXNEaXNwbGF5QnVmZmVyUHJlcGFyZWQpOgorICAgICAgICAqIGh0bWwvQ2FudmFz QmFzZS5oOgorICAgICAgICAoV2ViQ29yZTo6Q2FudmFzQmFzZTo6aGFzRGlzcGxheUJ1ZmZlck9i c2VydmVycyBjb25zdCk6CisgICAgICAgICogaHRtbC9jYW52YXMvV2ViR0xSZW5kZXJpbmdDb250 ZXh0QmFzZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpXZWJHTFJlbmRlcmluZ0NvbnRleHRCYXNl OjpwcmVwYXJlRm9yRGlzcGxheSk6CisgICAgICAgIE1vdmUgdGhlICJwcmVwYXJlIG9ubHkgd2hl biB0aGUgb3duZXIgZWxlbWVudCBpcyBpbiB0aGUgdHJlZSIgbG9naWMgdG8KKyAgICAgICAgaXRz IGNvcnJlY3QgcGxhY2UgdG8gdGhlIGNhbGxlciwgZS5nLiB0byB0aGUgZWxlbWVudCBpdHNlbGYu CisKIDIwMjEtMDktMzAgIEtpbW1vIEtpbm51bmVuICA8a2tpbm51bmVuQGFwcGxlLmNvbT4KIAog ICAgICAgICBTY29wZWRFR0xEZWZhdWx0RGlzcGxheSBzaG91bGQgYmUgcmVtb3ZlZApkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYXN0cmVhbS9DYW52YXNDYXB0dXJlTWVk aWFTdHJlYW1UcmFjay5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhc3RyZWFtL0Nh bnZhc0NhcHR1cmVNZWRpYVN0cmVhbVRyYWNrLmNwcAppbmRleCA0YjU2ZDljMWY5MWZlZGNmYjI2 Y2RjNGIyZjBjN2ZlYTI2YjM1YzViLi41YzBiNTZjMGYzMjNhNTkyNzcwYTg0ZWJiNGU2OTAxZWQ4 Mjg1YTg2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhc3RyZWFtL0Nh bnZhc0NhcHR1cmVNZWRpYVN0cmVhbVRyYWNrLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1 bGVzL21lZGlhc3RyZWFtL0NhbnZhc0NhcHR1cmVNZWRpYVN0cmVhbVRyYWNrLmNwcApAQCAtODks NiArODksNyBAQCB2b2lkIENhbnZhc0NhcHR1cmVNZWRpYVN0cmVhbVRyYWNrOjpTb3VyY2U6OnN0 YXJ0UHJvZHVjaW5nRGF0YSgpCiAgICAgaWYgKCFtX2NhbnZhcykKICAgICAgICAgcmV0dXJuOwog ICAgIG1fY2FudmFzLT5hZGRPYnNlcnZlcigqdGhpcyk7CisgICAgbV9jYW52YXMtPmFkZERpc3Bs YXlCdWZmZXJPYnNlcnZlcigqdGhpcyk7CiAKICAgICBpZiAoIW1fZnJhbWVSZXF1ZXN0UmF0ZSkK ICAgICAgICAgcmV0dXJuOwpAQCAtMTA0LDYgKzEwNSw3IEBAIHZvaWQgQ2FudmFzQ2FwdHVyZU1l ZGlhU3RyZWFtVHJhY2s6OlNvdXJjZTo6c3RvcFByb2R1Y2luZ0RhdGEoKQogICAgIGlmICghbV9j YW52YXMpCiAgICAgICAgIHJldHVybjsKICAgICBtX2NhbnZhcy0+cmVtb3ZlT2JzZXJ2ZXIoKnRo aXMpOworICAgIG1fY2FudmFzLT5yZW1vdmVEaXNwbGF5QnVmZmVyT2JzZXJ2ZXIoKnRoaXMpOwog fQogCiB2b2lkIENhbnZhc0NhcHR1cmVNZWRpYVN0cmVhbVRyYWNrOjpTb3VyY2U6OnJlcXVlc3RG cmFtZVRpbWVyRmlyZWQoKQpAQCAtMTUyLDEzICsxNTQsMjggQEAgdm9pZCBDYW52YXNDYXB0dXJl TWVkaWFTdHJlYW1UcmFjazo6U291cmNlOjpjYW52YXNSZXNpemVkKENhbnZhc0Jhc2UmIGNhbnZh cykKIHZvaWQgQ2FudmFzQ2FwdHVyZU1lZGlhU3RyZWFtVHJhY2s6OlNvdXJjZTo6Y2FudmFzQ2hh bmdlZChDYW52YXNCYXNlJiBjYW52YXMsIGNvbnN0IHN0ZDo6b3B0aW9uYWw8RmxvYXRSZWN0PiYp CiB7CiAgICAgQVNTRVJUX1VOVVNFRChjYW52YXMsIG1fY2FudmFzID09ICZjYW52YXMpOworICAg IGlmIChtX2NhbnZhcy0+cmVuZGVyaW5nQ29udGV4dCgpICYmIG1fY2FudmFzLT5yZW5kZXJpbmdD b250ZXh0KCktPm5lZWRzUHJlcGFyYXRpb25Gb3JEaXNwbGF5KCkpCisgICAgICAgIHJldHVybjsK KyAgICBzY2hlZHVsZUNhcHR1cmVDYW52YXMoKTsKK30KIAordm9pZCBDYW52YXNDYXB0dXJlTWVk aWFTdHJlYW1UcmFjazo6U291cmNlOjpzY2hlZHVsZUNhcHR1cmVDYW52YXMoKQorewogICAgIC8v IEZJWE1FOiBXZSBzaG91bGQgdHJ5IHRvIGdlbmVyYXRlIHRoZSBmcmFtZSBhdCB0aGUgdGltZSB0 aGUgc2NyZWVuIGlzIGJlaW5nIHVwZGF0ZWQuCiAgICAgaWYgKG1fY2FwdHVyZUNhbnZhc1RpbWVy LmlzQWN0aXZlKCkpCiAgICAgICAgIHJldHVybjsKICAgICBtX2NhcHR1cmVDYW52YXNUaW1lci5z dGFydE9uZVNob3QoMF9zKTsKIH0KIAordm9pZCBDYW52YXNDYXB0dXJlTWVkaWFTdHJlYW1UcmFj azo6U291cmNlOjpjYW52YXNEaXNwbGF5QnVmZmVyUHJlcGFyZWQoQ2FudmFzQmFzZSYgY2FudmFz KQoreworICAgIEFTU0VSVF9VTlVTRUQoY2FudmFzLCBtX2NhbnZhcyA9PSAmY2FudmFzKTsKKyAg ICAvLyBGSVhNRTogSGVyZSB3ZSBzaG91bGQgY2FwdHVyZSB0aGUgaW1hZ2UgaW5zdGVhZC4KKyAg ICAvLyBIb3dldmVyLCBzdWJtaXR0aW5nIHRoZSBzYW1wbGUgdG8gdGhlIHJlY2VpdmVyIG1pZ2h0 IGNhdXNlIGxheW91dCwKKyAgICAvLyBhbmQgY3VycmVudGx5IHRoZSBkaXNwbGF5IHByZXBhcmF0 aW9uIGlzIGRvbmUgYWZ0ZXIgbGF5b3V0LgorICAgIHNjaGVkdWxlQ2FwdHVyZUNhbnZhcygpOwor fQorCiB2b2lkIENhbnZhc0NhcHR1cmVNZWRpYVN0cmVhbVRyYWNrOjpTb3VyY2U6OmNhcHR1cmVD YW52YXMoKQogewogICAgIEFTU0VSVChtX2NhbnZhcyk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9Nb2R1bGVzL21lZGlhc3RyZWFtL0NhbnZhc0NhcHR1cmVNZWRpYVN0cmVhbVRyYWNrLmgg Yi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhc3RyZWFtL0NhbnZhc0NhcHR1cmVNZWRpYVN0 cmVhbVRyYWNrLmgKaW5kZXggYjdkMDRkYjQwM2E2YTE4MWIxMTU3NGRhYTA0YzcyMmExOWIwNDk0 MS4uOTgzM2FhNjEzZThmZGQwYWMwYTQ0OTc5NTFkMGVkNzQzNjgxZDgzNCAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYXN0cmVhbS9DYW52YXNDYXB0dXJlTWVkaWFTdHJl YW1UcmFjay5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFzdHJlYW0vQ2FudmFz Q2FwdHVyZU1lZGlhU3RyZWFtVHJhY2suaApAQCAtMzAsNiArMzAsNyBAQAogI2luY2x1ZGUgIk1l ZGlhU3RyZWFtVHJhY2suaCIKICNpbmNsdWRlICJUaW1lci5oIgogI2luY2x1ZGUgPHd0Zi9UeXBl Q2FzdHMuaD4KKyNpbmNsdWRlIDx3dGYvV2Vha1B0ci5oPgogCiBuYW1lc3BhY2UgV2ViQ29yZSB7 CiAKQEAgLTUwLDcgKzUxLDcgQEAgcHVibGljOgogcHJpdmF0ZToKICAgICBjb25zdCBjaGFyKiBh Y3RpdmVET01PYmplY3ROYW1lKCkgY29uc3Qgb3ZlcnJpZGU7CiAKLSAgICBjbGFzcyBTb3VyY2Ug ZmluYWwgOiBwdWJsaWMgUmVhbHRpbWVNZWRpYVNvdXJjZSwgcHJpdmF0ZSBDYW52YXNPYnNlcnZl ciB7CisgICAgY2xhc3MgU291cmNlIGZpbmFsIDogcHVibGljIFJlYWx0aW1lTWVkaWFTb3VyY2Us IHByaXZhdGUgQ2FudmFzT2JzZXJ2ZXIsIHByaXZhdGUgQ2FudmFzRGlzcGxheUJ1ZmZlck9ic2Vy dmVyIHsKICAgICBwdWJsaWM6CiAgICAgICAgIHN0YXRpYyBSZWY8U291cmNlPiBjcmVhdGUoSFRN TENhbnZhc0VsZW1lbnQmLCBzdGQ6Om9wdGlvbmFsPGRvdWJsZT4mJiBmcmFtZVJlcXVlc3RSYXRl KTsKICAgICAgICAgCkBAIC02MCwxOCArNjEsMjEgQEAgcHJpdmF0ZToKICAgICBwcml2YXRlOgog ICAgICAgICBTb3VyY2UoSFRNTENhbnZhc0VsZW1lbnQmLCBzdGQ6Om9wdGlvbmFsPGRvdWJsZT4m Jik7CiAKLSAgICAgICAgLy8gQ2FudmFzT2JzZXJ2ZXIgQVBJCisgICAgICAgIC8vIENhbnZhc09i c2VydmVyIG92ZXJyaWRlcy4KICAgICAgICAgdm9pZCBjYW52YXNDaGFuZ2VkKENhbnZhc0Jhc2Um LCBjb25zdCBzdGQ6Om9wdGlvbmFsPEZsb2F0UmVjdD4mKSBmaW5hbDsKICAgICAgICAgdm9pZCBj YW52YXNSZXNpemVkKENhbnZhc0Jhc2UmKSBmaW5hbDsKICAgICAgICAgdm9pZCBjYW52YXNEZXN0 cm95ZWQoQ2FudmFzQmFzZSYpIGZpbmFsOwogCi0gICAgICAgIC8vIFJlYWx0aW1lTWVkaWFTb3Vy Y2UgQVBJCisgICAgICAgIC8vIENhbnZhc0Rpc3BsYXlCdWZmZXJPYnNlcnZlciBvdmVycmlkZXMu CisgICAgICAgIHZvaWQgY2FudmFzRGlzcGxheUJ1ZmZlclByZXBhcmVkKENhbnZhc0Jhc2UmKSBm aW5hbDsKKworICAgICAgICAvLyBSZWFsdGltZU1lZGlhU291cmNlIG92ZXJyaWRlcy4KICAgICAg ICAgdm9pZCBzdGFydFByb2R1Y2luZ0RhdGEoKSBmaW5hbDsKICAgICAgICAgdm9pZCBzdG9wUHJv ZHVjaW5nRGF0YSgpICBmaW5hbDsKICAgICAgICAgY29uc3QgUmVhbHRpbWVNZWRpYVNvdXJjZUNh cGFiaWxpdGllcyYgY2FwYWJpbGl0aWVzKCkgZmluYWwgeyByZXR1cm4gUmVhbHRpbWVNZWRpYVNv dXJjZUNhcGFiaWxpdGllczo6ZW1wdHlDYXBhYmlsaXRpZXMoKTsgfQogICAgICAgICBjb25zdCBS ZWFsdGltZU1lZGlhU291cmNlU2V0dGluZ3MmIHNldHRpbmdzKCkgZmluYWw7CiAgICAgICAgIHZv aWQgc2V0dGluZ3NEaWRDaGFuZ2UoT3B0aW9uU2V0PFJlYWx0aW1lTWVkaWFTb3VyY2VTZXR0aW5n czo6RmxhZz4pIGZpbmFsOwotCisgICAgICAgIHZvaWQgc2NoZWR1bGVDYXB0dXJlQ2FudmFzKCk7 CiAgICAgICAgIHZvaWQgY2FwdHVyZUNhbnZhcygpOwogICAgICAgICB2b2lkIHJlcXVlc3RGcmFt ZVRpbWVyRmlyZWQoKTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaHRtbC9DYW52YXNC YXNlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvQ2FudmFzQmFzZS5jcHAKaW5kZXggNWJiZDk3 ZDAwZDY4N2I2YjkyODNhNWJkYWNhNWJmOGIyZDkxYjNkNC4uZDZjODY2MTJkZDBhM2FhNTYyMjkw ZTkyZDI1MjE1MzRjMjg3NjQ2NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaHRtbC9DYW52 YXNCYXNlLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL0NhbnZhc0Jhc2UuY3BwCkBAIC0x NjIsNiArMTYyLDIyIEBAIHZvaWQgQ2FudmFzQmFzZTo6bm90aWZ5T2JzZXJ2ZXJzQ2FudmFzRGVz dHJveWVkKCkKICNlbmRpZgogfQogCit2b2lkIENhbnZhc0Jhc2U6OmFkZERpc3BsYXlCdWZmZXJP YnNlcnZlcihDYW52YXNEaXNwbGF5QnVmZmVyT2JzZXJ2ZXImIG9ic2VydmVyKQoreworICAgIG1f ZGlzcGxheUJ1ZmZlck9ic2VydmVycy5hZGQoJm9ic2VydmVyKTsKK30KKwordm9pZCBDYW52YXNC YXNlOjpyZW1vdmVEaXNwbGF5QnVmZmVyT2JzZXJ2ZXIoQ2FudmFzRGlzcGxheUJ1ZmZlck9ic2Vy dmVyJiBvYnNlcnZlcikKK3sKKyAgICBtX2Rpc3BsYXlCdWZmZXJPYnNlcnZlcnMucmVtb3ZlKG9i c2VydmVyKTsKK30KKwordm9pZCBDYW52YXNCYXNlOjpub3RpZnlPYnNlcnZlcnNDYW52YXNEaXNw bGF5QnVmZmVyUHJlcGFyZWQoKQoreworICAgIGZvciAoYXV0byYgb2JzZXJ2ZXIgOiBtX2Rpc3Bs YXlCdWZmZXJPYnNlcnZlcnMpCisgICAgICAgIG9ic2VydmVyLmNhbnZhc0Rpc3BsYXlCdWZmZXJQ cmVwYXJlZCgqdGhpcyk7Cit9CisKIEhhc2hTZXQ8RWxlbWVudCo+IENhbnZhc0Jhc2U6OmNzc0Nh bnZhc0NsaWVudHMoKSBjb25zdAogewogICAgIEhhc2hTZXQ8RWxlbWVudCo+IGNzc0NhbnZhc0Ns aWVudHM7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9odG1sL0NhbnZhc0Jhc2UuaCBiL1Nv dXJjZS9XZWJDb3JlL2h0bWwvQ2FudmFzQmFzZS5oCmluZGV4IDg0YmJkZmRmZjc2MjVlNzc0ZDNm MjBkNzZlODBlZjgwYzIyYzNhYTcuLmRiNGE3M2M4ODBhOTcyM2NmOTMyNWI1MmM5NWNhNjBmZjZk ZDlmYzkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvQ2FudmFzQmFzZS5oCisrKyBi L1NvdXJjZS9XZWJDb3JlL2h0bWwvQ2FudmFzQmFzZS5oCkBAIC0yOCw2ICsyOCw3IEBACiAjaW5j bHVkZSAiSW50U2l6ZS5oIgogI2luY2x1ZGUgPHd0Zi9IYXNoU2V0Lmg+CiAjaW5jbHVkZSA8d3Rm L1R5cGVDYXN0cy5oPgorI2luY2x1ZGUgPHd0Zi9XZWFrSGFzaFNldC5oPgogCiBuYW1lc3BhY2Ug V2ViQ29yZSB7CiAKQEAgLTU0LDYgKzU1LDEzIEBAIHB1YmxpYzoKICAgICB2aXJ0dWFsIHZvaWQg Y2FudmFzRGVzdHJveWVkKENhbnZhc0Jhc2UmKSA9IDA7CiB9OwogCitjbGFzcyBDYW52YXNEaXNw bGF5QnVmZmVyT2JzZXJ2ZXIgOiBwdWJsaWMgQ2FuTWFrZVdlYWtQdHI8Q2FudmFzRGlzcGxheUJ1 ZmZlck9ic2VydmVyPiB7CitwdWJsaWM6CisgICAgdmlydHVhbCB+Q2FudmFzRGlzcGxheUJ1ZmZl ck9ic2VydmVyKCkgPSBkZWZhdWx0OworCisgICAgdmlydHVhbCB2b2lkIGNhbnZhc0Rpc3BsYXlC dWZmZXJQcmVwYXJlZChDYW52YXNCYXNlJikgPSAwOworfTsKKwogY2xhc3MgQ2FudmFzQmFzZSB7 CiBwdWJsaWM6CiAgICAgdmlydHVhbCB+Q2FudmFzQmFzZSgpOwpAQCAtOTIsNiArMTAwLDEwIEBA IHB1YmxpYzoKICAgICB2b2lkIG5vdGlmeU9ic2VydmVyc0NhbnZhc0NoYW5nZWQoY29uc3Qgc3Rk OjpvcHRpb25hbDxGbG9hdFJlY3Q+Jik7CiAgICAgdm9pZCBub3RpZnlPYnNlcnZlcnNDYW52YXNS ZXNpemVkKCk7CiAgICAgdm9pZCBub3RpZnlPYnNlcnZlcnNDYW52YXNEZXN0cm95ZWQoKTsgLy8g TXVzdCBiZSBjYWxsZWQgaW4gZGVzdHJ1Y3Rpb24gYmVmb3JlIGNsZWFyaW5nIG1fY29udGV4dC4K KyAgICB2b2lkIGFkZERpc3BsYXlCdWZmZXJPYnNlcnZlcihDYW52YXNEaXNwbGF5QnVmZmVyT2Jz ZXJ2ZXImKTsKKyAgICB2b2lkIHJlbW92ZURpc3BsYXlCdWZmZXJPYnNlcnZlcihDYW52YXNEaXNw bGF5QnVmZmVyT2JzZXJ2ZXImKTsKKyAgICB2b2lkIG5vdGlmeU9ic2VydmVyc0NhbnZhc0Rpc3Bs YXlCdWZmZXJQcmVwYXJlZCgpOworICAgIGJvb2wgaGFzRGlzcGxheUJ1ZmZlck9ic2VydmVycygp IGNvbnN0IHsgcmV0dXJuICFtX2Rpc3BsYXlCdWZmZXJPYnNlcnZlcnMuY29tcHV0ZXNFbXB0eSgp OyB9CiAKICAgICBIYXNoU2V0PEVsZW1lbnQqPiBjc3NDYW52YXNDbGllbnRzKCkgY29uc3Q7CiAK QEAgLTEzMiw2ICsxNDQsNyBAQCBwcml2YXRlOgogICAgIGJvb2wgbV9kaWROb3RpZnlPYnNlcnZl cnNDYW52YXNEZXN0cm95ZWQgeyBmYWxzZSB9OwogI2VuZGlmCiAgICAgSGFzaFNldDxDYW52YXNP YnNlcnZlcio+IG1fb2JzZXJ2ZXJzOworICAgIFdlYWtIYXNoU2V0PENhbnZhc0Rpc3BsYXlCdWZm ZXJPYnNlcnZlcj4gbV9kaXNwbGF5QnVmZmVyT2JzZXJ2ZXJzOwogfTsKIAogfSAvLyBuYW1lc3Bh Y2UgV2ViQ29yZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MQ2FudmFzRWxl bWVudC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxDYW52YXNFbGVtZW50LmNwcAppbmRl eCA2Mjk3YTBkZDI2ODhiYjVmNzg5YTk0NzgzNmRmMWRhZjZkYmM0MjNjLi5lMGJlZWM4MzIxZWZh YmIwOTY5MTI3YTg0ZGE5ZDIxNjQwMjA3ODVmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9o dG1sL0hUTUxDYW52YXNFbGVtZW50LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxD YW52YXNFbGVtZW50LmNwcApAQCAtMTA1NCw4ICsxMDU0LDIzIEBAIHZvaWQgSFRNTENhbnZhc0Vs ZW1lbnQ6OnByZXBhcmVGb3JEaXNwbGF5KCkKIHsKICAgICBBU1NFUlQobmVlZHNQcmVwYXJhdGlv bkZvckRpc3BsYXkoKSk7CiAKKyAgICBib29sIHNob3VsZFByZXBhcmUgPSB0cnVlOworI2lmIEVO QUJMRShXRUJHTCkKKyAgICAvLyBGSVhNRTogQ3VycmVudGx5IHRoZSBiZWxvdyBwcmVwYXJlIHNr aXAgbG9naWMgaXMgY29uc2VydmF0aXZlIGFuZCBhcHBsaWVzIG9ubHkgdG8KKyAgICAvLyBXZWJH TCBlbGVtZW50cy4KKyAgICBpZiAoaXM8V2ViR0xSZW5kZXJpbmdDb250ZXh0QmFzZT4obV9jb250 ZXh0KSkgeworICAgICAgICAvLyBJZiB0aGUgY2FudmFzIGlzIG5vdCBpbiB0aGUgZG9jdW1lbnQg Ym9keSwgdGhlbiBpdCB3b24ndCBiZQorICAgICAgICAvLyBjb21wb3NpdGVkIGFuZCB0aHVzIGRv ZXNuJ3QgbmVlZCBwcmVwYXJhdGlvbi4gVW5mb3J0dW5hdGVseQorICAgICAgICAvLyBpdCBjYW4n dCB0ZWxsIGF0IHRoZSB0aW1lIGl0IHdhcyBhZGRlZCB0byB0aGUgbGlzdCwgc2luY2UgaXQKKyAg ICAgICAgLy8gY291bGQgYmUgaW5zZXJ0ZWQgb3IgcmVtb3ZlZCBmcm9tIHRoZSBkb2N1bWVudCBi b2R5IGFmdGVyd2FyZHMuCisgICAgICAgIHNob3VsZFByZXBhcmUgPSBpc0luVHJlZVNjb3BlKCkg fHwgaGFzRGlzcGxheUJ1ZmZlck9ic2VydmVycygpOworICAgIH0KKyNlbmRpZgorICAgIGlmICgh c2hvdWxkUHJlcGFyZSkKKyAgICAgICAgcmV0dXJuOwogICAgIGlmIChtX2NvbnRleHQpCiAgICAg ICAgIG1fY29udGV4dC0+cHJlcGFyZUZvckRpc3BsYXkoKTsKKyAgICBub3RpZnlPYnNlcnZlcnND YW52YXNEaXNwbGF5QnVmZmVyUHJlcGFyZWQoKTsKIH0KIAogYm9vbCBIVE1MQ2FudmFzRWxlbWVu dDo6aXNDb250cm9sbGVkQnlPZmZzY3JlZW4oKSBjb25zdApkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvaHRtbC9jYW52YXMvV2ViR0xSZW5kZXJpbmdDb250ZXh0QmFzZS5jcHAgYi9Tb3VyY2Uv V2ViQ29yZS9odG1sL2NhbnZhcy9XZWJHTFJlbmRlcmluZ0NvbnRleHRCYXNlLmNwcAppbmRleCAy ODRiMDU1Mzk5YmQwZDIzZmZhMDZjYjRiYjE3ZjdhNTZjMDRjZTEyLi4zNWNjNzcxYzljZmFkMmFi NTk0MDFmZTUzMTNhNGVhNjY0MTRhZmFmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9odG1s L2NhbnZhcy9XZWJHTFJlbmRlcmluZ0NvbnRleHRCYXNlLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9odG1sL2NhbnZhcy9XZWJHTFJlbmRlcmluZ0NvbnRleHRCYXNlLmNwcApAQCAtODE3NSwxNCAr ODE3NSw2IEBAIHZvaWQgV2ViR0xSZW5kZXJpbmdDb250ZXh0QmFzZTo6cHJlcGFyZUZvckRpc3Bs YXkoKQogICAgIGlmICghbV9jb250ZXh0KQogICAgICAgICByZXR1cm47CiAKLSAgICAvLyBJZiB0 aGUgY2FudmFzIGlzIG5vdCBpbiB0aGUgZG9jdW1lbnQgYm9keSwgdGhlbiBpdCB3b24ndCBiZQot ICAgIC8vIGNvbXBvc2l0ZWQgYW5kIHRodXMgZG9lc24ndCBuZWVkIHByZXBhcmF0aW9uLiBVbmZv cnR1bmF0ZWx5Ci0gICAgLy8gaXQgY2FuJ3QgdGVsbCBhdCB0aGUgdGltZSBpdCB3YXMgYWRkZWQg dG8gdGhlIGxpc3QsIHNpbmNlIGl0Ci0gICAgLy8gY291bGQgYmUgaW5zZXJ0ZWQgb3IgcmVtb3Zl ZCBmcm9tIHRoZSBkb2N1bWVudCBib2R5IGFmdGVyd2FyZHMuCi0gICAgYXV0byBjYW52YXMgPSBo dG1sQ2FudmFzKCk7Ci0gICAgaWYgKCFjYW52YXMgfHwgIWNhbnZhcy0+aXNJblRyZWVTY29wZSgp KQotICAgICAgICByZXR1cm47Ci0KICAgICBtX2NvbnRleHQtPnByZXBhcmVGb3JEaXNwbGF5KCk7 CiB9CiAK