213646 2020-06-26 08:20:59 -0700 [GTK][WPE] Fix the matching of an empty value in getCgroupControllerPath() when only cgroupsV2 hierarchy is found 2020-06-28 04:50:56 -0700 1 1 1 Unclassified WebKit WebKitGTK WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 psaavedra psaavedra aperez bugs-noreply clopez mcatanzaro pnormand oldest_to_newest 1666448 0 psaavedra 2020-06-26 08:20:59 -0700 "[" (fscanf) Matches ONLY a nonempty sequence of characters from the specified set. This is good enough for cgroups version 1 but when you are in a pure cgroups version 2 environment probably you need to be able to parse the "0::/some_path" chain. This chain should be parseable by the scanf line but it is not due to the reason exposed early: int scanResult = fscanf(cgroupControllerFile, "%*u:%" STRINGIFY(CGROUP_NAME_BUFFER_SIZE) "[^:]:%" STRINGIFY(PATH_MAX) "[^\n]", name, path); From cgroups man page: The colon-separated fields are, from left to right: 1. For cgroups version 1 hierarchies, this field contains a unique hierarchy ID number that can be matched to a hierar‐ chy ID in /proc/cgroups. For the cgroups version 2 hierar‐ chy, this field contains the value 0. 2. For cgroups version 1 hierarchies, this field contains a comma-separated list of the controllers bound to the hier‐ archy. For the cgroups version 2 hierarchy, this field is empty. 3. This field contains the pathname of the control group in the hierarchy to which the process belongs. This pathname is relative to the mount point of the hierarchy. 1666453 1 402865 psaavedra 2020-06-26 08:33:29 -0700 Created attachment 402865 patch 1666564 2 402865 aperez 2020-06-26 13:00:56 -0700 Comment on attachment 402865 patch View in context: https://bugs.webkit.org/attachment.cgi?id=402865&action=review > Source/WebKit/UIProcess/linux/MemoryPressureMonitor.cpp:220 > + // cgroupv2 You can remove this comment because the comparisong with the CGROUP_V2_HIERARCHY constant in the line right above is self-explanatory—which is why we like using constants with meaningful names, of course :) 1666600 3 402900 psaavedra 2020-06-26 14:10:22 -0700 Created attachment 402900 patch 1666602 4 psaavedra 2020-06-26 14:11:10 -0700 (In reply to Adrian Perez from comment #2) > Comment on attachment 402865 [details] > patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=402865&action=review > > > Source/WebKit/UIProcess/linux/MemoryPressureMonitor.cpp:220 > > + // cgroupv2 > > You can remove this comment because the comparisong with > the CGROUP_V2_HIERARCHY constant in the line right above > is self-explanatory—which is why we like using constants > with meaningful names, of course :) done. 1666627 5 ews-feeder 2020-06-26 14:53:40 -0700 Committed r263589: <https://trac.webkit.org/changeset/263589> All reviewed patches have been landed. Closing bug and clearing flags on attachment 402900. 1666859 6 pnormand 2020-06-28 04:50:56 -0700 Debug build fixed in https://trac.webkit.org/changeset/263632/webkit ... 402865 2020-06-26 08:33:29 -0700 2020-06-26 14:10:19 -0700 patch bug-213646-20200626173326.patch text/plain 5991 psaavedra U3VidmVyc2lvbiBSZXZpc2lvbjogMjYzNTU1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDQzOWU4YTgzMGYwOWNlNDk3 ZTdhYTA4ODhmY2RiNGM0M2NmMGZiZGMuLjRmMWE5NGU5N2ZmMDg4ZWU5Y2Y5YzNkM2IzMDcyNTA0 ODdkN2ZlNWMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAKKzIwMjAtMDYtMjYgIFBhYmxvIFNh YXZlZHJhICA8cHNhYXZlZHJhQGlnYWxpYS5jb20+CisKKyAgICAgICAgW0dUS11bV1BFXSBGaXgg dGhlIG1hdGNoaW5nIG9mIGFuIGVtcHR5IHZhbHVlIGluIGdldENncm91cENvbnRyb2xsZXJQYXRo KCkgd2hlbiBvbmx5IGNncm91cHNWMiBoaWVyYXJjaHkgaXMgZm91bmQKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIxMzY0NgorCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogVUlQcm9jZXNzL2xpbnV4L01lbW9y eVByZXNzdXJlTW9uaXRvci5jcHA6CisgICAgICAgIChXZWJLaXQ6OmdldENncm91cEZpbGUpOgor ICAgICAgICAoV2ViS2l0OjpnZXRDZ3JvdXBDb250cm9sbGVyUGF0aCk6CisgICAgICAgIChXZWJL aXQ6OnN5c3RlbU1lbW9yeVVzZWRBc1BlcmNlbnRhZ2UpOgorCiAyMDIwLTA2LTI1ICBBbGV4IENo cmlzdGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CiAKICAgICAgICAgV0tIVFRQQ29v a2llU3RvcmUuc2V0Q29va2llIHNob3VsZCBmbHVzaCB0aGUgY29va2llcyB0byBkaXNrIGJlZm9y ZSBjYWxsaW5nIGNvbXBsZXRpb24gaGFuZGxlciB3aGVuIHdlIGFyZSB1c2luZyB0aGUgVUlQcm9j ZXNzJ3MgZGVmYXVsdCBjb29raWUgc3RvcmFnZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9V SVByb2Nlc3MvbGludXgvTWVtb3J5UHJlc3N1cmVNb25pdG9yLmNwcCBiL1NvdXJjZS9XZWJLaXQv VUlQcm9jZXNzL2xpbnV4L01lbW9yeVByZXNzdXJlTW9uaXRvci5jcHAKaW5kZXggMmUxMWVkZmJh OTczNjQ5ZDZlNjhjMWFkODNhN2FhN2Q4OThjMzMzYy4uYTBhNDEwZDdhZDA1YWFhYzdmZDIyOGM1 NTY1NWI5ZTc4YzkxOTIyMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvbGlu dXgvTWVtb3J5UHJlc3N1cmVNb25pdG9yLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vz cy9saW51eC9NZW1vcnlQcmVzc3VyZU1vbml0b3IuY3BwCkBAIC02MCw2ICs2MCw3IEBAIHN0YXRp YyBjb25zdCBjaGFyKiBzX3Byb2Nab25laW5mbyA9ICIvcHJvYy96b25laW5mbyI7CiBzdGF0aWMg Y29uc3QgY2hhciogc19wcm9jU2VsZkNncm91cCA9ICIvcHJvYy9zZWxmL2Nncm91cCI7CiBzdGF0 aWMgY29uc3QgdW5zaWduZWQgbWF4Q2dyb3VwUGF0aCA9IDQwOTY7IC8vIFBBVEhfTUFYID0gNDA5 NiBmcm9tIChMaW51eCkgaW5jbHVkZS91YXBpL2xpbnV4L2xpbWl0cy5oCiAKKyNkZWZpbmUgQ0dS T1VQX1YyX0hJRVJBUkNIWSAwCiAjZGVmaW5lIENHUk9VUF9OQU1FX0JVRkZFUl9TSVpFIDQwCiAj ZGVmaW5lIE1FTUlORk9fVE9LRU5fQlVGRkVSX1NJWkUgNTAKICNkZWZpbmUgU1RSSU5HSUZZX0VY UEFOREVEKHZhbCkgI3ZhbApAQCAtMTc0LDYgKzE3NSw3IEBAIEZJTEUqIGdldENncm91cEZpbGUo Q1N0cmluZyBjZ3JvdXBDb250cm9sbGVyTmFtZSwgQ1N0cmluZyBjZ3JvdXBDb250cm9sbGVyUGF0 aCwKIHsKICAgICBjaGFyIGNncm91cFBhdGhbbWF4Q2dyb3VwUGF0aF07CiAgICAgc25wcmludGYo Y2dyb3VwUGF0aCwgbWF4Q2dyb3VwUGF0aCwgc19jZ3JvdXBNZW1vcnlQYXRoLCBjZ3JvdXBDb250 cm9sbGVyTmFtZS5kYXRhKCksIGNncm91cENvbnRyb2xsZXJQYXRoLmRhdGEoKSwgY2dyb3VwRmls ZU5hbWUuZGF0YSgpKTsKKyAgICBMT0dfVkVSQk9TRShNZW1vcnlQcmVzc3VyZSwgIk9wZW46ICVz IiwgY2dyb3VwUGF0aCk7CiAgICAgRklMRSogZmlsZSA9IGZvcGVuKGNncm91cFBhdGgsICJyIik7 CiAgICAgaWYgKGZpbGUpCiAgICAgICAgIHNldGJ1ZihmaWxlLCBudWxscHRyKTsKQEAgLTIwMiwy MyArMjA0LDQ1IEBAIEZJTEUqIGdldENncm91cEZpbGUoQ1N0cmluZyBjZ3JvdXBDb250cm9sbGVy TmFtZSwgQ1N0cmluZyBjZ3JvdXBDb250cm9sbGVyUGF0aCwKIC8vIDA6Oi91c2VyLnNsaWNlL3Vz ZXItMTAwMC5zbGljZS91c2VyQDEwMDAuc2VydmljZS9nbm9tZS10ZXJtaW5hbC1zZXJ2ZXIuc2Vy dmljZQogc3RhdGljIENTdHJpbmcgZ2V0Q2dyb3VwQ29udHJvbGxlclBhdGgoRklMRSogY2dyb3Vw Q29udHJvbGxlckZpbGUsIGNvbnN0IGNoYXIqIGNvbnRyb2xsZXJOYW1lKQogewotICAgIENTdHJp bmcgY2dyb3VwTWVtb3J5Q29udHJvbGxlclBhdGg7CiAgICAgaWYgKCFjZ3JvdXBDb250cm9sbGVy RmlsZSB8fCBmc2VlayhjZ3JvdXBDb250cm9sbGVyRmlsZSwgMCwgU0VFS19TRVQpKQogICAgICAg ICByZXR1cm4gQ1N0cmluZygpOwogCisgICAgQ1N0cmluZyBjZ3JvdXBNZW1vcnlDb250cm9sbGVy UGF0aDsKICAgICB3aGlsZSAoIWZlb2YoY2dyb3VwQ29udHJvbGxlckZpbGUpKSB7CisgICAgICAg IHVuc2lnbmVkIGhpZXJhcmNoeUlkOwogICAgICAgICBjaGFyIG5hbWVbQ0dST1VQX05BTUVfQlVG RkVSX1NJWkUgKyAxXTsKICAgICAgICAgY2hhciBwYXRoW21heENncm91cFBhdGggKyAxXTsKLSAg ICAgICAgaW50IHNjYW5SZXN1bHQgPSBmc2NhbmYoY2dyb3VwQ29udHJvbGxlckZpbGUsICIlKnU6 JSIgU1RSSU5HSUZZKENHUk9VUF9OQU1FX0JVRkZFUl9TSVpFKSAiW146XTolIiBTVFJJTkdJRlko UEFUSF9NQVgpICJbXlxuXSIsIG5hbWUsIHBhdGgpOwotICAgICAgICBpZiAoc2NhblJlc3VsdCAh PSAyKQorICAgICAgICBuYW1lWzBdID0gcGF0aFswXSA9ICdcMCc7CisgICAgICAgIGludCBzY2Fu UmVzdWx0ID0gZnNjYW5mKGNncm91cENvbnRyb2xsZXJGaWxlLCAiJXU6IiwgJmhpZXJhcmNoeUlk KTsKKyAgICAgICAgaWYgKHNjYW5SZXN1bHQgIT0gMSkKICAgICAgICAgICAgIHJldHVybiBDU3Ry aW5nKCk7CisgICAgICAgIGlmIChoaWVyYXJjaHlJZCA9PSBDR1JPVVBfVjJfSElFUkFSQ0hZKSB7 CisgICAgICAgICAgICAvLyBjZ3JvdXB2MgorICAgICAgICAgICAgc2NhblJlc3VsdCA9IGZzY2Fu ZihjZ3JvdXBDb250cm9sbGVyRmlsZSwgIjolIiBTVFJJTkdJRlkoUEFUSF9NQVgpICJbXlxuXSIs IHBhdGgpOworICAgICAgICAgICAgaWYgKHNjYW5SZXN1bHQgIT0gMSkKKyAgICAgICAgICAgICAg ICByZXR1cm4gQ1N0cmluZygpOworICAgICAgICB9IGVsc2UgeworICAgICAgICAgICAgc2NhblJl c3VsdCA9IGZzY2FuZihjZ3JvdXBDb250cm9sbGVyRmlsZSwgIiUiIFNUUklOR0lGWShDR1JPVVBf TkFNRV9CVUZGRVJfU0laRSkgIlteOl06JSIgU1RSSU5HSUZZKFBBVEhfTUFYKSAiW15cbl0iLCBu YW1lLCBwYXRoKTsKKyAgICAgICAgICAgIGlmIChzY2FuUmVzdWx0ICE9IDIpCisgICAgICAgICAg ICAgICAgcmV0dXJuIENTdHJpbmcoKTsKKyAgICAgICAgfQogICAgICAgICBpZiAoIXN0cmNtcChu YW1lLCBjb250cm9sbGVyTmFtZSkpIHsKLSAgICAgICAgICAgIHJldHVybiBDU3RyaW5nKHBhdGgp OworICAgICAgICAgICAgY2dyb3VwTWVtb3J5Q29udHJvbGxlclBhdGggPSBDU3RyaW5nKHBhdGgp OworICAgICAgICAgICAgTE9HX1ZFUkJPU0UoTWVtb3J5UHJlc3N1cmUsICJtZW1vcnlDb250cm9s bGVyTmFtZSAtICVzIG5hbWVzcGFjZSAoaGllcmFyY2h5OiAlZCk6ICVzIiwgY29udHJvbGxlck5h bWUsIGhpZXJhcmNoeUlkLCBjZ3JvdXBNZW1vcnlDb250cm9sbGVyUGF0aC5kYXRhKCkpOworICAg ICAgICAgICAgcmV0dXJuIGNncm91cE1lbW9yeUNvbnRyb2xsZXJQYXRoOwogICAgICAgICB9Ci0g ICAgICAgIGlmICghc3RyY21wKG5hbWUsICJuYW1lPXN5c3RlbWQiKSkKKyAgICAgICAgaWYgKCFz dHJjbXAobmFtZSwgIm5hbWU9c3lzdGVtZCIpKSB7CiAgICAgICAgICAgICBjZ3JvdXBNZW1vcnlD b250cm9sbGVyUGF0aCA9IENTdHJpbmcocGF0aCk7CisgICAgICAgICAgICBMT0dfVkVSQk9TRShN ZW1vcnlQcmVzc3VyZSwgIm1lbW9yeUNvbnRyb2xsZXJOYW1lIC0gc3lzdGVtZCBuYW1lc3BhY2Ug KGhpZXJhcmNoeTogJWQpOiAlcyIsIGhpZXJhcmNoeUlkLCBjZ3JvdXBNZW1vcnlDb250cm9sbGVy UGF0aC5kYXRhKCkpOworICAgICAgICAgICAgcmV0dXJuIGNncm91cE1lbW9yeUNvbnRyb2xsZXJQ YXRoOworICAgICAgICB9CisgICAgICAgIGlmICghc3RyY21wKG5hbWUsICIiKSkgeworICAgICAg ICAgICAgY2dyb3VwTWVtb3J5Q29udHJvbGxlclBhdGggPSBDU3RyaW5nKHBhdGgpOworICAgICAg ICAgICAgTE9HX1ZFUkJPU0UoTWVtb3J5UHJlc3N1cmUsICJtZW1vcnlDb250cm9sbGVyTmFtZSAt IGVtcHR5IG5hbWVzcGFjZSAoaGllcmFyY2h5OiAlZCk6ICVzIiwgaGllcmFyY2h5SWQsIGNncm91 cE1lbW9yeUNvbnRyb2xsZXJQYXRoLmRhdGEoKSk7CisgICAgICAgICAgICByZXR1cm4gY2dyb3Vw TWVtb3J5Q29udHJvbGxlclBhdGg7CisgICAgICAgIH0KICAgICB9Ci0gICAgcmV0dXJuIGNncm91 cE1lbW9yeUNvbnRyb2xsZXJQYXRoOworICAgIHJldHVybiBDU3RyaW5nKCk7CiB9CiAKIApAQCAt MjY1LDE1ICsyODksMTggQEAgc3RhdGljIGludCBzeXN0ZW1NZW1vcnlVc2VkQXNQZXJjZW50YWdl KEZJTEUqIG1lbUluZm9GaWxlLCBGSUxFKiB6b25lSW5mb0ZpbGUsIEMKICAgICAgICAgcmV0dXJu IC0xOwogCiAgICAgaW50IG1lbW9yeVVzYWdlUGVyY2VudGFnZSA9ICgobWVtb3J5VG90YWwgLSBt ZW1vcnlBdmFpbGFibGUpICogMTAwKSAvIG1lbW9yeVRvdGFsOworICAgIExPR19WRVJCT1NFKE1l bW9yeVByZXNzdXJlLCAiTWVtb3J5UHJlc3N1cmVNb25pdG9yOjptZW1vcnk6IHJlYWwgKG1lbW9y eSB0b3RhbD0lenUgTUIpIChtZW1vcnkgYXZhaWxhYmxlPSV6dSBNQikgKG1lbW9yeSB1c2FnZSBw ZXJjZW50YWdlPSVkIE1CKSIsIG1lbW9yeVRvdGFsLCBtZW1vcnlBdmFpbGFibGUsIG1lbW9yeVVz YWdlUGVyY2VudGFnZSk7CiAgICAgaWYgKG1lbW9yeUNvbnRyb2xsZXItPmlzQWN0aXZlKCkpIHsK ICAgICAgICAgbWVtb3J5VG90YWwgPSBtZW1vcnlDb250cm9sbGVyLT5nZXRNZW1vcnlUb3RhbFdp dGhDZ3JvdXAoKTsKICAgICAgICAgc2l6ZV90IG1lbW9yeVVzYWdlID0gbWVtb3J5Q29udHJvbGxl ci0+Z2V0TWVtb3J5VXNhZ2VXaXRoQ2dyb3VwKCk7CiAgICAgICAgIGlmIChtZW1vcnlUb3RhbCAh PSBub3RTZXQgJiYgbWVtb3J5VXNhZ2UgIT0gbm90U2V0KSB7CiAgICAgICAgICAgICBpbnQgbWVt b3J5VXNhZ2VQZXJjZW50YWdlV2l0aENncm91cCA9IDEwMCAqICgoZmxvYXQpIG1lbW9yeVVzYWdl IC8gKGZsb2F0KSBtZW1vcnlUb3RhbCk7CisgICAgICAgICAgICBMT0dfVkVSQk9TRShNZW1vcnlQ cmVzc3VyZSwgIk1lbW9yeVByZXNzdXJlTW9uaXRvcjo6bWVtb3J5OiBjZ3JvdXAgKG1lbW9yeSB0 b3RhbD0lenUgYnl0ZXMpIChtZW1vcnkgdXNhZ2U9JXp1IGJ5dGVzKSAobWVtb3J5IHVzYWdlIHBl cmNlbnRhZ2U9JWQgYnl0ZXMpIiwgbWVtb3J5VG90YWwsIG1lbW9yeVVzYWdlLCBtZW1vcnlVc2Fn ZVBlcmNlbnRhZ2VXaXRoQ2dyb3VwKTsKICAgICAgICAgICAgIGlmIChtZW1vcnlVc2FnZVBlcmNl bnRhZ2VXaXRoQ2dyb3VwID4gbWVtb3J5VXNhZ2VQZXJjZW50YWdlKQogICAgICAgICAgICAgICAg IG1lbW9yeVVzYWdlUGVyY2VudGFnZSA9IG1lbW9yeVVzYWdlUGVyY2VudGFnZVdpdGhDZ3JvdXA7 CiAgICAgICAgIH0KICAgICB9CisgICAgTE9HX1ZFUkJPU0UoTWVtb3J5UHJlc3N1cmUsICJNZW1v cnlQcmVzc3VyZU1vbml0b3I6Om1lbW9yeTogbWVtb3J5VXNhZ2VQZXJjZW50YWdlICglZCkiLCBt ZW1vcnlVc2FnZVBlcmNlbnRhZ2UpOwogICAgIHJldHVybiBtZW1vcnlVc2FnZVBlcmNlbnRhZ2U7 CiB9CiAK 402900 2020-06-26 14:10:22 -0700 2020-06-26 14:53:41 -0700 patch bug-213646-20200626231020.patch text/plain 5966 psaavedra U3VidmVyc2lvbiBSZXZpc2lvbjogMjYzNTU1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDQzOWU4YTgzMGYwOWNlNDk3 ZTdhYTA4ODhmY2RiNGM0M2NmMGZiZGMuLjRmMWE5NGU5N2ZmMDg4ZWU5Y2Y5YzNkM2IzMDcyNTA0 ODdkN2ZlNWMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAKKzIwMjAtMDYtMjYgIFBhYmxvIFNh YXZlZHJhICA8cHNhYXZlZHJhQGlnYWxpYS5jb20+CisKKyAgICAgICAgW0dUS11bV1BFXSBGaXgg dGhlIG1hdGNoaW5nIG9mIGFuIGVtcHR5IHZhbHVlIGluIGdldENncm91cENvbnRyb2xsZXJQYXRo KCkgd2hlbiBvbmx5IGNncm91cHNWMiBoaWVyYXJjaHkgaXMgZm91bmQKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIxMzY0NgorCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogVUlQcm9jZXNzL2xpbnV4L01lbW9y eVByZXNzdXJlTW9uaXRvci5jcHA6CisgICAgICAgIChXZWJLaXQ6OmdldENncm91cEZpbGUpOgor ICAgICAgICAoV2ViS2l0OjpnZXRDZ3JvdXBDb250cm9sbGVyUGF0aCk6CisgICAgICAgIChXZWJL aXQ6OnN5c3RlbU1lbW9yeVVzZWRBc1BlcmNlbnRhZ2UpOgorCiAyMDIwLTA2LTI1ICBBbGV4IENo cmlzdGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CiAKICAgICAgICAgV0tIVFRQQ29v a2llU3RvcmUuc2V0Q29va2llIHNob3VsZCBmbHVzaCB0aGUgY29va2llcyB0byBkaXNrIGJlZm9y ZSBjYWxsaW5nIGNvbXBsZXRpb24gaGFuZGxlciB3aGVuIHdlIGFyZSB1c2luZyB0aGUgVUlQcm9j ZXNzJ3MgZGVmYXVsdCBjb29raWUgc3RvcmFnZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9V SVByb2Nlc3MvbGludXgvTWVtb3J5UHJlc3N1cmVNb25pdG9yLmNwcCBiL1NvdXJjZS9XZWJLaXQv VUlQcm9jZXNzL2xpbnV4L01lbW9yeVByZXNzdXJlTW9uaXRvci5jcHAKaW5kZXggMmUxMWVkZmJh OTczNjQ5ZDZlNjhjMWFkODNhN2FhN2Q4OThjMzMzYy4uMzY2ODExNTk4M2JkNWY1YWZmNDk4NzRh MmE1MmEzYjNkOWUzNTQwMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvbGlu dXgvTWVtb3J5UHJlc3N1cmVNb25pdG9yLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vz cy9saW51eC9NZW1vcnlQcmVzc3VyZU1vbml0b3IuY3BwCkBAIC02MCw2ICs2MCw3IEBAIHN0YXRp YyBjb25zdCBjaGFyKiBzX3Byb2Nab25laW5mbyA9ICIvcHJvYy96b25laW5mbyI7CiBzdGF0aWMg Y29uc3QgY2hhciogc19wcm9jU2VsZkNncm91cCA9ICIvcHJvYy9zZWxmL2Nncm91cCI7CiBzdGF0 aWMgY29uc3QgdW5zaWduZWQgbWF4Q2dyb3VwUGF0aCA9IDQwOTY7IC8vIFBBVEhfTUFYID0gNDA5 NiBmcm9tIChMaW51eCkgaW5jbHVkZS91YXBpL2xpbnV4L2xpbWl0cy5oCiAKKyNkZWZpbmUgQ0dS T1VQX1YyX0hJRVJBUkNIWSAwCiAjZGVmaW5lIENHUk9VUF9OQU1FX0JVRkZFUl9TSVpFIDQwCiAj ZGVmaW5lIE1FTUlORk9fVE9LRU5fQlVGRkVSX1NJWkUgNTAKICNkZWZpbmUgU1RSSU5HSUZZX0VY UEFOREVEKHZhbCkgI3ZhbApAQCAtMTc0LDYgKzE3NSw3IEBAIEZJTEUqIGdldENncm91cEZpbGUo Q1N0cmluZyBjZ3JvdXBDb250cm9sbGVyTmFtZSwgQ1N0cmluZyBjZ3JvdXBDb250cm9sbGVyUGF0 aCwKIHsKICAgICBjaGFyIGNncm91cFBhdGhbbWF4Q2dyb3VwUGF0aF07CiAgICAgc25wcmludGYo Y2dyb3VwUGF0aCwgbWF4Q2dyb3VwUGF0aCwgc19jZ3JvdXBNZW1vcnlQYXRoLCBjZ3JvdXBDb250 cm9sbGVyTmFtZS5kYXRhKCksIGNncm91cENvbnRyb2xsZXJQYXRoLmRhdGEoKSwgY2dyb3VwRmls ZU5hbWUuZGF0YSgpKTsKKyAgICBMT0dfVkVSQk9TRShNZW1vcnlQcmVzc3VyZSwgIk9wZW46ICVz IiwgY2dyb3VwUGF0aCk7CiAgICAgRklMRSogZmlsZSA9IGZvcGVuKGNncm91cFBhdGgsICJyIik7 CiAgICAgaWYgKGZpbGUpCiAgICAgICAgIHNldGJ1ZihmaWxlLCBudWxscHRyKTsKQEAgLTIwMiwy MyArMjA0LDQ0IEBAIEZJTEUqIGdldENncm91cEZpbGUoQ1N0cmluZyBjZ3JvdXBDb250cm9sbGVy TmFtZSwgQ1N0cmluZyBjZ3JvdXBDb250cm9sbGVyUGF0aCwKIC8vIDA6Oi91c2VyLnNsaWNlL3Vz ZXItMTAwMC5zbGljZS91c2VyQDEwMDAuc2VydmljZS9nbm9tZS10ZXJtaW5hbC1zZXJ2ZXIuc2Vy dmljZQogc3RhdGljIENTdHJpbmcgZ2V0Q2dyb3VwQ29udHJvbGxlclBhdGgoRklMRSogY2dyb3Vw Q29udHJvbGxlckZpbGUsIGNvbnN0IGNoYXIqIGNvbnRyb2xsZXJOYW1lKQogewotICAgIENTdHJp bmcgY2dyb3VwTWVtb3J5Q29udHJvbGxlclBhdGg7CiAgICAgaWYgKCFjZ3JvdXBDb250cm9sbGVy RmlsZSB8fCBmc2VlayhjZ3JvdXBDb250cm9sbGVyRmlsZSwgMCwgU0VFS19TRVQpKQogICAgICAg ICByZXR1cm4gQ1N0cmluZygpOwogCisgICAgQ1N0cmluZyBjZ3JvdXBNZW1vcnlDb250cm9sbGVy UGF0aDsKICAgICB3aGlsZSAoIWZlb2YoY2dyb3VwQ29udHJvbGxlckZpbGUpKSB7CisgICAgICAg IHVuc2lnbmVkIGhpZXJhcmNoeUlkOwogICAgICAgICBjaGFyIG5hbWVbQ0dST1VQX05BTUVfQlVG RkVSX1NJWkUgKyAxXTsKICAgICAgICAgY2hhciBwYXRoW21heENncm91cFBhdGggKyAxXTsKLSAg ICAgICAgaW50IHNjYW5SZXN1bHQgPSBmc2NhbmYoY2dyb3VwQ29udHJvbGxlckZpbGUsICIlKnU6 JSIgU1RSSU5HSUZZKENHUk9VUF9OQU1FX0JVRkZFUl9TSVpFKSAiW146XTolIiBTVFJJTkdJRlko UEFUSF9NQVgpICJbXlxuXSIsIG5hbWUsIHBhdGgpOwotICAgICAgICBpZiAoc2NhblJlc3VsdCAh PSAyKQorICAgICAgICBuYW1lWzBdID0gcGF0aFswXSA9ICdcMCc7CisgICAgICAgIGludCBzY2Fu UmVzdWx0ID0gZnNjYW5mKGNncm91cENvbnRyb2xsZXJGaWxlLCAiJXU6IiwgJmhpZXJhcmNoeUlk KTsKKyAgICAgICAgaWYgKHNjYW5SZXN1bHQgIT0gMSkKICAgICAgICAgICAgIHJldHVybiBDU3Ry aW5nKCk7CisgICAgICAgIGlmIChoaWVyYXJjaHlJZCA9PSBDR1JPVVBfVjJfSElFUkFSQ0hZKSB7 CisgICAgICAgICAgICBzY2FuUmVzdWx0ID0gZnNjYW5mKGNncm91cENvbnRyb2xsZXJGaWxlLCAi OiUiIFNUUklOR0lGWShQQVRIX01BWCkgIlteXG5dIiwgcGF0aCk7CisgICAgICAgICAgICBpZiAo c2NhblJlc3VsdCAhPSAxKQorICAgICAgICAgICAgICAgIHJldHVybiBDU3RyaW5nKCk7CisgICAg ICAgIH0gZWxzZSB7CisgICAgICAgICAgICBzY2FuUmVzdWx0ID0gZnNjYW5mKGNncm91cENvbnRy b2xsZXJGaWxlLCAiJSIgU1RSSU5HSUZZKENHUk9VUF9OQU1FX0JVRkZFUl9TSVpFKSAiW146XTol IiBTVFJJTkdJRlkoUEFUSF9NQVgpICJbXlxuXSIsIG5hbWUsIHBhdGgpOworICAgICAgICAgICAg aWYgKHNjYW5SZXN1bHQgIT0gMikKKyAgICAgICAgICAgICAgICByZXR1cm4gQ1N0cmluZygpOwor ICAgICAgICB9CiAgICAgICAgIGlmICghc3RyY21wKG5hbWUsIGNvbnRyb2xsZXJOYW1lKSkgewot ICAgICAgICAgICAgcmV0dXJuIENTdHJpbmcocGF0aCk7CisgICAgICAgICAgICBjZ3JvdXBNZW1v cnlDb250cm9sbGVyUGF0aCA9IENTdHJpbmcocGF0aCk7CisgICAgICAgICAgICBMT0dfVkVSQk9T RShNZW1vcnlQcmVzc3VyZSwgIm1lbW9yeUNvbnRyb2xsZXJOYW1lIC0gJXMgbmFtZXNwYWNlICho aWVyYXJjaHk6ICVkKTogJXMiLCBjb250cm9sbGVyTmFtZSwgaGllcmFyY2h5SWQsIGNncm91cE1l bW9yeUNvbnRyb2xsZXJQYXRoLmRhdGEoKSk7CisgICAgICAgICAgICByZXR1cm4gY2dyb3VwTWVt b3J5Q29udHJvbGxlclBhdGg7CiAgICAgICAgIH0KLSAgICAgICAgaWYgKCFzdHJjbXAobmFtZSwg Im5hbWU9c3lzdGVtZCIpKQorICAgICAgICBpZiAoIXN0cmNtcChuYW1lLCAibmFtZT1zeXN0ZW1k IikpIHsKICAgICAgICAgICAgIGNncm91cE1lbW9yeUNvbnRyb2xsZXJQYXRoID0gQ1N0cmluZyhw YXRoKTsKKyAgICAgICAgICAgIExPR19WRVJCT1NFKE1lbW9yeVByZXNzdXJlLCAibWVtb3J5Q29u dHJvbGxlck5hbWUgLSBzeXN0ZW1kIG5hbWVzcGFjZSAoaGllcmFyY2h5OiAlZCk6ICVzIiwgaGll cmFyY2h5SWQsIGNncm91cE1lbW9yeUNvbnRyb2xsZXJQYXRoLmRhdGEoKSk7CisgICAgICAgICAg ICByZXR1cm4gY2dyb3VwTWVtb3J5Q29udHJvbGxlclBhdGg7CisgICAgICAgIH0KKyAgICAgICAg aWYgKCFzdHJjbXAobmFtZSwgIiIpKSB7CisgICAgICAgICAgICBjZ3JvdXBNZW1vcnlDb250cm9s bGVyUGF0aCA9IENTdHJpbmcocGF0aCk7CisgICAgICAgICAgICBMT0dfVkVSQk9TRShNZW1vcnlQ cmVzc3VyZSwgIm1lbW9yeUNvbnRyb2xsZXJOYW1lIC0gZW1wdHkgbmFtZXNwYWNlIChoaWVyYXJj aHk6ICVkKTogJXMiLCBoaWVyYXJjaHlJZCwgY2dyb3VwTWVtb3J5Q29udHJvbGxlclBhdGguZGF0 YSgpKTsKKyAgICAgICAgICAgIHJldHVybiBjZ3JvdXBNZW1vcnlDb250cm9sbGVyUGF0aDsKKyAg ICAgICAgfQogICAgIH0KLSAgICByZXR1cm4gY2dyb3VwTWVtb3J5Q29udHJvbGxlclBhdGg7Cisg ICAgcmV0dXJuIENTdHJpbmcoKTsKIH0KIAogCkBAIC0yNjUsMTUgKzI4OCwxOCBAQCBzdGF0aWMg aW50IHN5c3RlbU1lbW9yeVVzZWRBc1BlcmNlbnRhZ2UoRklMRSogbWVtSW5mb0ZpbGUsIEZJTEUq IHpvbmVJbmZvRmlsZSwgQwogICAgICAgICByZXR1cm4gLTE7CiAKICAgICBpbnQgbWVtb3J5VXNh Z2VQZXJjZW50YWdlID0gKChtZW1vcnlUb3RhbCAtIG1lbW9yeUF2YWlsYWJsZSkgKiAxMDApIC8g bWVtb3J5VG90YWw7CisgICAgTE9HX1ZFUkJPU0UoTWVtb3J5UHJlc3N1cmUsICJNZW1vcnlQcmVz c3VyZU1vbml0b3I6Om1lbW9yeTogcmVhbCAobWVtb3J5IHRvdGFsPSV6dSBNQikgKG1lbW9yeSBh dmFpbGFibGU9JXp1IE1CKSAobWVtb3J5IHVzYWdlIHBlcmNlbnRhZ2U9JWQgTUIpIiwgbWVtb3J5 VG90YWwsIG1lbW9yeUF2YWlsYWJsZSwgbWVtb3J5VXNhZ2VQZXJjZW50YWdlKTsKICAgICBpZiAo bWVtb3J5Q29udHJvbGxlci0+aXNBY3RpdmUoKSkgewogICAgICAgICBtZW1vcnlUb3RhbCA9IG1l bW9yeUNvbnRyb2xsZXItPmdldE1lbW9yeVRvdGFsV2l0aENncm91cCgpOwogICAgICAgICBzaXpl X3QgbWVtb3J5VXNhZ2UgPSBtZW1vcnlDb250cm9sbGVyLT5nZXRNZW1vcnlVc2FnZVdpdGhDZ3Jv dXAoKTsKICAgICAgICAgaWYgKG1lbW9yeVRvdGFsICE9IG5vdFNldCAmJiBtZW1vcnlVc2FnZSAh PSBub3RTZXQpIHsKICAgICAgICAgICAgIGludCBtZW1vcnlVc2FnZVBlcmNlbnRhZ2VXaXRoQ2dy b3VwID0gMTAwICogKChmbG9hdCkgbWVtb3J5VXNhZ2UgLyAoZmxvYXQpIG1lbW9yeVRvdGFsKTsK KyAgICAgICAgICAgIExPR19WRVJCT1NFKE1lbW9yeVByZXNzdXJlLCAiTWVtb3J5UHJlc3N1cmVN b25pdG9yOjptZW1vcnk6IGNncm91cCAobWVtb3J5IHRvdGFsPSV6dSBieXRlcykgKG1lbW9yeSB1 c2FnZT0lenUgYnl0ZXMpIChtZW1vcnkgdXNhZ2UgcGVyY2VudGFnZT0lZCBieXRlcykiLCBtZW1v cnlUb3RhbCwgbWVtb3J5VXNhZ2UsIG1lbW9yeVVzYWdlUGVyY2VudGFnZVdpdGhDZ3JvdXApOwog ICAgICAgICAgICAgaWYgKG1lbW9yeVVzYWdlUGVyY2VudGFnZVdpdGhDZ3JvdXAgPiBtZW1vcnlV c2FnZVBlcmNlbnRhZ2UpCiAgICAgICAgICAgICAgICAgbWVtb3J5VXNhZ2VQZXJjZW50YWdlID0g bWVtb3J5VXNhZ2VQZXJjZW50YWdlV2l0aENncm91cDsKICAgICAgICAgfQogICAgIH0KKyAgICBM T0dfVkVSQk9TRShNZW1vcnlQcmVzc3VyZSwgIk1lbW9yeVByZXNzdXJlTW9uaXRvcjo6bWVtb3J5 OiBtZW1vcnlVc2FnZVBlcmNlbnRhZ2UgKCVkKSIsIG1lbW9yeVVzYWdlUGVyY2VudGFnZSk7CiAg ICAgcmV0dXJuIG1lbW9yeVVzYWdlUGVyY2VudGFnZTsKIH0KIAo=