210916 2020-04-23 08:56:45 -0700 Regression after r260359 ([GTK][WPE] lowWatermarkPages() in MemoryPressureMonitor.cpp only searches the "low" value inside the first "Node" section) 2020-04-23 23:36:36 -0700 1 1 1 Unclassified WebKit WebKitGTK WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=210345 P2 Normal --- 1 psaavedra aperez aperez bugs-noreply clopez mcrha oldest_to_newest 1644784 0 psaavedra 2020-04-23 08:56:45 -0700 Changes in https://bugs.webkit.org/show_bug.cgi?id=210345 leaks file descriptors: ``` This change is leaking file handles. I see constant additions of the triple: /proc/meminfo /proc/zoneinfo /proc/18738/cgroup in `lsof -p PID`. It lasts up to the top opened files limit is reached. You should, in MemoryPressureMonitor::start(), fclose() those which had been opened, both in the 'continue' and in the end of the while() (not only after it, which handles the 'break' path). ``` Ref: https://bugs.webkit.org/show_bug.cgi?id=210345#c5 1644820 1 397355 aperez 2020-04-23 10:08:58 -0700 Created attachment 397355 Patch 1644837 2 397355 clopez 2020-04-23 10:25:43 -0700 Comment on attachment 397355 Patch interesting patch, looks good... but there are some build errors on the EWS. 1644900 3 397373 aperez 2020-04-23 12:18:44 -0700 Created attachment 397373 Patch v2 1644906 4 aperez 2020-04-23 12:26:40 -0700 (In reply to Carlos Alberto Lopez Perez from comment #2) > Comment on attachment 397355 [details] > Patch > > interesting patch, looks good... but there are some build errors on the EWS. Yes, I forgot to add one bit before uploading, it should be fixed now. 1644916 5 397373 clopez 2020-04-23 12:36:58 -0700 Comment on attachment 397373 Patch v2 r=me Looks nice! thanks 1644935 6 ews-feeder 2020-04-23 13:06:30 -0700 Committed r260592: <https://trac.webkit.org/changeset/260592> All reviewed patches have been landed. Closing bug and clearing flags on attachment 397373. 1645097 7 mcrha 2020-04-23 23:36:36 -0700 > precise if thy are eventually s/thy/they/ From the working point of view: seems to work properly. Thanks. 397355 2020-04-23 10:08:58 -0700 2020-04-23 12:18:36 -0700 Patch bug-210916-20200423200857.patch text/plain 5454 aperez U3VidmVyc2lvbiBSZXZpc2lvbjogMjYwNTczCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGY0ZTk4NjA4NjlhZTU2MDdh ODk3NjE1YjU1NjU1NTg0MmRjNGYzZjQuLjkxOWQwZWZmYmQwNjhhMDE2ZjQxZDc3NmYyZGIyMTc0 MWEwZjE1YTAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjcgQEAKKzIwMjAtMDQtMjMgIEFkcmlhbiBQ ZXJleiBkZSBDYXN0cm8gIDxhcGVyZXpAaWdhbGlhLmNvbT4KKworICAgICAgICBSZWdyZXNzaW9u IGFmdGVyIHIyNjAzNTkgKFtHVEtdW1dQRV0gbG93V2F0ZXJtYXJrUGFnZXMoKSBpbiBNZW1vcnlQ cmVzc3VyZU1vbml0b3IuY3BwIG9ubHkgc2VhcmNoZXMgdGhlICJsb3ciIHZhbHVlIGluc2lkZSB0 aGUgZmlyc3QgIk5vZGUiIHNlY3Rpb24pCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD0yMTA5MTYKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICBTd2l0Y2ggb3ZlciB0byB1c2luZyBhIEZpbGVIYW5kbGUgdHlwZSBi YXNlZCBvbiBzdGQ6OnVuaXF1ZV9wdHIgd2l0aCBhIGN1c3RvbSBkZWxldGVyIGFuZCBhbgorICAg ICAgICB1dGlsaXR5IGZ1bmN0aW9uIGZvciBvcGVuaW5nIGZpbGVzLiBUaGlzIG1ha2VzIGVhc2ll ciB0byBmb2xsb3cgdGhlIGxvZ2ljIGluc2lkZSB0aGUgcG9sbGluZworICAgICAgICBsb29wIGZv ciBvcGVuaW5nIGZpbGVzIGFuZCByZXRyeWluZyB3aGVuIG5lZWRlZC4gVGhpcyBhbHNvIGZpeGVz IGV4aXRpbmcgdGhlIHRocmVhZCB3aGVuIHRoZQorICAgICAgICBzeXN0ZW1NZW1vcnlVc2VkQXNQ ZXJjZW50YWdlKCkgZnVuY3Rpb24gd291bGQgcmV0dXJuIC0xLCB0byBsb29wIHJlc3RhcnQgaW5z dGVhZCB0byBrZWVwCisgICAgICAgIHRyeWluZy4KKworICAgICAgICBUaGFua3MgdG8gUGFibG8g U2FhdmVkcmEgZm9yIGhpcyBoZWxwIGluIG1ha2luZyB0aGlzIHBhdGNoLgorCisgICAgICAgIE5v IG5ldyB0ZXN0cyBuZWVkZWQuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvbGludXgvTWVtb3J5UHJl c3N1cmVNb25pdG9yLmNwcDoKKyAgICAgICAgKFdlYktpdDo6RmlsZUhhbmRsZURlbGV0ZXI6OmYp OiBBZGQgZGVsZXRlciB0byB1c2Ugd2l0aCBzdGQ6OnVuaXF1ZV9wdHI8Pi4KKyAgICAgICAgKFdl YktpdDo6dHJ5T3BlbmluZ0ZvclVuYnVmZmVyZWRSZWFkaW5nKTogQWRkIHV0aWxpdHkgZnVuY3Rp b24gdG8gb3BlbiBhIGZpbGUgaGFuZGxlIGlmCisgICAgICAgIG5lZWRlZCBhbmQgY29uZmlndXJp bmcgaXRzIGJ1ZmZlcmluZyB1cG9uIG9wZW5pbmcuCisgICAgICAgIChXZWJLaXQ6Ok1lbW9yeVBy ZXNzdXJlTW9uaXRvcjo6c3RhcnQpOiBVc2UgRmlsZUhhbmRsZSB0byBlbnN1cmUgdGhhdCBoYW5k bGVzIGFyZSBhbHdheXMKKyAgICAgICAgY2xvc2VkIHByb3Blcmx5LCBhbmQgZml4IGxvZ2ljIHJl dHJ5IG9wZW5pbmcgZmlsZXMgb24gZmFpbHVyZS4KKwogMjAyMC0wNC0yMyAgSm9obiBGcmFua2lz aCAgPGpvaG4uZnJhbmtpc2hAb3V0bG9vay5jb20+CiAKICAgICAgICAgW0dUS10gQ3Jhc2ggaW4g Y2Fpcm9fc3VyZmFjZV9tYXJrX2RpcnR5X3JlY3RhbmdsZSgpIGluIGFjY2VsZXJhdGVkIGNvbXBv c2l0aW5nIG1vZGUgdW5kZXIgWDExCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vz cy9saW51eC9NZW1vcnlQcmVzc3VyZU1vbml0b3IuY3BwIGIvU291cmNlL1dlYktpdC9VSVByb2Nl c3MvbGludXgvTWVtb3J5UHJlc3N1cmVNb25pdG9yLmNwcAppbmRleCA0OGE0Y2IyOGZkMDExNDQ2 NmJhODRkNjFiNDk0MWM5NzI3YmU3ODZhLi41MzI4ZmJjYjA5Y2RhNDdlMTdmYWFlMTJjYWNiZTk0 NGY3MmJmMmNlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9saW51eC9NZW1v cnlQcmVzc3VyZU1vbml0b3IuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2xpbnV4 L01lbW9yeVByZXNzdXJlTW9uaXRvci5jcHAKQEAgLTI5Nyw2ICsyOTcsMjkgQEAgTWVtb3J5UHJl c3N1cmVNb25pdG9yJiBNZW1vcnlQcmVzc3VyZU1vbml0b3I6OnNpbmdsZXRvbigpCiAgICAgcmV0 dXJuIG1lbW9yeU1vbml0b3I7CiB9CiAKK3N0cnVjdCBGaWxlSGFuZGxlRGVsZXRlciB7CisgICAg dm9pZCBvcGVyYXRvcihGSUxFKiBmKSgpIHsgZmNsb3NlKGYpOyB9Cit9OworCit1c2luZyBGaWxl SGFuZGxlID0gc3RkOjp1bmlxdWVfcHRyPEZJTEUsIEZpbGVIYW5kbGVEZWxldGVyPjsKKworc3Rh dGljIGJvb2wgdHJ5T3BlbmluZ0ZvclVuYnVmZmVyZWRSZWFkaW5nKEZpbGVIYW5kbGUmIGhhbmRs ZSwgY29uc3QgY2hhciogZmlsZVBhdGgpCit7CisgICAgLy8gQ2hlY2sgd2hldGhlciB0aGUgZmls ZSBoYW5kbGUgaXMgYWxyZWFkeSB2YWxpZC4KKyAgICBpZiAoaGFuZGxlKQorICAgICAgICByZXR1 cm4gdHJ1ZTsKKworICAgIC8vIEVsc2UsIHRyeSBvcGVuaW5nIGl0IGFuZCBkaXNhYmxlIGJ1ZmZl cmluZyBhZnRlciBvcGVuaW5nLgorICAgIGlmIChhdXRvKiBmID0gZm9wZW4oZmlsZVBhdGgsICJy IikpIHsKKyAgICAgICAgc2V0YnVmKGYsIG51bGxwdHIpOworICAgICAgICBoYW5kbGUucmVzZXQo Zik7CisgICAgICAgIHJldHVybiB0cnVlOworICAgIH0KKworICAgIC8vIENvdWxkIG5vdCBwcm9k dWNlIGEgdmFsaWQgaGFuZGxlLgorICAgIHJldHVybiBmYWxzZTsKK30KKwogdm9pZCBNZW1vcnlQ cmVzc3VyZU1vbml0b3I6OnN0YXJ0KCkKIHsKICAgICBpZiAobV9zdGFydGVkKQpAQCAtMzA1LDMx ICszMjgsMjcgQEAgdm9pZCBNZW1vcnlQcmVzc3VyZU1vbml0b3I6OnN0YXJ0KCkKICAgICBtX3N0 YXJ0ZWQgPSB0cnVlOwogCiAgICAgVGhyZWFkOjpjcmVhdGUoIk1lbW9yeVByZXNzdXJlTW9uaXRv ciIsIFtdIHsKLSAgICAgICAgRklMRSogbWVtSW5mb0ZpbGU7Ci0gICAgICAgIEZJTEUqIHpvbmVJ bmZvRmlsZTsKLSAgICAgICAgRklMRSogY2dyb3VwQ29udHJvbGxlckZpbGU7CisgICAgICAgIEZp bGVIYW5kbGUgbWVtSW5mb0ZpbGUsIHpvbmVJbmZvRmlsZSwgY2dyb3VwQ29udHJvbGxlckZpbGU7 CiAgICAgICAgIENHcm91cE1lbW9yeUNvbnRyb2xsZXIgbWVtb3J5Q29udHJvbGxlciA9IENHcm91 cE1lbW9yeUNvbnRyb2xsZXIoKTsKICAgICAgICAgU2Vjb25kcyBwb2xsSW50ZXJ2YWwgPSBzX21h eFBvbGxpbmdJbnRlcnZhbDsKICAgICAgICAgd2hpbGUgKHRydWUpIHsKICAgICAgICAgICAgIHNs ZWVwKHBvbGxJbnRlcnZhbCk7CiAKLSAgICAgICAgICAgIG1lbUluZm9GaWxlID0gZm9wZW4oc19w cm9jTWVtaW5mbywgInIiKTsKLSAgICAgICAgICAgIHpvbmVJbmZvRmlsZSA9IGZvcGVuKHNfcHJv Y1pvbmVpbmZvLCAiciIpOwotICAgICAgICAgICAgaWYgKCFtZW1JbmZvRmlsZSB8fCAhem9uZUlu Zm9GaWxlKQorICAgICAgICAgICAgLy8gQ2Fubm90IG9wZXJhdGUgd2l0aG91dCB0aGlzIG9uZSwg cmV0cnkgb3BlbmluZyBvbiB0aGUgbmV4dCBpdGVyYXRpb24gYWZ0ZXIgc2xlZXBpbmcuCisgICAg ICAgICAgICBpZiAoIXRyeU9wZW5pbmdGb3JVbmJ1ZmZlcmVkUmVhZGluZyhtZW1JbmZvRmlsZSwg c19wcm9jTWVtaW5mbykpCiAgICAgICAgICAgICAgICAgY29udGludWU7Ci0gICAgICAgICAgICBz ZXRidWYobWVtSW5mb0ZpbGUsIG51bGxwdHIpOwotICAgICAgICAgICAgc2V0YnVmKHpvbmVJbmZv RmlsZSwgbnVsbHB0cik7CiAKLSAgICAgICAgICAgIGNncm91cENvbnRyb2xsZXJGaWxlID0gZm9w ZW4oc19wcm9jU2VsZkNncm91cCwgInIiKTsKLSAgICAgICAgICAgIGlmIChjZ3JvdXBDb250cm9s bGVyRmlsZSkKLSAgICAgICAgICAgICAgICBzZXRidWYoY2dyb3VwQ29udHJvbGxlckZpbGUsIG51 bGxwdHIpOworICAgICAgICAgICAgLy8gVGhlIG1vbml0b3IgY2FuIHdvcmsgd2l0aG91dCB0aGVz ZSB0d28sIGJ1dCBpdCB3aWxsIGJlIG1vcmUgcHJlY2lzZSBpZiB0aHkgYXJlIGV2ZW50dWFsbHkg b3BlbmVkOiBrZWVwIHRyeWluZy4KKyAgICAgICAgICAgIHRyeU9wZW5pbmdGb3JVbmJ1ZmZlcmVk UmVhZGluZyh6b25lSW5mb0ZpbGUsIHNfcHJvY1pvbmVpbmZvKTsKKyAgICAgICAgICAgIHRyeU9w ZW5pbmdGb3JVbmJ1ZmZlcmVkUmVhZGluZyhjZ3JvdXBDb250cm9sbGVyRmlsZSwgc19wcm9jU2Vs ZkNncm91cCk7CiAKLSAgICAgICAgICAgIENTdHJpbmcgY2dyb3VwTWVtb3J5Q29udHJvbGxlclBh dGggPSBnZXRDZ3JvdXBDb250cm9sbGVyUGF0aChjZ3JvdXBDb250cm9sbGVyRmlsZSwgIm1lbW9y eSIpOworICAgICAgICAgICAgQ1N0cmluZyBjZ3JvdXBNZW1vcnlDb250cm9sbGVyUGF0aCA9IGdl dENncm91cENvbnRyb2xsZXJQYXRoKGNncm91cENvbnRyb2xsZXJGaWxlLmdldCgpLCAibWVtb3J5 Iik7CiAgICAgICAgICAgICBtZW1vcnlDb250cm9sbGVyLnNldE1lbW9yeUNvbnRyb2xsZXJQYXRo KGNncm91cE1lbW9yeUNvbnRyb2xsZXJQYXRoKTsKLSAgICAgICAgICAgIGludCB1c2VkUGVyY2Vu dGFnZSA9IHN5c3RlbU1lbW9yeVVzZWRBc1BlcmNlbnRhZ2UobWVtSW5mb0ZpbGUsIHpvbmVJbmZv RmlsZSwgJm1lbW9yeUNvbnRyb2xsZXIpOworICAgICAgICAgICAgaW50IHVzZWRQZXJjZW50YWdl ID0gc3lzdGVtTWVtb3J5VXNlZEFzUGVyY2VudGFnZShtZW1JbmZvRmlsZS5nZXQoKSwgem9uZUlu Zm9GaWxlLmdldCgpLCAmbWVtb3J5Q29udHJvbGxlcik7CiAgICAgICAgICAgICBpZiAodXNlZFBl cmNlbnRhZ2UgPT0gLTEpIHsKICAgICAgICAgICAgICAgICBXVEZMb2dBbHdheXMoIkZhaWxlZCB0 byBnZXQgdGhlIG1lbW9yeSB1c2FnZSIpOwotICAgICAgICAgICAgICAgIGJyZWFrOworICAgICAg ICAgICAgICAgIHBvbGxJbnRlcnZhbCA9IHNfbWF4UG9sbGluZ0ludGVydmFsOworICAgICAgICAg ICAgICAgIGNvbnRpbnVlOwogICAgICAgICAgICAgfQogCiAgICAgICAgICAgICBpZiAodXNlZFBl cmNlbnRhZ2UgPj0gc19tZW1vcnlQcmVzdXJlUGVyY2VudGFnZVRocmVzaG9sZCkgewpAQCAtMzM5 LDEyICszNTgsNiBAQCB2b2lkIE1lbW9yeVByZXNzdXJlTW9uaXRvcjo6c3RhcnQoKQogICAgICAg ICAgICAgfQogICAgICAgICAgICAgcG9sbEludGVydmFsID0gcG9sbEludGVydmFsRm9yVXNlZE1l bW9yeVBlcmNlbnRhZ2UodXNlZFBlcmNlbnRhZ2UpOwogICAgICAgICB9Ci0gICAgICAgIGlmICht ZW1JbmZvRmlsZSkKLSAgICAgICAgICAgIGZjbG9zZShtZW1JbmZvRmlsZSk7Ci0gICAgICAgIGlm ICh6b25lSW5mb0ZpbGUpCi0gICAgICAgICAgICBmY2xvc2Uoem9uZUluZm9GaWxlKTsKLSAgICAg ICAgaWYgKGNncm91cENvbnRyb2xsZXJGaWxlKQotICAgICAgICAgICAgZmNsb3NlKGNncm91cENv bnRyb2xsZXJGaWxlKTsKICAgICB9KS0+ZGV0YWNoKCk7CiB9CiAK 397373 2020-04-23 12:18:44 -0700 2020-04-23 13:06:31 -0700 Patch v2 bug-210916-20200423221842.patch text/plain 5463 aperez U3VidmVyc2lvbiBSZXZpc2lvbjogMjYwNTczCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGY0ZTk4NjA4NjlhZTU2MDdh ODk3NjE1YjU1NjU1NTg0MmRjNGYzZjQuLjBlNzQ4ZmUzZjk1ZWEyYjQzMmRlM2Q2NWM4ZGFhNzc0 YzJlZjFhNDAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjcgQEAKKzIwMjAtMDQtMjMgIEFkcmlhbiBQ ZXJleiBkZSBDYXN0cm8gIDxhcGVyZXpAaWdhbGlhLmNvbT4KKworICAgICAgICBSZWdyZXNzaW9u IGFmdGVyIHIyNjAzNTkgKFtHVEtdW1dQRV0gbG93V2F0ZXJtYXJrUGFnZXMoKSBpbiBNZW1vcnlQ cmVzc3VyZU1vbml0b3IuY3BwIG9ubHkgc2VhcmNoZXMgdGhlICJsb3ciIHZhbHVlIGluc2lkZSB0 aGUgZmlyc3QgIk5vZGUiIHNlY3Rpb24pCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD0yMTA5MTYKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICBTd2l0Y2ggb3ZlciB0byB1c2luZyBhIEZpbGVIYW5kbGUgdHlwZSBi YXNlZCBvbiBzdGQ6OnVuaXF1ZV9wdHIgd2l0aCBhIGN1c3RvbSBkZWxldGVyIGFuZCBhbgorICAg ICAgICB1dGlsaXR5IGZ1bmN0aW9uIGZvciBvcGVuaW5nIGZpbGVzLiBUaGlzIG1ha2VzIGVhc2ll ciB0byBmb2xsb3cgdGhlIGxvZ2ljIGluc2lkZSB0aGUgcG9sbGluZworICAgICAgICBsb29wIGZv ciBvcGVuaW5nIGZpbGVzIGFuZCByZXRyeWluZyB3aGVuIG5lZWRlZC4gVGhpcyBhbHNvIGZpeGVz IGV4aXRpbmcgdGhlIHRocmVhZCB3aGVuIHRoZQorICAgICAgICBzeXN0ZW1NZW1vcnlVc2VkQXNQ ZXJjZW50YWdlKCkgZnVuY3Rpb24gd291bGQgcmV0dXJuIC0xLCB0byBsb29wIHJlc3RhcnQgaW5z dGVhZCB0byBrZWVwCisgICAgICAgIHRyeWluZy4KKworICAgICAgICBUaGFua3MgdG8gUGFibG8g U2FhdmVkcmEgZm9yIGhpcyBoZWxwIGluIG1ha2luZyB0aGlzIHBhdGNoLgorCisgICAgICAgIE5v IG5ldyB0ZXN0cyBuZWVkZWQuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvbGludXgvTWVtb3J5UHJl c3N1cmVNb25pdG9yLmNwcDoKKyAgICAgICAgKFdlYktpdDo6RmlsZUhhbmRsZURlbGV0ZXI6Om9w ZXJhdG9yKCkpOiBBZGQgZGVsZXRlciB0byB1c2Ugd2l0aCBzdGQ6OnVuaXF1ZV9wdHI8Pi4KKyAg ICAgICAgKFdlYktpdDo6dHJ5T3BlbmluZ0ZvclVuYnVmZmVyZWRSZWFkaW5nKTogQWRkIHV0aWxp dHkgZnVuY3Rpb24gdG8gb3BlbiBhIGZpbGUgaGFuZGxlIGlmCisgICAgICAgIG5lZWRlZCBhbmQg Y29uZmlndXJpbmcgaXRzIGJ1ZmZlcmluZyB1cG9uIG9wZW5pbmcuCisgICAgICAgIChXZWJLaXQ6 Ok1lbW9yeVByZXNzdXJlTW9uaXRvcjo6c3RhcnQpOiBVc2UgRmlsZUhhbmRsZSB0byBlbnN1cmUg dGhhdCBoYW5kbGVzIGFyZSBhbHdheXMKKyAgICAgICAgY2xvc2VkIHByb3Blcmx5LCBhbmQgZml4 IGxvZ2ljIHJldHJ5IG9wZW5pbmcgZmlsZXMgb24gZmFpbHVyZS4KKwogMjAyMC0wNC0yMyAgSm9o biBGcmFua2lzaCAgPGpvaG4uZnJhbmtpc2hAb3V0bG9vay5jb20+CiAKICAgICAgICAgW0dUS10g Q3Jhc2ggaW4gY2Fpcm9fc3VyZmFjZV9tYXJrX2RpcnR5X3JlY3RhbmdsZSgpIGluIGFjY2VsZXJh dGVkIGNvbXBvc2l0aW5nIG1vZGUgdW5kZXIgWDExCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0 L1VJUHJvY2Vzcy9saW51eC9NZW1vcnlQcmVzc3VyZU1vbml0b3IuY3BwIGIvU291cmNlL1dlYktp dC9VSVByb2Nlc3MvbGludXgvTWVtb3J5UHJlc3N1cmVNb25pdG9yLmNwcAppbmRleCA0OGE0Y2Iy OGZkMDExNDQ2NmJhODRkNjFiNDk0MWM5NzI3YmU3ODZhLi5jM2NiYzg4ZTNlYWVjNTU3ODlkNzM4 YjdjOWZlYjkxZTcyMTMzNTJlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9s aW51eC9NZW1vcnlQcmVzc3VyZU1vbml0b3IuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9j ZXNzL2xpbnV4L01lbW9yeVByZXNzdXJlTW9uaXRvci5jcHAKQEAgLTI5Nyw2ICsyOTcsMjkgQEAg TWVtb3J5UHJlc3N1cmVNb25pdG9yJiBNZW1vcnlQcmVzc3VyZU1vbml0b3I6OnNpbmdsZXRvbigp CiAgICAgcmV0dXJuIG1lbW9yeU1vbml0b3I7CiB9CiAKK3N0cnVjdCBGaWxlSGFuZGxlRGVsZXRl ciB7CisgICAgdm9pZCBvcGVyYXRvcigpKEZJTEUqIGYpIHsgZmNsb3NlKGYpOyB9Cit9OworCit1 c2luZyBGaWxlSGFuZGxlID0gc3RkOjp1bmlxdWVfcHRyPEZJTEUsIEZpbGVIYW5kbGVEZWxldGVy PjsKKworc3RhdGljIGJvb2wgdHJ5T3BlbmluZ0ZvclVuYnVmZmVyZWRSZWFkaW5nKEZpbGVIYW5k bGUmIGhhbmRsZSwgY29uc3QgY2hhciogZmlsZVBhdGgpCit7CisgICAgLy8gQ2hlY2sgd2hldGhl ciB0aGUgZmlsZSBoYW5kbGUgaXMgYWxyZWFkeSB2YWxpZC4KKyAgICBpZiAoaGFuZGxlKQorICAg ICAgICByZXR1cm4gdHJ1ZTsKKworICAgIC8vIEVsc2UsIHRyeSBvcGVuaW5nIGl0IGFuZCBkaXNh YmxlIGJ1ZmZlcmluZyBhZnRlciBvcGVuaW5nLgorICAgIGlmIChhdXRvKiBmID0gZm9wZW4oZmls ZVBhdGgsICJyIikpIHsKKyAgICAgICAgc2V0YnVmKGYsIG51bGxwdHIpOworICAgICAgICBoYW5k bGUucmVzZXQoZik7CisgICAgICAgIHJldHVybiB0cnVlOworICAgIH0KKworICAgIC8vIENvdWxk IG5vdCBwcm9kdWNlIGEgdmFsaWQgaGFuZGxlLgorICAgIHJldHVybiBmYWxzZTsKK30KKwogdm9p ZCBNZW1vcnlQcmVzc3VyZU1vbml0b3I6OnN0YXJ0KCkKIHsKICAgICBpZiAobV9zdGFydGVkKQpA QCAtMzA1LDMxICszMjgsMjcgQEAgdm9pZCBNZW1vcnlQcmVzc3VyZU1vbml0b3I6OnN0YXJ0KCkK ICAgICBtX3N0YXJ0ZWQgPSB0cnVlOwogCiAgICAgVGhyZWFkOjpjcmVhdGUoIk1lbW9yeVByZXNz dXJlTW9uaXRvciIsIFtdIHsKLSAgICAgICAgRklMRSogbWVtSW5mb0ZpbGU7Ci0gICAgICAgIEZJ TEUqIHpvbmVJbmZvRmlsZTsKLSAgICAgICAgRklMRSogY2dyb3VwQ29udHJvbGxlckZpbGU7Cisg ICAgICAgIEZpbGVIYW5kbGUgbWVtSW5mb0ZpbGUsIHpvbmVJbmZvRmlsZSwgY2dyb3VwQ29udHJv bGxlckZpbGU7CiAgICAgICAgIENHcm91cE1lbW9yeUNvbnRyb2xsZXIgbWVtb3J5Q29udHJvbGxl ciA9IENHcm91cE1lbW9yeUNvbnRyb2xsZXIoKTsKICAgICAgICAgU2Vjb25kcyBwb2xsSW50ZXJ2 YWwgPSBzX21heFBvbGxpbmdJbnRlcnZhbDsKICAgICAgICAgd2hpbGUgKHRydWUpIHsKICAgICAg ICAgICAgIHNsZWVwKHBvbGxJbnRlcnZhbCk7CiAKLSAgICAgICAgICAgIG1lbUluZm9GaWxlID0g Zm9wZW4oc19wcm9jTWVtaW5mbywgInIiKTsKLSAgICAgICAgICAgIHpvbmVJbmZvRmlsZSA9IGZv cGVuKHNfcHJvY1pvbmVpbmZvLCAiciIpOwotICAgICAgICAgICAgaWYgKCFtZW1JbmZvRmlsZSB8 fCAhem9uZUluZm9GaWxlKQorICAgICAgICAgICAgLy8gQ2Fubm90IG9wZXJhdGUgd2l0aG91dCB0 aGlzIG9uZSwgcmV0cnkgb3BlbmluZyBvbiB0aGUgbmV4dCBpdGVyYXRpb24gYWZ0ZXIgc2xlZXBp bmcuCisgICAgICAgICAgICBpZiAoIXRyeU9wZW5pbmdGb3JVbmJ1ZmZlcmVkUmVhZGluZyhtZW1J bmZvRmlsZSwgc19wcm9jTWVtaW5mbykpCiAgICAgICAgICAgICAgICAgY29udGludWU7Ci0gICAg ICAgICAgICBzZXRidWYobWVtSW5mb0ZpbGUsIG51bGxwdHIpOwotICAgICAgICAgICAgc2V0YnVm KHpvbmVJbmZvRmlsZSwgbnVsbHB0cik7CiAKLSAgICAgICAgICAgIGNncm91cENvbnRyb2xsZXJG aWxlID0gZm9wZW4oc19wcm9jU2VsZkNncm91cCwgInIiKTsKLSAgICAgICAgICAgIGlmIChjZ3Jv dXBDb250cm9sbGVyRmlsZSkKLSAgICAgICAgICAgICAgICBzZXRidWYoY2dyb3VwQ29udHJvbGxl ckZpbGUsIG51bGxwdHIpOworICAgICAgICAgICAgLy8gVGhlIG1vbml0b3IgY2FuIHdvcmsgd2l0 aG91dCB0aGVzZSB0d28sIGJ1dCBpdCB3aWxsIGJlIG1vcmUgcHJlY2lzZSBpZiB0aHkgYXJlIGV2 ZW50dWFsbHkgb3BlbmVkOiBrZWVwIHRyeWluZy4KKyAgICAgICAgICAgIHRyeU9wZW5pbmdGb3JV bmJ1ZmZlcmVkUmVhZGluZyh6b25lSW5mb0ZpbGUsIHNfcHJvY1pvbmVpbmZvKTsKKyAgICAgICAg ICAgIHRyeU9wZW5pbmdGb3JVbmJ1ZmZlcmVkUmVhZGluZyhjZ3JvdXBDb250cm9sbGVyRmlsZSwg c19wcm9jU2VsZkNncm91cCk7CiAKLSAgICAgICAgICAgIENTdHJpbmcgY2dyb3VwTWVtb3J5Q29u dHJvbGxlclBhdGggPSBnZXRDZ3JvdXBDb250cm9sbGVyUGF0aChjZ3JvdXBDb250cm9sbGVyRmls ZSwgIm1lbW9yeSIpOworICAgICAgICAgICAgQ1N0cmluZyBjZ3JvdXBNZW1vcnlDb250cm9sbGVy UGF0aCA9IGdldENncm91cENvbnRyb2xsZXJQYXRoKGNncm91cENvbnRyb2xsZXJGaWxlLmdldCgp LCAibWVtb3J5Iik7CiAgICAgICAgICAgICBtZW1vcnlDb250cm9sbGVyLnNldE1lbW9yeUNvbnRy b2xsZXJQYXRoKGNncm91cE1lbW9yeUNvbnRyb2xsZXJQYXRoKTsKLSAgICAgICAgICAgIGludCB1 c2VkUGVyY2VudGFnZSA9IHN5c3RlbU1lbW9yeVVzZWRBc1BlcmNlbnRhZ2UobWVtSW5mb0ZpbGUs IHpvbmVJbmZvRmlsZSwgJm1lbW9yeUNvbnRyb2xsZXIpOworICAgICAgICAgICAgaW50IHVzZWRQ ZXJjZW50YWdlID0gc3lzdGVtTWVtb3J5VXNlZEFzUGVyY2VudGFnZShtZW1JbmZvRmlsZS5nZXQo KSwgem9uZUluZm9GaWxlLmdldCgpLCAmbWVtb3J5Q29udHJvbGxlcik7CiAgICAgICAgICAgICBp ZiAodXNlZFBlcmNlbnRhZ2UgPT0gLTEpIHsKICAgICAgICAgICAgICAgICBXVEZMb2dBbHdheXMo IkZhaWxlZCB0byBnZXQgdGhlIG1lbW9yeSB1c2FnZSIpOwotICAgICAgICAgICAgICAgIGJyZWFr OworICAgICAgICAgICAgICAgIHBvbGxJbnRlcnZhbCA9IHNfbWF4UG9sbGluZ0ludGVydmFsOwor ICAgICAgICAgICAgICAgIGNvbnRpbnVlOwogICAgICAgICAgICAgfQogCiAgICAgICAgICAgICBp ZiAodXNlZFBlcmNlbnRhZ2UgPj0gc19tZW1vcnlQcmVzdXJlUGVyY2VudGFnZVRocmVzaG9sZCkg ewpAQCAtMzM5LDEyICszNTgsNiBAQCB2b2lkIE1lbW9yeVByZXNzdXJlTW9uaXRvcjo6c3RhcnQo KQogICAgICAgICAgICAgfQogICAgICAgICAgICAgcG9sbEludGVydmFsID0gcG9sbEludGVydmFs Rm9yVXNlZE1lbW9yeVBlcmNlbnRhZ2UodXNlZFBlcmNlbnRhZ2UpOwogICAgICAgICB9Ci0gICAg ICAgIGlmIChtZW1JbmZvRmlsZSkKLSAgICAgICAgICAgIGZjbG9zZShtZW1JbmZvRmlsZSk7Ci0g ICAgICAgIGlmICh6b25lSW5mb0ZpbGUpCi0gICAgICAgICAgICBmY2xvc2Uoem9uZUluZm9GaWxl KTsKLSAgICAgICAgaWYgKGNncm91cENvbnRyb2xsZXJGaWxlKQotICAgICAgICAgICAgZmNsb3Nl KGNncm91cENvbnRyb2xsZXJGaWxlKTsKICAgICB9KS0+ZGV0YWNoKCk7CiB9CiAK