139611 2014-12-12 18:13:55 -0800 Simplify tracking of process suppression disabled for PluginProcessManager 2014-12-15 13:03:54 -0800 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 barraclough barraclough clopez commit-queue ossy oldest_to_newest 1055366 0 barraclough 2014-12-12 18:13:55 -0800 Shouldn't need to iterate contexts; just keep a count. 1055368 1 243239 barraclough 2014-12-12 18:15:19 -0800 Created attachment 243239 Preliminary patch, needs Changelog 1055369 2 commit-queue 2014-12-12 18:17:57 -0800 Attachment 243239 did not pass style-queue: ERROR: Source/WebKit2/UIProcess/Plugins/PluginProcessManager.cpp:48: Code inside a namespace should not be indented. [whitespace/indent] [4] Total errors found: 1 in 6 files If any of these errors are false positives, please file a bug against check-webkit-style. 1055473 3 243265 barraclough 2014-12-13 22:55:51 -0800 Created attachment 243265 Fix 1055474 4 commit-queue 2014-12-13 22:57:06 -0800 Attachment 243265 did not pass style-queue: ERROR: Source/WebKit2/UIProcess/Plugins/PluginProcessManager.cpp:48: Code inside a namespace should not be indented. [whitespace/indent] [4] Total errors found: 1 in 7 files If any of these errors are false positives, please file a bug against check-webkit-style. 1055631 5 243265 darin 2014-12-15 09:15:14 -0800 Comment on attachment 243265 Fix View in context: https://bugs.webkit.org/attachment.cgi?id=243265&action=review > Source/WebKit2/UIProcess/Plugins/PluginProcessManager.h:71 > + { > + return m_processSuppressionDisabledForPageCounter.count(); > + } I suggest putting this inline function body outside the class definition. Keeps the class definition more readable. > Source/WebKit2/UIProcess/Plugins/PluginProcessManager.h:78 > + { > + return m_processSuppressionEnabled; > + }; Same suggestion here. Also, the stray semicolon here is not needed. > Source/WebKit2/UIProcess/Plugins/PluginProcessManager.h:93 > + bool m_processSuppressionEnabled; I suggest using modern initialization syntax here: bool m_processSuppressionEnabled { true }; Then this data member doesn’t have to be mentioned in the constructor. 1055688 6 barraclough 2014-12-15 11:41:59 -0800 http://trac.webkit.org/changeset/177291 1055701 7 clopez 2014-12-15 12:24:37 -0800 (In reply to comment #6) > http://trac.webkit.org/changeset/177291 This has broken both the GTK and EFL builds. The EWS bots are green on the patch attached to this bug, so maybe you did some last-minute change before landing it that broke the build? The build log are here: * GTK build failure: https://build.webkit.org/builders/GTK%20Linux%2064-bit%20Release%20%28Build%29/builds/53626/steps/compile-webkit/logs/stdio * EFL build failure: https://build.webkit.org/builders/EFL%20Linux%20ARMv7%20Thumb2%20Release%20%28Build%29/builds/9261/steps/compile-webkit/logs/stdio 1055707 8 barraclough 2014-12-15 12:42:33 -0800 (In reply to comment #7) > (In reply to comment #6) > > http://trac.webkit.org/changeset/177291 > > This has broken both the GTK and EFL builds. > > The EWS bots are green on the patch attached to this bug, so maybe you did > some last-minute change before landing it that broke the build? > > The build log are here: > > * GTK build failure: > https://build.webkit.org/builders/GTK%20Linux%2064- > bit%20Release%20%28Build%29/builds/53626/steps/compile-webkit/logs/stdio > * EFL build failure: > https://build.webkit.org/builders/ > EFL%20Linux%20ARMv7%20Thumb2%20Release%20%28Build%29/builds/9261/steps/ > compile-webkit/logs/stdio Ooops, yes – in addressing review comments moved inline functions out the the class declarations, I should have #ifdef'ed. Fix incoming. 1055708 9 barraclough 2014-12-15 12:45:33 -0800 gtk/efl should be fixed in: Transmitting file data .. Committed revision 177307. 1055712 10 clopez 2014-12-15 13:03:54 -0800 (In reply to comment #9) > gtk/efl should be fixed in: > > Transmitting file data .. > Committed revision 177307. That worked, thanks :) (The EFL build is still broken, but don't seems related with this) 243239 2014-12-12 18:15:19 -0800 2014-12-13 22:55:51 -0800 Preliminary patch, needs Changelog 139611.1.patch text/plain 6529 barraclough SW5kZXg6IFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJDb250ZXh0LmgKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYkNvbnRleHQuaAkocmV2aXNpb24gMTc3MjU1 KQorKysgU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYkNvbnRleHQuaAkod29ya2luZyBjb3B5 KQpAQCAtMzE0LDggKzMxNCw2IEBAIHB1YmxpYzoKIAogI2lmIFBMQVRGT1JNKENPQ09BKQogICAg IGJvb2wgcHJvY2Vzc1N1cHByZXNzaW9uRW5hYmxlZCgpIGNvbnN0OwotICAgIHN0YXRpYyBib29s IHByb2Nlc3NTdXBwcmVzc2lvbklzRW5hYmxlZEZvckFsbENvbnRleHRzKCk7Ci0gICAgc3RhdGlj IGJvb2wgcHJvY2Vzc1N1cHByZXNzaW9uUHJlZmVyZW5jZUlzRW5hYmxlZEZvckFsbENvbnRleHRz KCk7CiAjZW5kaWYKIAogICAgIHZvaWQgd2luZG93U2VydmVyQ29ubmVjdGlvblN0YXRlQ2hhbmdl ZCgpOwpAQCAtMzQ2LDcgKzM0NCw3IEBAIHB1YmxpYzoKICAgICBzdGF0aWMgdm9pZCB1bnJlZ2lz dGVyR2xvYmFsVVJMU2NoZW1lQXNIYXZpbmdDdXN0b21Qcm90b2NvbEhhbmRsZXJzKGNvbnN0IFN0 cmluZyYpOwogCiAjaWYgUExBVEZPUk0oQ09DT0EpCi0gICAgdm9pZCB1cGRhdGVQcm9jZXNzU3Vw cHJlc3Npb25TdGF0ZSgpIGNvbnN0OworICAgIHZvaWQgdXBkYXRlUHJvY2Vzc1N1cHByZXNzaW9u U3RhdGUoKTsKIAogICAgIE5TTXV0YWJsZURpY3Rpb25hcnkgKmVuc3VyZUJ1bmRsZVBhcmFtZXRl cnMoKTsKICAgICBOU011dGFibGVEaWN0aW9uYXJ5ICpidW5kbGVQYXJhbWV0ZXJzKCkgeyByZXR1 cm4gbV9idW5kbGVQYXJhbWV0ZXJzLmdldCgpOyB9CkBAIC01NzUsNiArNTczLDcgQEAgcHJpdmF0 ZToKIAogI2lmIFBMQVRGT1JNKENPQ09BKQogICAgIFJldGFpblB0cjxOU011dGFibGVEaWN0aW9u YXJ5PiBtX2J1bmRsZVBhcmFtZXRlcnM7CisgICAgUmVmUHRyPFJlZkNvdW50ZXI6OkNvdW50PiBt X3BsdWdpblByb2Nlc3NNYW5hZ2VyUHJvY2Vzc1N1cHByZXNzaW9uRGlzYWJsZWRDb3VudDsKICNl bmRpZgogfTsKIApJbmRleDogU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1BsdWdpbnMvUGx1Z2lu UHJvY2Vzc01hbmFnZXIuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vz cy9QbHVnaW5zL1BsdWdpblByb2Nlc3NNYW5hZ2VyLmNwcAkocmV2aXNpb24gMTc3MjU1KQorKysg U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1BsdWdpbnMvUGx1Z2luUHJvY2Vzc01hbmFnZXIuY3Bw CSh3b3JraW5nIGNvcHkpCkBAIC00Myw2ICs0MywxMCBAQCBQbHVnaW5Qcm9jZXNzTWFuYWdlciYg UGx1Z2luUHJvY2Vzc01hbmFnCiB9CiAKIFBsdWdpblByb2Nlc3NNYW5hZ2VyOjpQbHVnaW5Qcm9j ZXNzTWFuYWdlcigpCisjaWYgUExBVEZPUk0oQ09DT0EpCisgICAgOiBtX3Byb2Nlc3NTdXBwcmVz c2lvbkRpc2FibGVkRm9yUGFnZUNvdW50ZXIoW3RoaXNdKCkgeyB1cGRhdGVQcm9jZXNzU3VwcHJl c3Npb25TdGF0ZSgpOyB9KQorICAgICwgbV9wcm9jZXNzU3VwcHJlc3Npb25FbmFibGVkKHRydWUp CisjZW5kaWYKIHsKIH0KIApJbmRleDogU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1BsdWdpbnMv UGx1Z2luUHJvY2Vzc01hbmFnZXIuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvUGx1Z2lucy9QbHVnaW5Qcm9jZXNzTWFuYWdlci5oCShyZXZpc2lvbiAxNzcyNTUpCisr KyBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvUGx1Z2lucy9QbHVnaW5Qcm9jZXNzTWFuYWdlci5o CSh3b3JraW5nIGNvcHkpCkBAIC0zNiw2ICszNiw3IEBACiAjaW5jbHVkZSA8d3RmL0hhc2hTZXQu aD4KICNpbmNsdWRlIDx3dGYvTmV2ZXJEZXN0cm95ZWQuaD4KICNpbmNsdWRlIDx3dGYvTm9uY29w eWFibGUuaD4KKyNpbmNsdWRlIDx3dGYvUmVmQ291bnRlci5oPgogI2luY2x1ZGUgPHd0Zi9WZWN0 b3IuaD4KIAogbmFtZXNwYWNlIElQQyB7CkBAIC02NCw3ICs2NSwxNyBAQCBwdWJsaWM6CiAgICAg dm9pZCBjbGVhclNpdGVEYXRhKGNvbnN0IFBsdWdpbk1vZHVsZUluZm8mLCBXZWJQbHVnaW5TaXRl RGF0YU1hbmFnZXIqLCBjb25zdCBWZWN0b3I8U3RyaW5nPiYgc2l0ZXMsIHVpbnQ2NF90IGZsYWdz LCB1aW50NjRfdCBtYXhBZ2VJblNlY29uZHMsIHVpbnQ2NF90IGNhbGxiYWNrSUQpOwogCiAjaWYg UExBVEZPUk0oQ09DT0EpCi0gICAgdm9pZCBzZXRQcm9jZXNzU3VwcHJlc3Npb25FbmFibGVkKGJv b2wpOworICAgIFBhc3NSZWZQdHI8UmVmQ291bnRlcjo6Q291bnQ+IHByb2Nlc3NTdXBwcmVzc2lv bkRpc2FibGVkRm9yUGFnZUNvdW50KCkKKyAgICB7CisgICAgICAgIHJldHVybiBtX3Byb2Nlc3NT dXBwcmVzc2lvbkRpc2FibGVkRm9yUGFnZUNvdW50ZXIuY291bnQoKTsKKyAgICB9CisKKyAgICB2 b2lkIHVwZGF0ZVByb2Nlc3NTdXBwcmVzc2lvblN0YXRlKCk7CisKKyAgICBib29sIHByb2Nlc3NT dXBwcmVzc2lvbkVuYWJsZWQoKSBjb25zdAorICAgIHsKKyAgICAgICAgcmV0dXJuIG1fcHJvY2Vz c1N1cHByZXNzaW9uRW5hYmxlZDsKKyAgICB9OwogI2VuZGlmCiAKIHByaXZhdGU6CkBAIC03Niw2 ICs4NywxMSBAQCBwcml2YXRlOgogICAgIEhhc2hTZXQ8dWludDY0X3Q+IG1fa25vd25Ub2tlbnM7 CiAKICAgICBWZWN0b3I8UmVmUHRyPFBsdWdpblByb2Nlc3NQcm94eT4+IG1fcGx1Z2luUHJvY2Vz c2VzOworCisjaWYgUExBVEZPUk0oQ09DT0EpCisgICAgUmVmQ291bnRlciBtX3Byb2Nlc3NTdXBw cmVzc2lvbkRpc2FibGVkRm9yUGFnZUNvdW50ZXI7CisgICAgYm9vbCBtX3Byb2Nlc3NTdXBwcmVz c2lvbkVuYWJsZWQ7CisjZW5kaWYKIH07CiAKIH0gLy8gbmFtZXNwYWNlIFdlYktpdApJbmRleDog U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1BsdWdpbnMvUGx1Z2luUHJvY2Vzc1Byb3h5LmNwcAo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvUGx1Z2lucy9QbHVnaW5Qcm9j ZXNzUHJveHkuY3BwCShyZXZpc2lvbiAxNzcyNTUpCisrKyBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nl c3MvUGx1Z2lucy9QbHVnaW5Qcm9jZXNzUHJveHkuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0yMjks NyArMjI5LDcgQEAgdm9pZCBQbHVnaW5Qcm9jZXNzUHJveHk6OmRpZEZpbmlzaExhdW5jaAogICAg IG1fbnVtUGVuZGluZ0Nvbm5lY3Rpb25SZXF1ZXN0cyA9IDA7CiAKICNpZiBQTEFURk9STShDT0NP QSkKLSAgICBpZiAoV2ViQ29udGV4dDo6cHJvY2Vzc1N1cHByZXNzaW9uSXNFbmFibGVkRm9yQWxs Q29udGV4dHMoKSkKKyAgICBpZiAoUGx1Z2luUHJvY2Vzc01hbmFnZXI6OnNoYXJlZCgpLnByb2Nl c3NTdXBwcmVzc2lvbkVuYWJsZWQoKSkKICAgICAgICAgc2V0UHJvY2Vzc1N1cHByZXNzaW9uRW5h YmxlZCh0cnVlKTsKICNlbmRpZgogfQpJbmRleDogU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1Bs dWdpbnMvbWFjL1BsdWdpblByb2Nlc3NNYW5hZ2VyTWFjLm1tCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJj ZS9XZWJLaXQyL1VJUHJvY2Vzcy9QbHVnaW5zL21hYy9QbHVnaW5Qcm9jZXNzTWFuYWdlck1hYy5t bQkocmV2aXNpb24gMTc3MjU1KQorKysgU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1BsdWdpbnMv bWFjL1BsdWdpblByb2Nlc3NNYW5hZ2VyTWFjLm1tCSh3b3JraW5nIGNvcHkpCkBAIC0zMiw4ICsz MiwxMyBAQAogCiBuYW1lc3BhY2UgV2ViS2l0IHsKIAotdm9pZCBQbHVnaW5Qcm9jZXNzTWFuYWdl cjo6c2V0UHJvY2Vzc1N1cHByZXNzaW9uRW5hYmxlZChib29sIHByb2Nlc3NTdXBwcmVzc2lvbkVu YWJsZWQpCit2b2lkIFBsdWdpblByb2Nlc3NNYW5hZ2VyOjp1cGRhdGVQcm9jZXNzU3VwcHJlc3Np b25TdGF0ZSgpCiB7CisgICAgYm9vbCBwcm9jZXNzU3VwcHJlc3Npb25FbmFibGVkID0gIW1fcHJv Y2Vzc1N1cHByZXNzaW9uRGlzYWJsZWRGb3JQYWdlQ291bnRlci52YWx1ZSgpOworICAgIGlmICht X3Byb2Nlc3NTdXBwcmVzc2lvbkVuYWJsZWQgPT0gcHJvY2Vzc1N1cHByZXNzaW9uRW5hYmxlZCkK KyAgICAgICAgcmV0dXJuOworICAgIAorICAgIG1fcHJvY2Vzc1N1cHByZXNzaW9uRW5hYmxlZCA9 IHByb2Nlc3NTdXBwcmVzc2lvbkVuYWJsZWQ7CiAgICAgZm9yIChhdXRvJiBwbHVnaW5Qcm9jZXNz IDogbV9wbHVnaW5Qcm9jZXNzZXMpCiAgICAgICAgIHBsdWdpblByb2Nlc3MtPnNldFByb2Nlc3NT dXBwcmVzc2lvbkVuYWJsZWQocHJvY2Vzc1N1cHByZXNzaW9uRW5hYmxlZCk7CiB9CkluZGV4OiBT b3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvbWFjL1dlYkNvbnRleHRNYWMubW0KPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL21hYy9XZWJDb250ZXh0TWFjLm1tCShyZXZpc2lv biAxNzcyNTUpCisrKyBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvbWFjL1dlYkNvbnRleHRNYWMu bW0JKHdvcmtpbmcgY29weSkKQEAgLTEwMywxNCArMTAzLDE3IEBAIHN0YXRpYyB2b2lkIHJlZ2lz dGVyVXNlckRlZmF1bHRzSWZOZWVkZWQKICAgICBbW05TVXNlckRlZmF1bHRzIHN0YW5kYXJkVXNl ckRlZmF1bHRzXSByZWdpc3RlckRlZmF1bHRzOnJlZ2lzdHJhdGlvbkRpY3Rpb25hcnldOwogfQog Ci12b2lkIFdlYkNvbnRleHQ6OnVwZGF0ZVByb2Nlc3NTdXBwcmVzc2lvblN0YXRlKCkgY29uc3QK K3ZvaWQgV2ViQ29udGV4dDo6dXBkYXRlUHJvY2Vzc1N1cHByZXNzaW9uU3RhdGUoKQogewogI2lm IEVOQUJMRShORVRXT1JLX1BST0NFU1MpCiAgICAgaWYgKG1fdXNlc05ldHdvcmtQcm9jZXNzICYm IG1fbmV0d29ya1Byb2Nlc3MpCiAgICAgICAgIG1fbmV0d29ya1Byb2Nlc3MtPnNldFByb2Nlc3NT dXBwcmVzc2lvbkVuYWJsZWQocHJvY2Vzc1N1cHByZXNzaW9uRW5hYmxlZCgpKTsKICNlbmRpZgog I2lmIEVOQUJMRShORVRTQ0FQRV9QTFVHSU5fQVBJKQotICAgIFBsdWdpblByb2Nlc3NNYW5hZ2Vy OjpzaGFyZWQoKS5zZXRQcm9jZXNzU3VwcHJlc3Npb25FbmFibGVkKHByb2Nlc3NTdXBwcmVzc2lv blByZWZlcmVuY2VJc0VuYWJsZWRGb3JBbGxDb250ZXh0cygpKTsKKyAgICBpZiAoIW1fcHJvY2Vz c1N1cHByZXNzaW9uRGlzYWJsZWRGb3JQYWdlQ291bnRlci52YWx1ZSgpKQorICAgICAgICBtX3Bs dWdpblByb2Nlc3NNYW5hZ2VyUHJvY2Vzc1N1cHByZXNzaW9uRGlzYWJsZWRDb3VudCA9IG51bGxw dHI7CisgICAgZWxzZSBpZiAoIW1fcGx1Z2luUHJvY2Vzc01hbmFnZXJQcm9jZXNzU3VwcHJlc3Np b25EaXNhYmxlZENvdW50KQorICAgICAgICBtX3BsdWdpblByb2Nlc3NNYW5hZ2VyUHJvY2Vzc1N1 cHByZXNzaW9uRGlzYWJsZWRDb3VudCA9IFBsdWdpblByb2Nlc3NNYW5hZ2VyOjpzaGFyZWQoKS5w cm9jZXNzU3VwcHJlc3Npb25EaXNhYmxlZEZvclBhZ2VDb3VudCgpOwogI2VuZGlmCiB9CiAKQEAg LTUxNSwyNCArNTE4LDYgQEAgYm9vbCBXZWJDb250ZXh0Ojpwcm9jZXNzU3VwcHJlc3Npb25FbmFi bAogICAgIHJldHVybiAhbV91c2VyT2JzZXJ2YWJsZVBhZ2VDb3VudGVyLnZhbHVlKCkgJiYgIW1f cHJvY2Vzc1N1cHByZXNzaW9uRGlzYWJsZWRGb3JQYWdlQ291bnRlci52YWx1ZSgpOwogfQogCi1i b29sIFdlYkNvbnRleHQ6OnByb2Nlc3NTdXBwcmVzc2lvbklzRW5hYmxlZEZvckFsbENvbnRleHRz KCkKLXsKLSAgICBmb3IgKGNvbnN0IGF1dG8qIGNvbnRleHQgOiBXZWJDb250ZXh0OjphbGxDb250 ZXh0cygpKSB7Ci0gICAgICAgIGlmICghY29udGV4dC0+cHJvY2Vzc1N1cHByZXNzaW9uRW5hYmxl ZCgpKQotICAgICAgICAgICAgcmV0dXJuIGZhbHNlOwotICAgIH0KLSAgICByZXR1cm4gdHJ1ZTsK LX0KLQotYm9vbCBXZWJDb250ZXh0Ojpwcm9jZXNzU3VwcHJlc3Npb25QcmVmZXJlbmNlSXNFbmFi bGVkRm9yQWxsQ29udGV4dHMoKQotewotICAgIGZvciAoY29uc3QgYXV0byogY29udGV4dCA6IFdl YkNvbnRleHQ6OmFsbENvbnRleHRzKCkpIHsKLSAgICAgICAgaWYgKCFjb250ZXh0LT5tX2RlZmF1 bHRQYWdlR3JvdXAtPnByZWZlcmVuY2VzKCkuc3RvcmUoKS5nZXRCb29sVmFsdWVGb3JLZXkoV2Vi UHJlZmVyZW5jZXNLZXk6OnBhZ2VWaXNpYmlsaXR5QmFzZWRQcm9jZXNzU3VwcHJlc3Npb25FbmFi bGVkS2V5KCkpKQotICAgICAgICAgICAgcmV0dXJuIGZhbHNlOwotICAgIH0KLSAgICByZXR1cm4g dHJ1ZTsKLX0KLSAgICAKIHZvaWQgV2ViQ29udGV4dDo6cmVnaXN0ZXJOb3RpZmljYXRpb25PYnNl cnZlcnMoKQogewogI2lmICFQTEFURk9STShJT1MpCg== 243265 2014-12-13 22:55:51 -0800 2014-12-15 09:15:14 -0800 Fix 139611.2.patch text/plain 10316 barraclough SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDE3NzI1NikKKysrIFNvdXJjZS9XZWJLaXQyL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDU4IEBACisyMDE0LTEyLTEzICBHYXZpbiBC YXJyYWNsb3VnaCAgPGJhcnJhY2xvdWdoQGFwcGxlLmNvbT4KKworICAgICAgICBTaW1wbGlmeSB0 cmFja2luZyBvZiBwcm9jZXNzIHN1cHByZXNzaW9uIGRpc2FibGVkIGZvciBQbHVnaW5Qcm9jZXNz TWFuYWdlcgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MTM5NjExCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg UHJldmlvdXNseSBpZiBwcm9jZXNzIHN1cHByZXNzaW9uIHN0YXRlIGNoYW5nZWQgZm9yIGFueSBj b250ZXh0IHdlIHdvdWxkCisgICAgICAgIGl0ZXJhdGUgb3ZlciBhbGwgY29udGV4dHMgdG8gcmVj b21wdXRlLgorCisgICAgICAgIFRoZXJlIHdhcyBhbHNvIGFuIGluY29uc2lzdGVuY3kgaW4gdGhl IGNvZGUuIFdoZW4gcGx1Z2luIHByb2Nlc3NlcyBhcmUKKyAgICAgICAgY3JlYXRlZCB0aGV5IGNh bGxlZCBwcm9jZXNzU3VwcHJlc3Npb25Jc0VuYWJsZWRGb3JBbGxDb250ZXh0cygpLCB3aGljaAor ICAgICAgICBjaGVja2VkIFdlYkNvbnRleHQ6OnByb2Nlc3NTdXBwcmVzc2lvbkVuYWJsZWQoKSwg d2hpY2ggaW4gdHVybiBjaGVja3MKKyAgICAgICAgdHdvIHRoaW5ncyAtIHdoZXRoZXIgYW55IHBh Z2UgaXMgY3VycmVudGx5IHZpc2libGUsIGFuZCB3aGV0aGVyIHRoZQorICAgICAgICBzdXBwcmVz c2lvbiBpcyBjdXJyZW50bHkgZGlzYWJsZWQgZm9yIGFueSBwYWdlLiBIb3dldmVyIHdoZW4gdXBk YXRpbmcKKyAgICAgICAgcHJvY2VzcyBzdXByZXNzaW9uIHN0YXRlIHdlIHdvdWxkIGNhbGwKKyAg ICAgICAgcHJvY2Vzc1N1cHByZXNzaW9uUHJlZmVyZW5jZUlzRW5hYmxlZEZvckFsbENvbnRleHRz KCksIHdoaWNoIHdvdWxkIGp1c3QKKyAgICAgICAgY2hlY2sgdGhlIHZhbHVlIG9mIHRoZSBrZXkg ZnJvbSB0aGUgY29udGV4dCdzIGRlZmF1bHQgUGFnZUdyb3VwLgorCisgICAgICAgIFdlIHNob3Vs ZG4ndCBiZSB0YWtpbmcgdmlzaWJpbGl0eSBpbnRvIGFjY291bnQgKHRoaXMgaXMgaGFuZGxlZCBm cm9tIHRoZQorICAgICAgICBjb250ZW50LCB3aGVyZSB3ZSBrbm93IHdoaWNoIHBhZ2VzIGhhdmUg aW5zdGFuY2VzIG9mIHdoaWNoIHBsdWdpbnMpLCBidXQKKyAgICAgICAgd2Ugc2hvdWxkIGJlIGNo ZWNraW5nIHRoZSBjdXJyZW50IHByZWYgdmFsdWUgb2YgZWFjaCBwYWdlLgorCisgICAgICAgIFdl IGFscmVhZHkgdHJhY2sgaW4gZWFjaCBjb250ZXh0IHdoZXRoZXIgYW55IHBhZ2UgaGFzIHRlaCBw cmVmIHNldCB0bworICAgICAgICBkaXNhYmxlIHRocm90dGxpbmc7IGFkZCBhIGNvdW50ZXIgdG8g dGhlIHNoYXJlZCBQbHVnaW5Qcm9jZXNzTWFuYWdlciB0bworICAgICAgICBjb2FsbGVzY2UgYWNy b3NzIGFsbCBjb250ZXh0cy4KKworICAgICAgICAqIFVJUHJvY2Vzcy9QbHVnaW5zL1BsdWdpblBy b2Nlc3NNYW5hZ2VyLmNwcDoKKyAgICAgICAgKFdlYktpdDo6UGx1Z2luUHJvY2Vzc01hbmFnZXI6 OlBsdWdpblByb2Nlc3NNYW5hZ2VyKToKKyAgICAgICAgICAgIC0gYWRkZWQgbV9wcm9jZXNzU3Vw cHJlc3Npb25EaXNhYmxlZEZvclBhZ2VDb3VudGVyLCBtX3Byb2Nlc3NTdXBwcmVzc2lvbkVuYWJs ZWQuCisgICAgICAgICogVUlQcm9jZXNzL1BsdWdpbnMvUGx1Z2luUHJvY2Vzc01hbmFnZXIuaDoK KyAgICAgICAgKFdlYktpdDo6UGx1Z2luUHJvY2Vzc01hbmFnZXI6OnByb2Nlc3NTdXBwcmVzc2lv bkRpc2FibGVkRm9yUGFnZUNvdW50KToKKyAgICAgICAgICAgIC0gYWNjZXNzb3IgZm9yIFdlYkNv bnRleHQgdG8gaW5jcmVtZW50IGNvdW50LgorICAgICAgICAoV2ViS2l0OjpQbHVnaW5Qcm9jZXNz TWFuYWdlcjo6cHJvY2Vzc1N1cHByZXNzaW9uRW5hYmxlZCk6CisgICAgICAgICAgICAtIGFjY2Vz c29yIGZvciBQbHVnaW5Qcm9jZXNzUHJveHkuCisgICAgICAgICogVUlQcm9jZXNzL1BsdWdpbnMv UGx1Z2luUHJvY2Vzc1Byb3h5LmNwcDoKKyAgICAgICAgKFdlYktpdDo6UGx1Z2luUHJvY2Vzc1By b3h5OjpkaWRGaW5pc2hMYXVuY2hpbmcpOgorICAgICAgICAgICAgLSBnZXQgaW5pdGlhbCBzdXBy ZXNzaW9uIHN0YXRlIGZyb20gdGhlIFBsdWdpblByb2Nlc3NNYW5hZ2VyLCBub3QgV2ViQ29udGV4 dC4KKyAgICAgICAgKiBVSVByb2Nlc3MvUGx1Z2lucy9tYWMvUGx1Z2luUHJvY2Vzc01hbmFnZXJN YWMubW06CisgICAgICAgIChXZWJLaXQ6OlBsdWdpblByb2Nlc3NNYW5hZ2VyOjp1cGRhdGVQcm9j ZXNzU3VwcHJlc3Npb25TdGF0ZSk6CisgICAgICAgIChXZWJLaXQ6OlBsdWdpblByb2Nlc3NNYW5h Z2VyOjpzZXRQcm9jZXNzU3VwcHJlc3Npb25FbmFibGVkKTogRGVsZXRlZC4KKyAgICAgICAgICAg IC0gc2V0UHJvY2Vzc1N1cHByZXNzaW9uRW5hYmxlZCAtPiB1cGRhdGVQcm9jZXNzU3VwcHJlc3Np b25TdGF0ZQorICAgICAgICAgICAgICByYXRoZXIgdGhhbiBXZWJDb250ZXh0IHNldHRpbmcgc3Vw cHJlc3Npb24gc3RhdGUsIFBsdWdpblByb2Nlc3NNYW5hZ2VyIGRldGVjdHMKKyAgICAgICAgICAg ICAgd2hlbiB0aGlzIG1heSBuZWVkIHRvIGNoYW5nZSAmIGRldGVybWluZXMgYSBuZXcgdmFsdWUg Zm9yIGl0c2VsZi4KKyAgICAgICAgKiBVSVByb2Nlc3MvV2ViQ29udGV4dC5oOgorICAgICAgICAg ICAgLSByZW1vdmVkIHByb2Nlc3NTdXBwcmVzc2lvbklzRW5hYmxlZEZvckFsbENvbnRleHRzLCBw cm9jZXNzU3VwcHJlc3Npb25QcmVmZXJlbmNlSXNFbmFibGVkRm9yQWxsQ29udGV4dHMKKyAgICAg ICAgICAgICAgdXBkYXRlUHJvY2Vzc1N1cHByZXNzaW9uU3RhdGUgaXMgbm8gbG9uZ2VyIGNvbnN0 ICh1cGRhdGVzIG1fcGx1Z2luUHJvY2Vzc01hbmFnZXJQcm9jZXNzU3VwcHJlc3Npb25EaXNhYmxl ZENvdW50KS4KKyAgICAgICAgKiBVSVByb2Nlc3MvbWFjL1dlYkNvbnRleHRNYWMubW06CisgICAg ICAgIChXZWJLaXQ6OldlYkNvbnRleHQ6OnVwZGF0ZVByb2Nlc3NTdXBwcmVzc2lvblN0YXRlKToK KyAgICAgICAgICAgIC0gaW5zdGVhZCBvZiBleHBsaWNpdGx5IHJlY29tcHV0aW5nIHBsdWdpbiB0 aHJvdHRsaW5nIHN0YXRlIGZyb20gV2l0aGluIHRoZSBXZWJDb250ZXh0LCBqdXN0IHVwZGF0ZQor ICAgICAgICAgICAgICBtX3BsdWdpblByb2Nlc3NNYW5hZ2VyUHJvY2Vzc1N1cHByZXNzaW9uRGlz YWJsZWRDb3VudCB0byBjb3VudCBhIFJlZkNvdW50ZXIgb24gdGhlIHNoYXJlZCBQbHVnaW5Qcm9j ZXNzTWFuYWdlci4KKyAgICAgICAgKFdlYktpdDo6V2ViQ29udGV4dDo6cHJvY2Vzc1N1cHByZXNz aW9uSXNFbmFibGVkRm9yQWxsQ29udGV4dHMpOiBEZWxldGVkLgorICAgICAgICAoV2ViS2l0OjpX ZWJDb250ZXh0Ojpwcm9jZXNzU3VwcHJlc3Npb25QcmVmZXJlbmNlSXNFbmFibGVkRm9yQWxsQ29u dGV4dHMpOiBEZWxldGVkLgorICAgICAgICAgICAgLSByZW1vdmVkLgorCiAyMDE0LTEyLTEyICBH YXZpbiBCYXJyYWNsb3VnaCAgPGJhcnJhY2xvdWdoQGFwcGxlLmNvbT4KIAogICAgICAgICBTcGxp dCBXZWJQYWdlUHJveHk6Om1fcHJldmVudFByb2Nlc3NTdXBwcmVzc2lvbiB0byB0cmFjayBwcmVm L3Zpc2liaWxpdHkgc2VwYXJhdGVseQpJbmRleDogU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dl YkNvbnRleHQuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViQ29u dGV4dC5oCShyZXZpc2lvbiAxNzcyNTUpCisrKyBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2Vi Q29udGV4dC5oCSh3b3JraW5nIGNvcHkpCkBAIC0zMTQsOCArMzE0LDYgQEAgcHVibGljOgogCiAj aWYgUExBVEZPUk0oQ09DT0EpCiAgICAgYm9vbCBwcm9jZXNzU3VwcHJlc3Npb25FbmFibGVkKCkg Y29uc3Q7Ci0gICAgc3RhdGljIGJvb2wgcHJvY2Vzc1N1cHByZXNzaW9uSXNFbmFibGVkRm9yQWxs Q29udGV4dHMoKTsKLSAgICBzdGF0aWMgYm9vbCBwcm9jZXNzU3VwcHJlc3Npb25QcmVmZXJlbmNl SXNFbmFibGVkRm9yQWxsQ29udGV4dHMoKTsKICNlbmRpZgogCiAgICAgdm9pZCB3aW5kb3dTZXJ2 ZXJDb25uZWN0aW9uU3RhdGVDaGFuZ2VkKCk7CkBAIC0zNDYsNyArMzQ0LDcgQEAgcHVibGljOgog ICAgIHN0YXRpYyB2b2lkIHVucmVnaXN0ZXJHbG9iYWxVUkxTY2hlbWVBc0hhdmluZ0N1c3RvbVBy b3RvY29sSGFuZGxlcnMoY29uc3QgU3RyaW5nJik7CiAKICNpZiBQTEFURk9STShDT0NPQSkKLSAg ICB2b2lkIHVwZGF0ZVByb2Nlc3NTdXBwcmVzc2lvblN0YXRlKCkgY29uc3Q7CisgICAgdm9pZCB1 cGRhdGVQcm9jZXNzU3VwcHJlc3Npb25TdGF0ZSgpOwogCiAgICAgTlNNdXRhYmxlRGljdGlvbmFy eSAqZW5zdXJlQnVuZGxlUGFyYW1ldGVycygpOwogICAgIE5TTXV0YWJsZURpY3Rpb25hcnkgKmJ1 bmRsZVBhcmFtZXRlcnMoKSB7IHJldHVybiBtX2J1bmRsZVBhcmFtZXRlcnMuZ2V0KCk7IH0KQEAg LTU3NSw2ICs1NzMsNyBAQCBwcml2YXRlOgogCiAjaWYgUExBVEZPUk0oQ09DT0EpCiAgICAgUmV0 YWluUHRyPE5TTXV0YWJsZURpY3Rpb25hcnk+IG1fYnVuZGxlUGFyYW1ldGVyczsKKyAgICBSZWZQ dHI8UmVmQ291bnRlcjo6Q291bnQ+IG1fcGx1Z2luUHJvY2Vzc01hbmFnZXJQcm9jZXNzU3VwcHJl c3Npb25EaXNhYmxlZENvdW50OwogI2VuZGlmCiB9OwogCkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvUGx1Z2lucy9QbHVnaW5Qcm9jZXNzTWFuYWdlci5jcHAKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1BsdWdpbnMvUGx1Z2luUHJvY2Vzc01hbmFnZXIuY3Bw CShyZXZpc2lvbiAxNzcyNTUpCisrKyBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvUGx1Z2lucy9Q bHVnaW5Qcm9jZXNzTWFuYWdlci5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTQzLDYgKzQzLDEwIEBA IFBsdWdpblByb2Nlc3NNYW5hZ2VyJiBQbHVnaW5Qcm9jZXNzTWFuYWcKIH0KIAogUGx1Z2luUHJv Y2Vzc01hbmFnZXI6OlBsdWdpblByb2Nlc3NNYW5hZ2VyKCkKKyNpZiBQTEFURk9STShDT0NPQSkK KyAgICA6IG1fcHJvY2Vzc1N1cHByZXNzaW9uRGlzYWJsZWRGb3JQYWdlQ291bnRlcihbdGhpc10o KSB7IHVwZGF0ZVByb2Nlc3NTdXBwcmVzc2lvblN0YXRlKCk7IH0pCisgICAgLCBtX3Byb2Nlc3NT dXBwcmVzc2lvbkVuYWJsZWQodHJ1ZSkKKyNlbmRpZgogewogfQogCkluZGV4OiBTb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvUGx1Z2lucy9QbHVnaW5Qcm9jZXNzTWFuYWdlci5oCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9QbHVnaW5zL1BsdWdpblByb2Nlc3NNYW5hZ2Vy LmgJKHJldmlzaW9uIDE3NzI1NSkKKysrIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9QbHVnaW5z L1BsdWdpblByb2Nlc3NNYW5hZ2VyLmgJKHdvcmtpbmcgY29weSkKQEAgLTM2LDYgKzM2LDcgQEAK ICNpbmNsdWRlIDx3dGYvSGFzaFNldC5oPgogI2luY2x1ZGUgPHd0Zi9OZXZlckRlc3Ryb3llZC5o PgogI2luY2x1ZGUgPHd0Zi9Ob25jb3B5YWJsZS5oPgorI2luY2x1ZGUgPHd0Zi9SZWZDb3VudGVy Lmg+CiAjaW5jbHVkZSA8d3RmL1ZlY3Rvci5oPgogCiBuYW1lc3BhY2UgSVBDIHsKQEAgLTY0LDcg KzY1LDE3IEBAIHB1YmxpYzoKICAgICB2b2lkIGNsZWFyU2l0ZURhdGEoY29uc3QgUGx1Z2luTW9k dWxlSW5mbyYsIFdlYlBsdWdpblNpdGVEYXRhTWFuYWdlciosIGNvbnN0IFZlY3RvcjxTdHJpbmc+ JiBzaXRlcywgdWludDY0X3QgZmxhZ3MsIHVpbnQ2NF90IG1heEFnZUluU2Vjb25kcywgdWludDY0 X3QgY2FsbGJhY2tJRCk7CiAKICNpZiBQTEFURk9STShDT0NPQSkKLSAgICB2b2lkIHNldFByb2Nl c3NTdXBwcmVzc2lvbkVuYWJsZWQoYm9vbCk7CisgICAgUGFzc1JlZlB0cjxSZWZDb3VudGVyOjpD b3VudD4gcHJvY2Vzc1N1cHByZXNzaW9uRGlzYWJsZWRGb3JQYWdlQ291bnQoKQorICAgIHsKKyAg ICAgICAgcmV0dXJuIG1fcHJvY2Vzc1N1cHByZXNzaW9uRGlzYWJsZWRGb3JQYWdlQ291bnRlci5j b3VudCgpOworICAgIH0KKworICAgIHZvaWQgdXBkYXRlUHJvY2Vzc1N1cHByZXNzaW9uU3RhdGUo KTsKKworICAgIGJvb2wgcHJvY2Vzc1N1cHByZXNzaW9uRW5hYmxlZCgpIGNvbnN0CisgICAgewor ICAgICAgICByZXR1cm4gbV9wcm9jZXNzU3VwcHJlc3Npb25FbmFibGVkOworICAgIH07CiAjZW5k aWYKIAogcHJpdmF0ZToKQEAgLTc2LDYgKzg3LDExIEBAIHByaXZhdGU6CiAgICAgSGFzaFNldDx1 aW50NjRfdD4gbV9rbm93blRva2VuczsKIAogICAgIFZlY3RvcjxSZWZQdHI8UGx1Z2luUHJvY2Vz c1Byb3h5Pj4gbV9wbHVnaW5Qcm9jZXNzZXM7CisKKyNpZiBQTEFURk9STShDT0NPQSkKKyAgICBS ZWZDb3VudGVyIG1fcHJvY2Vzc1N1cHByZXNzaW9uRGlzYWJsZWRGb3JQYWdlQ291bnRlcjsKKyAg ICBib29sIG1fcHJvY2Vzc1N1cHByZXNzaW9uRW5hYmxlZDsKKyNlbmRpZgogfTsKIAogfSAvLyBu YW1lc3BhY2UgV2ViS2l0CkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvUGx1Z2lucy9Q bHVnaW5Qcm9jZXNzUHJveHkuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1VJUHJv Y2Vzcy9QbHVnaW5zL1BsdWdpblByb2Nlc3NQcm94eS5jcHAJKHJldmlzaW9uIDE3NzI1NSkKKysr IFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9QbHVnaW5zL1BsdWdpblByb2Nlc3NQcm94eS5jcHAJ KHdvcmtpbmcgY29weSkKQEAgLTIyOSw3ICsyMjksNyBAQCB2b2lkIFBsdWdpblByb2Nlc3NQcm94 eTo6ZGlkRmluaXNoTGF1bmNoCiAgICAgbV9udW1QZW5kaW5nQ29ubmVjdGlvblJlcXVlc3RzID0g MDsKIAogI2lmIFBMQVRGT1JNKENPQ09BKQotICAgIGlmIChXZWJDb250ZXh0Ojpwcm9jZXNzU3Vw cHJlc3Npb25Jc0VuYWJsZWRGb3JBbGxDb250ZXh0cygpKQorICAgIGlmIChQbHVnaW5Qcm9jZXNz TWFuYWdlcjo6c2hhcmVkKCkucHJvY2Vzc1N1cHByZXNzaW9uRW5hYmxlZCgpKQogICAgICAgICBz ZXRQcm9jZXNzU3VwcHJlc3Npb25FbmFibGVkKHRydWUpOwogI2VuZGlmCiB9CkluZGV4OiBTb3Vy Y2UvV2ViS2l0Mi9VSVByb2Nlc3MvUGx1Z2lucy9tYWMvUGx1Z2luUHJvY2Vzc01hbmFnZXJNYWMu bW0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1BsdWdpbnMvbWFjL1Bs dWdpblByb2Nlc3NNYW5hZ2VyTWFjLm1tCShyZXZpc2lvbiAxNzcyNTUpCisrKyBTb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvUGx1Z2lucy9tYWMvUGx1Z2luUHJvY2Vzc01hbmFnZXJNYWMubW0JKHdv cmtpbmcgY29weSkKQEAgLTMyLDggKzMyLDEzIEBACiAKIG5hbWVzcGFjZSBXZWJLaXQgewogCi12 b2lkIFBsdWdpblByb2Nlc3NNYW5hZ2VyOjpzZXRQcm9jZXNzU3VwcHJlc3Npb25FbmFibGVkKGJv b2wgcHJvY2Vzc1N1cHByZXNzaW9uRW5hYmxlZCkKK3ZvaWQgUGx1Z2luUHJvY2Vzc01hbmFnZXI6 OnVwZGF0ZVByb2Nlc3NTdXBwcmVzc2lvblN0YXRlKCkKIHsKKyAgICBib29sIHByb2Nlc3NTdXBw cmVzc2lvbkVuYWJsZWQgPSAhbV9wcm9jZXNzU3VwcHJlc3Npb25EaXNhYmxlZEZvclBhZ2VDb3Vu dGVyLnZhbHVlKCk7CisgICAgaWYgKG1fcHJvY2Vzc1N1cHByZXNzaW9uRW5hYmxlZCA9PSBwcm9j ZXNzU3VwcHJlc3Npb25FbmFibGVkKQorICAgICAgICByZXR1cm47CisgICAgCisgICAgbV9wcm9j ZXNzU3VwcHJlc3Npb25FbmFibGVkID0gcHJvY2Vzc1N1cHByZXNzaW9uRW5hYmxlZDsKICAgICBm b3IgKGF1dG8mIHBsdWdpblByb2Nlc3MgOiBtX3BsdWdpblByb2Nlc3NlcykKICAgICAgICAgcGx1 Z2luUHJvY2Vzcy0+c2V0UHJvY2Vzc1N1cHByZXNzaW9uRW5hYmxlZChwcm9jZXNzU3VwcHJlc3Np b25FbmFibGVkKTsKIH0KSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9tYWMvV2ViQ29u dGV4dE1hYy5tbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvbWFjL1dl YkNvbnRleHRNYWMubW0JKHJldmlzaW9uIDE3NzI1NSkKKysrIFNvdXJjZS9XZWJLaXQyL1VJUHJv Y2Vzcy9tYWMvV2ViQ29udGV4dE1hYy5tbQkod29ya2luZyBjb3B5KQpAQCAtMTAzLDE0ICsxMDMs MTggQEAgc3RhdGljIHZvaWQgcmVnaXN0ZXJVc2VyRGVmYXVsdHNJZk5lZWRlZAogICAgIFtbTlNV c2VyRGVmYXVsdHMgc3RhbmRhcmRVc2VyRGVmYXVsdHNdIHJlZ2lzdGVyRGVmYXVsdHM6cmVnaXN0 cmF0aW9uRGljdGlvbmFyeV07CiB9CiAKLXZvaWQgV2ViQ29udGV4dDo6dXBkYXRlUHJvY2Vzc1N1 cHByZXNzaW9uU3RhdGUoKSBjb25zdAordm9pZCBXZWJDb250ZXh0Ojp1cGRhdGVQcm9jZXNzU3Vw cHJlc3Npb25TdGF0ZSgpCiB7CiAjaWYgRU5BQkxFKE5FVFdPUktfUFJPQ0VTUykKICAgICBpZiAo bV91c2VzTmV0d29ya1Byb2Nlc3MgJiYgbV9uZXR3b3JrUHJvY2VzcykKICAgICAgICAgbV9uZXR3 b3JrUHJvY2Vzcy0+c2V0UHJvY2Vzc1N1cHByZXNzaW9uRW5hYmxlZChwcm9jZXNzU3VwcHJlc3Np b25FbmFibGVkKCkpOwogI2VuZGlmCisKICNpZiBFTkFCTEUoTkVUU0NBUEVfUExVR0lOX0FQSSkK LSAgICBQbHVnaW5Qcm9jZXNzTWFuYWdlcjo6c2hhcmVkKCkuc2V0UHJvY2Vzc1N1cHByZXNzaW9u RW5hYmxlZChwcm9jZXNzU3VwcHJlc3Npb25QcmVmZXJlbmNlSXNFbmFibGVkRm9yQWxsQ29udGV4 dHMoKSk7CisgICAgaWYgKCFtX3Byb2Nlc3NTdXBwcmVzc2lvbkRpc2FibGVkRm9yUGFnZUNvdW50 ZXIudmFsdWUoKSkKKyAgICAgICAgbV9wbHVnaW5Qcm9jZXNzTWFuYWdlclByb2Nlc3NTdXBwcmVz c2lvbkRpc2FibGVkQ291bnQgPSBudWxscHRyOworICAgIGVsc2UgaWYgKCFtX3BsdWdpblByb2Nl c3NNYW5hZ2VyUHJvY2Vzc1N1cHByZXNzaW9uRGlzYWJsZWRDb3VudCkKKyAgICAgICAgbV9wbHVn aW5Qcm9jZXNzTWFuYWdlclByb2Nlc3NTdXBwcmVzc2lvbkRpc2FibGVkQ291bnQgPSBQbHVnaW5Q cm9jZXNzTWFuYWdlcjo6c2hhcmVkKCkucHJvY2Vzc1N1cHByZXNzaW9uRGlzYWJsZWRGb3JQYWdl Q291bnQoKTsKICNlbmRpZgogfQogCkBAIC01MTUsMjQgKzUxOSw2IEBAIGJvb2wgV2ViQ29udGV4 dDo6cHJvY2Vzc1N1cHByZXNzaW9uRW5hYmwKICAgICByZXR1cm4gIW1fdXNlck9ic2VydmFibGVQ YWdlQ291bnRlci52YWx1ZSgpICYmICFtX3Byb2Nlc3NTdXBwcmVzc2lvbkRpc2FibGVkRm9yUGFn ZUNvdW50ZXIudmFsdWUoKTsKIH0KIAotYm9vbCBXZWJDb250ZXh0Ojpwcm9jZXNzU3VwcHJlc3Np b25Jc0VuYWJsZWRGb3JBbGxDb250ZXh0cygpCi17Ci0gICAgZm9yIChjb25zdCBhdXRvKiBjb250 ZXh0IDogV2ViQ29udGV4dDo6YWxsQ29udGV4dHMoKSkgewotICAgICAgICBpZiAoIWNvbnRleHQt PnByb2Nlc3NTdXBwcmVzc2lvbkVuYWJsZWQoKSkKLSAgICAgICAgICAgIHJldHVybiBmYWxzZTsK LSAgICB9Ci0gICAgcmV0dXJuIHRydWU7Ci19Ci0KLWJvb2wgV2ViQ29udGV4dDo6cHJvY2Vzc1N1 cHByZXNzaW9uUHJlZmVyZW5jZUlzRW5hYmxlZEZvckFsbENvbnRleHRzKCkKLXsKLSAgICBmb3Ig KGNvbnN0IGF1dG8qIGNvbnRleHQgOiBXZWJDb250ZXh0OjphbGxDb250ZXh0cygpKSB7Ci0gICAg ICAgIGlmICghY29udGV4dC0+bV9kZWZhdWx0UGFnZUdyb3VwLT5wcmVmZXJlbmNlcygpLnN0b3Jl KCkuZ2V0Qm9vbFZhbHVlRm9yS2V5KFdlYlByZWZlcmVuY2VzS2V5OjpwYWdlVmlzaWJpbGl0eUJh c2VkUHJvY2Vzc1N1cHByZXNzaW9uRW5hYmxlZEtleSgpKSkKLSAgICAgICAgICAgIHJldHVybiBm YWxzZTsKLSAgICB9Ci0gICAgcmV0dXJuIHRydWU7Ci19Ci0gICAgCiB2b2lkIFdlYkNvbnRleHQ6 OnJlZ2lzdGVyTm90aWZpY2F0aW9uT2JzZXJ2ZXJzKCkKIHsKICNpZiAhUExBVEZPUk0oSU9TKQo=