119505 2013-08-05 18:05:39 -0700 Delay Arguments creation in strict mode 2013-08-20 16:40:43 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 oliver oliver eflews.bot gyuyoung.kim oldest_to_newest 914750 0 oliver 2013-08-05 18:05:39 -0700 Delay Arguments creation in strict mode 914751 1 208162 oliver 2013-08-05 18:10:53 -0700 Created attachment 208162 Patch 914753 2 208162 ggaren 2013-08-05 18:15:51 -0700 Comment on attachment 208162 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=208162&action=review > Source/JavaScriptCore/bytecompiler/BytecodeGenerator.cpp:1749 > - if (m_codeBlock->usesArguments() && m_codeBlock->numParameters() != 1 && !m_codeBlock->isStrictMode()) { > + if (m_codeBlock->usesArguments() && m_codeBlock->numParameters() != 1 && !isStrictMode()) { Doesn't this need to be !shouldTearOffArgumentsEagerly()? 914754 3 oliver 2013-08-05 18:17:02 -0700 (In reply to comment #2) > (From update of attachment 208162 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=208162&action=review > > > Source/JavaScriptCore/bytecompiler/BytecodeGenerator.cpp:1749 > > - if (m_codeBlock->usesArguments() && m_codeBlock->numParameters() != 1 && !m_codeBlock->isStrictMode()) { > > + if (m_codeBlock->usesArguments() && m_codeBlock->numParameters() != 1 && !isStrictMode()) { > > Doesn't this need to be !shouldTearOffArgumentsEagerly()? Nope, we perform the Arguments object tear off during arguments object creation when we're in strict mode. 914758 4 208162 eflews.bot 2013-08-05 18:55:34 -0700 Comment on attachment 208162 Patch Attachment 208162 did not pass efl-wk2-ews (efl-wk2): Output: http://webkit-queues.appspot.com/results/1350033 914922 5 208209 oliver 2013-08-06 12:04:30 -0700 Created attachment 208209 Patch 914944 6 208209 ggaren 2013-08-06 14:10:29 -0700 Comment on attachment 208209 Patch r=me 914947 7 oliver 2013-08-06 14:19:02 -0700 Committed r153763: <http://trac.webkit.org/changeset/153763> 919278 8 ggaren 2013-08-20 16:40:43 -0700 <rdar://problem/14790809> 208162 2013-08-05 18:10:53 -0700 2013-08-06 12:04:27 -0700 Patch bug-119505-20130805181405.patch text/plain 9942 oliver U3VidmVyc2lvbiBSZXZpc2lvbjogMTUzNzI4CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCBh ODEwYzg3ZjU5NjgxMTA5NDA3MDViYzhiYzc1NzJjMzViYjc4MTEyLi41NzBlNzkzNDRlOTk0YzQ0 NGU0ZDcyMGRhZWI0MWFjMTM2ZmM4ZWFhIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs NSArMSwzMyBAQAogMjAxMy0wOC0wNSAgT2xpdmVyIEh1bnQgIDxvbGl2ZXJAYXBwbGUuY29tPgog CisgICAgICAgIERlbGF5IEFyZ3VtZW50cyBjcmVhdGlvbiBpbiBzdHJpY3QgbW9kZQorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTE5NTA1CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgTWFrZSB1c2Ugb2YgdGhl IHdyaXRlIHRyYWNraW5nIHBlcmZvcm1lZCBieSB0aGUgcGFyc2VyIHRvCisgICAgICAgIGFsbG93 IHVzIHRvIGtub3cgaWYgd2UncmUgbW9kaWZ5aW5nIHRoZSBwYXJhbWV0ZXJzIHRvIGEgZnVuY3Rp b24uCisgICAgICAgIFRoZW4gdXNlIHRoYXQgaW5mb3JtYXRpb24gdG8gbWFrZSBzdHJpY3QgbW9k ZSBmdW5jdGlvbiBvcHQgb3V0CisgICAgICAgIG9mIGVhZ2VyIGFyZ3VtZW50cyBjcmVhdGlvbi4K KworICAgICAgICAqIGJ5dGVjb21waWxlci9CeXRlY29kZUdlbmVyYXRvci5jcHA6CisgICAgICAg IChKU0M6OkJ5dGVjb2RlR2VuZXJhdG9yOjpCeXRlY29kZUdlbmVyYXRvcik6CisgICAgICAgIChK U0M6OkJ5dGVjb2RlR2VuZXJhdG9yOjpjcmVhdGVBcmd1bWVudHNJZk5lY2Vzc2FyeSk6CisgICAg ICAgIChKU0M6OkJ5dGVjb2RlR2VuZXJhdG9yOjplbWl0UmV0dXJuKToKKyAgICAgICAgKiBieXRl Y29tcGlsZXIvQnl0ZWNvZGVHZW5lcmF0b3IuaDoKKyAgICAgICAgKEpTQzo6Qnl0ZWNvZGVHZW5l cmF0b3I6OnNob3VsZFRlYXJPZmZBcmd1bWVudHNFYWdlcmx5KToKKyAgICAgICAgKiBwYXJzZXIv Tm9kZXMuaDoKKyAgICAgICAgKEpTQzo6U2NvcGVOb2RlOjptb2RpZmllc1BhcmFtZXRlcik6Cisg ICAgICAgICogcGFyc2VyL1BhcnNlci5jcHA6CisgICAgICAgIChKU0M6Ojo6cGFyc2VJbm5lcik6 CisgICAgICAgICogcGFyc2VyL1BhcnNlci5oOgorICAgICAgICAoSlNDOjpTY29wZTo6ZGVjbGFy ZVBhcmFtZXRlcik6CisgICAgICAgIChKU0M6OlNjb3BlOjpnZXRDYXB0dXJlZFZhcmlhYmxlcyk6 CisgICAgICAgIChKU0M6OlBhcnNlcjo6ZGVjbGFyZVdyaXRlKToKKyAgICAgICAgKiBwYXJzZXIv UGFyc2VyTW9kZXMuaDoKKworMjAxMy0wOC0wNSAgT2xpdmVyIEh1bnQgIDxvbGl2ZXJAYXBwbGUu Y29tPgorCiAgICAgICAgIE1vdmUgVHlwZWRBcnJheSBpbXBsZW1lbnRhdGlvbiBpbnRvIEpTQwog ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTE5NDg5CiAK ZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ieXRlY29tcGlsZXIvQnl0ZWNvZGVH ZW5lcmF0b3IuY3BwIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL2J5dGVjb21waWxlci9CeXRlY29k ZUdlbmVyYXRvci5jcHAKaW5kZXggMDI0NjRkZmUyODJiMTNmZGFlYzJjMWJkZWIxZTdlZTQzNzQz ZTU0MS4uYjQ3YzZmNzIwZjlhYWFjM2ZiNTJlMWRhNTEzNWVkYTM3N2FkYzRjNiAxMDA2NDQKLS0t IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2J5dGVjb21waWxlci9CeXRlY29kZUdlbmVyYXRvci5j cHAKKysrIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL2J5dGVjb21waWxlci9CeXRlY29kZUdlbmVy YXRvci5jcHAKQEAgLTIzOCw3ICsyMzgsNyBAQCBCeXRlY29kZUdlbmVyYXRvcjo6Qnl0ZWNvZGVH ZW5lcmF0b3IoVk0mIHZtLCBGdW5jdGlvbkJvZHlOb2RlKiBmdW5jdGlvbkJvZHksIFVubAogICAg ICAgICBlbWl0SW5pdExhenlSZWdpc3Rlcihhcmd1bWVudHNSZWdpc3Rlcik7CiAgICAgICAgIGVt aXRJbml0TGF6eVJlZ2lzdGVyKHVubW9kaWZpZWRBcmd1bWVudHNSZWdpc3Rlcik7CiAgICAgICAg IAotICAgICAgICBpZiAobV9jb2RlQmxvY2stPmlzU3RyaWN0TW9kZSgpKSB7CisgICAgICAgIGlm IChzaG91bGRUZWFyT2ZmQXJndW1lbnRzRWFnZXJseSgpKSB7CiAgICAgICAgICAgICBlbWl0T3Bj b2RlKG9wX2NyZWF0ZV9hcmd1bWVudHMpOwogICAgICAgICAgICAgaW5zdHJ1Y3Rpb25zKCkuYXBw ZW5kKGFyZ3VtZW50c1JlZ2lzdGVyLT5pbmRleCgpKTsKICAgICAgICAgfQpAQCAtMjY4LDcgKzI2 OCw3IEBAIEJ5dGVjb2RlR2VuZXJhdG9yOjpCeXRlY29kZUdlbmVyYXRvcihWTSYgdm0sIEZ1bmN0 aW9uQm9keU5vZGUqIGZ1bmN0aW9uQm9keSwgVW5sCiAgICAgICAgIH0KICAgICB9CiAKLSAgICBp ZiAoY2FwdHVyZXNBbnlBcmd1bWVudEJ5TmFtZSAmJiAhY29kZUJsb2NrLT5pc1N0cmljdE1vZGUo KSkgeworICAgIGlmIChjYXB0dXJlc0FueUFyZ3VtZW50QnlOYW1lICYmICFzaG91bGRUZWFyT2Zm QXJndW1lbnRzRWFnZXJseSgpKSB7CiAgICAgICAgIHNpemVfdCBwYXJhbWV0ZXJDb3VudCA9IG1f c3ltYm9sVGFibGUtPnBhcmFtZXRlckNvdW50KCk7CiAgICAgICAgIE93bkFycmF5UHRyPFNsb3dB cmd1bWVudD4gc2xvd0FyZ3VtZW50cyA9IGFkb3B0QXJyYXlQdHIobmV3IFNsb3dBcmd1bWVudFtw YXJhbWV0ZXJDb3VudF0pOwogICAgICAgICBmb3IgKHNpemVfdCBpID0gMDsgaSA8IHBhcmFtZXRl ckNvdW50OyArK2kpIHsKQEAgLTE1NTksMTAgKzE1NTksNyBAQCB2b2lkIEJ5dGVjb2RlR2VuZXJh dG9yOjpjcmVhdGVBcmd1bWVudHNJZk5lY2Vzc2FyeSgpCiAgICAgaWYgKCFtX2NvZGVCbG9jay0+ dXNlc0FyZ3VtZW50cygpKQogICAgICAgICByZXR1cm47CiAKLSAgICAvLyBJZiB3ZSdyZSBpbiBz dHJpY3QgbW9kZSB3ZSB0ZWFyIG9mZiB0aGUgYXJndW1lbnRzIG9uIGZ1bmN0aW9uCi0gICAgLy8g ZW50cnksIHNvIHRoZXJlJ3Mgbm8gbmVlZCB0byBjaGVjayBpZiB3ZSBuZWVkIHRvIGNyZWF0ZSB0 aGVtCi0gICAgLy8gbm93Ci0gICAgaWYgKG1fY29kZUJsb2NrLT5pc1N0cmljdE1vZGUoKSkKKyAg ICBpZiAoc2hvdWxkVGVhck9mZkFyZ3VtZW50c0VhZ2VybHkoKSkKICAgICAgICAgcmV0dXJuOwog CiAgICAgZW1pdE9wY29kZShvcF9jcmVhdGVfYXJndW1lbnRzKTsKQEAgLTE3NDksNyArMTc0Niw3 IEBAIFJlZ2lzdGVySUQqIEJ5dGVjb2RlR2VuZXJhdG9yOjplbWl0UmV0dXJuKFJlZ2lzdGVySUQq IHNyYykKICAgICAgICAgaW5zdHJ1Y3Rpb25zKCkuYXBwZW5kKG1fYWN0aXZhdGlvblJlZ2lzdGVy LT5pbmRleCgpKTsKICAgICB9CiAKLSAgICBpZiAobV9jb2RlQmxvY2stPnVzZXNBcmd1bWVudHMo KSAmJiBtX2NvZGVCbG9jay0+bnVtUGFyYW1ldGVycygpICE9IDEgJiYgIW1fY29kZUJsb2NrLT5p c1N0cmljdE1vZGUoKSkgeworICAgIGlmIChtX2NvZGVCbG9jay0+dXNlc0FyZ3VtZW50cygpICYm IG1fY29kZUJsb2NrLT5udW1QYXJhbWV0ZXJzKCkgIT0gMSAmJiAhaXNTdHJpY3RNb2RlKCkpIHsK ICAgICAgICAgZW1pdE9wY29kZShvcF90ZWFyX29mZl9hcmd1bWVudHMpOwogICAgICAgICBpbnN0 cnVjdGlvbnMoKS5hcHBlbmQobV9jb2RlQmxvY2stPmFyZ3VtZW50c1JlZ2lzdGVyKCkpOwogICAg ICAgICBpbnN0cnVjdGlvbnMoKS5hcHBlbmQobV9hY3RpdmF0aW9uUmVnaXN0ZXIgPyBtX2FjdGl2 YXRpb25SZWdpc3Rlci0+aW5kZXgoKSA6IGVtaXRMb2FkKDAsIEpTVmFsdWUoKSktPmluZGV4KCkp OwpkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2J5dGVjb21waWxlci9CeXRlY29k ZUdlbmVyYXRvci5oIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL2J5dGVjb21waWxlci9CeXRlY29k ZUdlbmVyYXRvci5oCmluZGV4IDJhODRmYjM2YjI2M2QzOWI3ZTZhMjlkMDM4YjEzNzEzY2ZjNGRm YjQuLmM0OTgxOTZmM2NlMTJiYWQ0MzBiYjI2MmJjM2Q1MWY1NmFjYjVkMWQgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ieXRlY29tcGlsZXIvQnl0ZWNvZGVHZW5lcmF0b3IuaAor KysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvYnl0ZWNvbXBpbGVyL0J5dGVjb2RlR2VuZXJhdG9y LmgKQEAgLTU1NCw2ICs1NTQsMTEgQEAgbmFtZXNwYWNlIEpTQyB7CiAgICAgICAgICAgICByZXR1 cm4gdHJ1ZTsKICAgICAgICAgfQogCisgICAgICAgIGJvb2wgc2hvdWxkVGVhck9mZkFyZ3VtZW50 c0VhZ2VybHkoKQorICAgICAgICB7CisgICAgICAgICAgICByZXR1cm4gbV9jb2RlVHlwZSA9PSBG dW5jdGlvbkNvZGUgJiYgaXNTdHJpY3RNb2RlKCkgJiYgbV9zY29wZU5vZGUtPm1vZGlmaWVzUGFy YW1ldGVyKCk7CisgICAgICAgIH0KKwogICAgICAgICBSZWdpc3RlcklEKiBlbWl0VGhyb3dFeHBy ZXNzaW9uVG9vRGVlcEV4Y2VwdGlvbigpOwogCiAgICAgICAgIHZvaWQgY3JlYXRlQXJndW1lbnRz SWZOZWNlc3NhcnkoKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9wYXJzZXIv Tm9kZXMuaCBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9wYXJzZXIvTm9kZXMuaAppbmRleCAxODAw YTE2NWQ5OWIzNTlkZDdhYjg2MmY0ZTJiMDBhNDcxY2E1Y2E0Li40YjZiOGRhOWY1ZTQwZjAxNzdl YmZjN2ZkNmZiM2M0N2E3N2FmZjA2IDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUv cGFyc2VyL05vZGVzLmgKKysrIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL3BhcnNlci9Ob2Rlcy5o CkBAIC0xMzg1LDYgKzEzODUsNyBAQCBuYW1lc3BhY2UgSlNDIHsKIAogICAgICAgICBib29sIHVz ZXNFdmFsKCkgY29uc3QgeyByZXR1cm4gbV9mZWF0dXJlcyAmIEV2YWxGZWF0dXJlOyB9CiAgICAg ICAgIGJvb2wgdXNlc0FyZ3VtZW50cygpIGNvbnN0IHsgcmV0dXJuIChtX2ZlYXR1cmVzICYgQXJn dW1lbnRzRmVhdHVyZSkgJiYgIShtX2ZlYXR1cmVzICYgU2hhZG93c0FyZ3VtZW50c0ZlYXR1cmUp OyB9CisgICAgICAgIGJvb2wgbW9kaWZpZXNQYXJhbWV0ZXIoKSBjb25zdCB7IHJldHVybiBtX2Zl YXR1cmVzICYgTW9kaWZpZWRQYXJhbWV0ZXJGZWF0dXJlOyB9CiAgICAgICAgIGJvb2wgaXNTdHJp Y3RNb2RlKCkgY29uc3QgeyByZXR1cm4gbV9mZWF0dXJlcyAmIFN0cmljdE1vZGVGZWF0dXJlOyB9 CiAgICAgICAgIHZvaWQgc2V0VXNlc0FyZ3VtZW50cygpIHsgbV9mZWF0dXJlcyB8PSBBcmd1bWVu dHNGZWF0dXJlOyB9CiAgICAgICAgIGJvb2wgdXNlc1RoaXMoKSBjb25zdCB7IHJldHVybiBtX2Zl YXR1cmVzICYgVGhpc0ZlYXR1cmU7IH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29y ZS9wYXJzZXIvUGFyc2VyLmNwcCBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9wYXJzZXIvUGFyc2Vy LmNwcAppbmRleCAwN2JkNTk1NzYxYmIxOTdjMzdkZDYxNzA1MjI0MjhlYzFjZGMxNjZmLi4zNDc4 ZjU1YWI1NWVlMWQ5NWVlYzVmZTdiYWE4ZjMxOTYxMzQ0NDFjIDEwMDY0NAotLS0gYS9Tb3VyY2Uv SmF2YVNjcmlwdENvcmUvcGFyc2VyL1BhcnNlci5jcHAKKysrIGIvU291cmNlL0phdmFTY3JpcHRD b3JlL3BhcnNlci9QYXJzZXIuY3BwCkBAIC0xMjEsMTIgKzEyMSwxNSBAQCBTdHJpbmcgUGFyc2Vy PExleGVyVHlwZT46OnBhcnNlSW5uZXIoKQogICAgIH0KIAogICAgIElkZW50aWZpZXJTZXQgY2Fw dHVyZWRWYXJpYWJsZXM7Ci0gICAgc2NvcGUtPmdldENhcHR1cmVkVmFyaWFibGVzKGNhcHR1cmVk VmFyaWFibGVzKTsKKyAgICBib29sIG1vZGlmaWVkUGFyYW1ldGVyID0gZmFsc2U7CisgICAgc2Nv cGUtPmdldENhcHR1cmVkVmFyaWFibGVzKGNhcHR1cmVkVmFyaWFibGVzLCBtb2RpZmllZFBhcmFt ZXRlcik7CiAgICAgQ29kZUZlYXR1cmVzIGZlYXR1cmVzID0gY29udGV4dC5mZWF0dXJlcygpOwog ICAgIGlmIChzY29wZS0+c3RyaWN0TW9kZSgpKQogICAgICAgICBmZWF0dXJlcyB8PSBTdHJpY3RN b2RlRmVhdHVyZTsKICAgICBpZiAoc2NvcGUtPnNoYWRvd3NBcmd1bWVudHMoKSkKICAgICAgICAg ZmVhdHVyZXMgfD0gU2hhZG93c0FyZ3VtZW50c0ZlYXR1cmU7CisgICAgaWYgKG1vZGlmaWVkUGFy YW1ldGVyKQorICAgICAgICBmZWF0dXJlcyB8PSBNb2RpZmllZFBhcmFtZXRlckZlYXR1cmU7CiAK ICAgICBkaWRGaW5pc2hQYXJzaW5nKHNvdXJjZUVsZW1lbnRzLCBjb250ZXh0LnZhckRlY2xhcmF0 aW9ucygpLCBjb250ZXh0LmZ1bmNEZWNsYXJhdGlvbnMoKSwgZmVhdHVyZXMsCiAgICAgICAgIGNv bnRleHQubnVtQ29uc3RhbnRzKCksIGNhcHR1cmVkVmFyaWFibGVzKTsKZGlmZiAtLWdpdCBhL1Nv dXJjZS9KYXZhU2NyaXB0Q29yZS9wYXJzZXIvUGFyc2VyLmggYi9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvcGFyc2VyL1BhcnNlci5oCmluZGV4IDg3ZDUyMzQwNGFhNWU1MTEzMDgwMWFmMjMxYmIxY2Iy NGM5YjgyZTQuLmY3NGNlMWIzZjkwN2NlZjk2YWJmN2FkMDAzM2YzMDFlZTQ0NjZiMTkgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9wYXJzZXIvUGFyc2VyLmgKKysrIGIvU291cmNl L0phdmFTY3JpcHRDb3JlL3BhcnNlci9QYXJzZXIuaApAQCAtMjE3LDYgKzIxNyw4IEBAIHN0cnVj dCBTY29wZSB7CiAgICAgICAgIGJvb2wgaXNBcmd1bWVudHMgPSBtX3ZtLT5wcm9wZXJ0eU5hbWVz LT5hcmd1bWVudHMgPT0gKmlkZW50OwogICAgICAgICBib29sIGlzVmFsaWRTdHJpY3RNb2RlID0g bV9kZWNsYXJlZFZhcmlhYmxlcy5hZGQoaWRlbnQtPnN0cmluZygpLmltcGwoKSkuaXNOZXdFbnRy eSAmJiBtX3ZtLT5wcm9wZXJ0eU5hbWVzLT5ldmFsICE9ICppZGVudCAmJiAhaXNBcmd1bWVudHM7 CiAgICAgICAgIG1faXNWYWxpZFN0cmljdE1vZGUgPSBtX2lzVmFsaWRTdHJpY3RNb2RlICYmIGlz VmFsaWRTdHJpY3RNb2RlOworICAgICAgICBtX2RlY2xhcmVkUGFyYW1ldGVycy5hZGQoaWRlbnQt PnN0cmluZygpLmltcGwoKSk7CisKICAgICAgICAgaWYgKGlzQXJndW1lbnRzKQogICAgICAgICAg ICAgbV9zaGFkb3dzQXJndW1lbnRzID0gdHJ1ZTsKICAgICAgICAgcmV0dXJuIGlzVmFsaWRTdHJp Y3RNb2RlOwpAQCAtMjU0LDE4ICsyNTYsMTAgQEAgc3RydWN0IFNjb3BlIHsKICAgICAgICAgcmV0 dXJuIHRydWU7CiAgICAgfQogCi0gICAgdm9pZCBnZXRVbmNhcHR1cmVkV3JpdHRlblZhcmlhYmxl cyhJZGVudGlmaWVyU2V0JiB3cml0dGVuVmFyaWFibGVzKQotICAgIHsKLSAgICAgICAgSWRlbnRp ZmllclNldDo6aXRlcmF0b3IgZW5kID0gbV93cml0dGVuVmFyaWFibGVzLmVuZCgpOwotICAgICAg ICBmb3IgKElkZW50aWZpZXJTZXQ6Oml0ZXJhdG9yIHB0ciA9IG1fd3JpdHRlblZhcmlhYmxlcy5i ZWdpbigpOyBwdHIgIT0gZW5kOyArK3B0cikgewotICAgICAgICAgICAgaWYgKCFtX2RlY2xhcmVk VmFyaWFibGVzLmNvbnRhaW5zKCpwdHIpKQotICAgICAgICAgICAgICAgIHdyaXR0ZW5WYXJpYWJs ZXMuYWRkKCpwdHIpOwotICAgICAgICB9Ci0gICAgfQotCi0gICAgdm9pZCBnZXRDYXB0dXJlZFZh cmlhYmxlcyhJZGVudGlmaWVyU2V0JiBjYXB0dXJlZFZhcmlhYmxlcykKKyAgICB2b2lkIGdldENh cHR1cmVkVmFyaWFibGVzKElkZW50aWZpZXJTZXQmIGNhcHR1cmVkVmFyaWFibGVzLCBib29sJiBt b2RpZmllZFBhcmFtZXRlcikKICAgICB7CiAgICAgICAgIGlmIChtX25lZWRzRnVsbEFjdGl2YXRp b24gfHwgbV91c2VzRXZhbCkgeworICAgICAgICAgICAgbW9kaWZpZWRQYXJhbWV0ZXIgPSB0cnVl OwogICAgICAgICAgICAgY2FwdHVyZWRWYXJpYWJsZXMuc3dhcChtX2RlY2xhcmVkVmFyaWFibGVz KTsKICAgICAgICAgICAgIHJldHVybjsKICAgICAgICAgfQpAQCAtMjc0LDYgKzI2OCwxNiBAQCBz dHJ1Y3QgU2NvcGUgewogICAgICAgICAgICAgICAgIGNvbnRpbnVlOwogICAgICAgICAgICAgY2Fw dHVyZWRWYXJpYWJsZXMuYWRkKCpwdHIpOwogICAgICAgICB9CisgICAgICAgIG1vZGlmaWVkUGFy YW1ldGVyID0gZmFsc2U7CisgICAgICAgIGlmIChtX2RlY2xhcmVkUGFyYW1ldGVycy5zaXplKCkp IHsKKyAgICAgICAgICAgIElkZW50aWZpZXJTZXQ6Oml0ZXJhdG9yIGVuZCA9IG1fd3JpdHRlblZh cmlhYmxlcy5lbmQoKTsKKyAgICAgICAgICAgIGZvciAoSWRlbnRpZmllclNldDo6aXRlcmF0b3Ig cHRyID0gbV93cml0dGVuVmFyaWFibGVzLmJlZ2luKCk7IHB0ciAhPSBlbmQ7ICsrcHRyKSB7Cisg ICAgICAgICAgICAgICAgaWYgKCFtX2RlY2xhcmVkUGFyYW1ldGVycy5jb250YWlucygqcHRyKSkK KyAgICAgICAgICAgICAgICAgICAgY29udGludWU7CisgICAgICAgICAgICAgICAgbW9kaWZpZWRQ YXJhbWV0ZXIgPSB0cnVlOworICAgICAgICAgICAgICAgIGJyZWFrOworICAgICAgICAgICAgfQor ICAgICAgICB9CiAgICAgfQogICAgIHZvaWQgc2V0U3RyaWN0TW9kZSgpIHsgbV9zdHJpY3RNb2Rl ID0gdHJ1ZTsgfQogICAgIGJvb2wgc3RyaWN0TW9kZSgpIGNvbnN0IHsgcmV0dXJuIG1fc3RyaWN0 TW9kZTsgfQpAQCAtMzI3LDYgKzMzMSw3IEBAIHByaXZhdGU6CiAKICAgICB0eXBlZGVmIFZlY3Rv cjxTY29wZUxhYmVsSW5mbywgMj4gTGFiZWxTdGFjazsKICAgICBPd25QdHI8TGFiZWxTdGFjaz4g bV9sYWJlbHM7CisgICAgSWRlbnRpZmllclNldCBtX2RlY2xhcmVkUGFyYW1ldGVyczsKICAgICBJ ZGVudGlmaWVyU2V0IG1fZGVjbGFyZWRWYXJpYWJsZXM7CiAgICAgSWRlbnRpZmllclNldCBtX3Vz ZWRWYXJpYWJsZXM7CiAgICAgSWRlbnRpZmllclNldCBtX2Nsb3NlZFZhcmlhYmxlczsKQEAgLTQ2 MCw3ICs0NjUsNyBAQCBwcml2YXRlOgogICAgIAogICAgIHZvaWQgZGVjbGFyZVdyaXRlKGNvbnN0 IElkZW50aWZpZXIqIGlkZW50KQogICAgIHsKLSAgICAgICAgaWYgKCFtX3N5bnRheEFscmVhZHlW YWxpZGF0ZWQpCisgICAgICAgIGlmICghbV9zeW50YXhBbHJlYWR5VmFsaWRhdGVkIHx8IHN0cmlj dE1vZGUoKSkKICAgICAgICAgICAgIG1fc2NvcGVTdGFjay5sYXN0KCkuZGVjbGFyZVdyaXRlKGlk ZW50KTsKICAgICB9CiAgICAgCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcGFy c2VyL1BhcnNlck1vZGVzLmggYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcGFyc2VyL1BhcnNlck1v ZGVzLmgKaW5kZXggYTczODNhM2UxMDRjODNmNGJkZDE3YWIzN2NmY2FhYjU2ODllMDI5Yy4uNGU5 YTE3Y2QyMWNhMzQxNDZiYmQ0ODE1NmEzNzJjZDQwNGRlZjYwYyAxMDA2NDQKLS0tIGEvU291cmNl L0phdmFTY3JpcHRDb3JlL3BhcnNlci9QYXJzZXJNb2Rlcy5oCisrKyBiL1NvdXJjZS9KYXZhU2Ny aXB0Q29yZS9wYXJzZXIvUGFyc2VyTW9kZXMuaApAQCAtNDcsOCArNDcsOSBAQCBjb25zdCBDb2Rl RmVhdHVyZXMgQ2F0Y2hGZWF0dXJlID0gMSA8PCAzOwogY29uc3QgQ29kZUZlYXR1cmVzIFRoaXNG ZWF0dXJlID0gMSA8PCA0OwogY29uc3QgQ29kZUZlYXR1cmVzIFN0cmljdE1vZGVGZWF0dXJlID0g MSA8PCA1OwogY29uc3QgQ29kZUZlYXR1cmVzIFNoYWRvd3NBcmd1bWVudHNGZWF0dXJlID0gMSA8 PCA2OworY29uc3QgQ29kZUZlYXR1cmVzIE1vZGlmaWVkUGFyYW1ldGVyRmVhdHVyZSA9IDEgPDwg NzsKIAotY29uc3QgQ29kZUZlYXR1cmVzIEFsbEZlYXR1cmVzID0gRXZhbEZlYXR1cmUgfCBBcmd1 bWVudHNGZWF0dXJlIHwgV2l0aEZlYXR1cmUgfCBDYXRjaEZlYXR1cmUgfCBUaGlzRmVhdHVyZSB8 IFN0cmljdE1vZGVGZWF0dXJlIHwgU2hhZG93c0FyZ3VtZW50c0ZlYXR1cmU7Citjb25zdCBDb2Rl RmVhdHVyZXMgQWxsRmVhdHVyZXMgPSBFdmFsRmVhdHVyZSB8IEFyZ3VtZW50c0ZlYXR1cmUgfCBX aXRoRmVhdHVyZSB8IENhdGNoRmVhdHVyZSB8IFRoaXNGZWF0dXJlIHwgU3RyaWN0TW9kZUZlYXR1 cmUgfCBTaGFkb3dzQXJndW1lbnRzRmVhdHVyZSB8IE1vZGlmaWVkUGFyYW1ldGVyRmVhdHVyZTsK IAogfSAvLyBuYW1lc3BhY2UgSlNDCiAK 208209 2013-08-06 12:04:30 -0700 2013-08-06 14:10:28 -0700 Patch bug-119505-20130806120740.patch text/plain 12916 oliver U3VidmVyc2lvbiBSZXZpc2lvbjogMTUzNzU5CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCBm Mjg5NWI4N2U0ZTAzYzRhM2E5YTg1OGFkNGFkYjk3MGY2YWE2YTg0Li43MzE5NjExMWVkMTFjNWY4 NmRkNTRkY2JlYjVjMjQyYTc1Yjg1ZmI1IDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwzMSBAQAorMjAxMy0wOC0wNSAgT2xpdmVyIEh1bnQgIDxvbGl2ZXJAYXBwbGUuY29tPgor CisgICAgICAgIERlbGF5IEFyZ3VtZW50cyBjcmVhdGlvbiBpbiBzdHJpY3QgbW9kZQorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTE5NTA1CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgTWFrZSB1c2Ugb2YgdGhl IHdyaXRlIHRyYWNraW5nIHBlcmZvcm1lZCBieSB0aGUgcGFyc2VyIHRvCisgICAgICAgIGFsbG93 IHVzIHRvIGtub3cgaWYgd2UncmUgbW9kaWZ5aW5nIHRoZSBwYXJhbWV0ZXJzIHRvIGEgZnVuY3Rp b24uCisgICAgICAgIFRoZW4gdXNlIHRoYXQgaW5mb3JtYXRpb24gdG8gbWFrZSBzdHJpY3QgbW9k ZSBmdW5jdGlvbiBvcHQgb3V0CisgICAgICAgIG9mIGVhZ2VyIGFyZ3VtZW50cyBjcmVhdGlvbi4K KworICAgICAgICAqIGJ5dGVjb21waWxlci9CeXRlY29kZUdlbmVyYXRvci5jcHA6CisgICAgICAg IChKU0M6OkJ5dGVjb2RlR2VuZXJhdG9yOjpCeXRlY29kZUdlbmVyYXRvcik6CisgICAgICAgIChK U0M6OkJ5dGVjb2RlR2VuZXJhdG9yOjpjcmVhdGVBcmd1bWVudHNJZk5lY2Vzc2FyeSk6CisgICAg ICAgIChKU0M6OkJ5dGVjb2RlR2VuZXJhdG9yOjplbWl0UmV0dXJuKToKKyAgICAgICAgKiBieXRl Y29tcGlsZXIvQnl0ZWNvZGVHZW5lcmF0b3IuaDoKKyAgICAgICAgKEpTQzo6Qnl0ZWNvZGVHZW5l cmF0b3I6OnNob3VsZFRlYXJPZmZBcmd1bWVudHNFYWdlcmx5KToKKyAgICAgICAgKiBwYXJzZXIv Tm9kZXMuaDoKKyAgICAgICAgKEpTQzo6U2NvcGVOb2RlOjptb2RpZmllc1BhcmFtZXRlcik6Cisg ICAgICAgICogcGFyc2VyL1BhcnNlci5jcHA6CisgICAgICAgIChKU0M6Ojo6cGFyc2VJbm5lcik6 CisgICAgICAgICogcGFyc2VyL1BhcnNlci5oOgorICAgICAgICAoSlNDOjpTY29wZTo6ZGVjbGFy ZVBhcmFtZXRlcik6CisgICAgICAgIChKU0M6OlNjb3BlOjpnZXRDYXB0dXJlZFZhcmlhYmxlcyk6 CisgICAgICAgIChKU0M6OlBhcnNlcjo6ZGVjbGFyZVdyaXRlKToKKyAgICAgICAgKiBwYXJzZXIv UGFyc2VyTW9kZXMuaDoKKwogMjAxMy0wNy0yMyAgRGF2aWQgRmFybGVyICA8ZGZhcmxlckBhcHBs ZS5jb20+CiAKICAgICAgICAgUHJvdmlkZSBvcHRpb25hbCBPVEhFUl9DRkxBR1MsIE9USEVSX0NQ UEZMQUdTLCBPVEhFUl9MREZMQUdTIGFkZGl0aW9ucyBmb3IgYnVpbGRpbmcgd2l0aCBBU0FOCmRp ZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvYnl0ZWNvbXBpbGVyL0J5dGVjb2RlR2Vu ZXJhdG9yLmNwcCBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ieXRlY29tcGlsZXIvQnl0ZWNvZGVH ZW5lcmF0b3IuY3BwCmluZGV4IDAyNDY0ZGZlMjgyYjEzZmRhZWMyYzFiZGViMWU3ZWU0Mzc0M2U1 NDEuLmI0N2M2ZjcyMGY5YWFhYzNmYjUyZTFkYTUxMzVlZGEzNzdhZGM0YzYgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ieXRlY29tcGlsZXIvQnl0ZWNvZGVHZW5lcmF0b3IuY3Bw CisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ieXRlY29tcGlsZXIvQnl0ZWNvZGVHZW5lcmF0 b3IuY3BwCkBAIC0yMzgsNyArMjM4LDcgQEAgQnl0ZWNvZGVHZW5lcmF0b3I6OkJ5dGVjb2RlR2Vu ZXJhdG9yKFZNJiB2bSwgRnVuY3Rpb25Cb2R5Tm9kZSogZnVuY3Rpb25Cb2R5LCBVbmwKICAgICAg ICAgZW1pdEluaXRMYXp5UmVnaXN0ZXIoYXJndW1lbnRzUmVnaXN0ZXIpOwogICAgICAgICBlbWl0 SW5pdExhenlSZWdpc3Rlcih1bm1vZGlmaWVkQXJndW1lbnRzUmVnaXN0ZXIpOwogICAgICAgICAK LSAgICAgICAgaWYgKG1fY29kZUJsb2NrLT5pc1N0cmljdE1vZGUoKSkgeworICAgICAgICBpZiAo c2hvdWxkVGVhck9mZkFyZ3VtZW50c0VhZ2VybHkoKSkgewogICAgICAgICAgICAgZW1pdE9wY29k ZShvcF9jcmVhdGVfYXJndW1lbnRzKTsKICAgICAgICAgICAgIGluc3RydWN0aW9ucygpLmFwcGVu ZChhcmd1bWVudHNSZWdpc3Rlci0+aW5kZXgoKSk7CiAgICAgICAgIH0KQEAgLTI2OCw3ICsyNjgs NyBAQCBCeXRlY29kZUdlbmVyYXRvcjo6Qnl0ZWNvZGVHZW5lcmF0b3IoVk0mIHZtLCBGdW5jdGlv bkJvZHlOb2RlKiBmdW5jdGlvbkJvZHksIFVubAogICAgICAgICB9CiAgICAgfQogCi0gICAgaWYg KGNhcHR1cmVzQW55QXJndW1lbnRCeU5hbWUgJiYgIWNvZGVCbG9jay0+aXNTdHJpY3RNb2RlKCkp IHsKKyAgICBpZiAoY2FwdHVyZXNBbnlBcmd1bWVudEJ5TmFtZSAmJiAhc2hvdWxkVGVhck9mZkFy Z3VtZW50c0VhZ2VybHkoKSkgewogICAgICAgICBzaXplX3QgcGFyYW1ldGVyQ291bnQgPSBtX3N5 bWJvbFRhYmxlLT5wYXJhbWV0ZXJDb3VudCgpOwogICAgICAgICBPd25BcnJheVB0cjxTbG93QXJn dW1lbnQ+IHNsb3dBcmd1bWVudHMgPSBhZG9wdEFycmF5UHRyKG5ldyBTbG93QXJndW1lbnRbcGFy YW1ldGVyQ291bnRdKTsKICAgICAgICAgZm9yIChzaXplX3QgaSA9IDA7IGkgPCBwYXJhbWV0ZXJD b3VudDsgKytpKSB7CkBAIC0xNTU5LDEwICsxNTU5LDcgQEAgdm9pZCBCeXRlY29kZUdlbmVyYXRv cjo6Y3JlYXRlQXJndW1lbnRzSWZOZWNlc3NhcnkoKQogICAgIGlmICghbV9jb2RlQmxvY2stPnVz ZXNBcmd1bWVudHMoKSkKICAgICAgICAgcmV0dXJuOwogCi0gICAgLy8gSWYgd2UncmUgaW4gc3Ry aWN0IG1vZGUgd2UgdGVhciBvZmYgdGhlIGFyZ3VtZW50cyBvbiBmdW5jdGlvbgotICAgIC8vIGVu dHJ5LCBzbyB0aGVyZSdzIG5vIG5lZWQgdG8gY2hlY2sgaWYgd2UgbmVlZCB0byBjcmVhdGUgdGhl bQotICAgIC8vIG5vdwotICAgIGlmIChtX2NvZGVCbG9jay0+aXNTdHJpY3RNb2RlKCkpCisgICAg aWYgKHNob3VsZFRlYXJPZmZBcmd1bWVudHNFYWdlcmx5KCkpCiAgICAgICAgIHJldHVybjsKIAog ICAgIGVtaXRPcGNvZGUob3BfY3JlYXRlX2FyZ3VtZW50cyk7CkBAIC0xNzQ5LDcgKzE3NDYsNyBA QCBSZWdpc3RlcklEKiBCeXRlY29kZUdlbmVyYXRvcjo6ZW1pdFJldHVybihSZWdpc3RlcklEKiBz cmMpCiAgICAgICAgIGluc3RydWN0aW9ucygpLmFwcGVuZChtX2FjdGl2YXRpb25SZWdpc3Rlci0+ aW5kZXgoKSk7CiAgICAgfQogCi0gICAgaWYgKG1fY29kZUJsb2NrLT51c2VzQXJndW1lbnRzKCkg JiYgbV9jb2RlQmxvY2stPm51bVBhcmFtZXRlcnMoKSAhPSAxICYmICFtX2NvZGVCbG9jay0+aXNT dHJpY3RNb2RlKCkpIHsKKyAgICBpZiAobV9jb2RlQmxvY2stPnVzZXNBcmd1bWVudHMoKSAmJiBt X2NvZGVCbG9jay0+bnVtUGFyYW1ldGVycygpICE9IDEgJiYgIWlzU3RyaWN0TW9kZSgpKSB7CiAg ICAgICAgIGVtaXRPcGNvZGUob3BfdGVhcl9vZmZfYXJndW1lbnRzKTsKICAgICAgICAgaW5zdHJ1 Y3Rpb25zKCkuYXBwZW5kKG1fY29kZUJsb2NrLT5hcmd1bWVudHNSZWdpc3RlcigpKTsKICAgICAg ICAgaW5zdHJ1Y3Rpb25zKCkuYXBwZW5kKG1fYWN0aXZhdGlvblJlZ2lzdGVyID8gbV9hY3RpdmF0 aW9uUmVnaXN0ZXItPmluZGV4KCkgOiBlbWl0TG9hZCgwLCBKU1ZhbHVlKCkpLT5pbmRleCgpKTsK ZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ieXRlY29tcGlsZXIvQnl0ZWNvZGVH ZW5lcmF0b3IuaCBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ieXRlY29tcGlsZXIvQnl0ZWNvZGVH ZW5lcmF0b3IuaAppbmRleCAyYTg0ZmIzNmIyNjNkMzliN2U2YTI5ZDAzOGIxMzcxM2NmYzRkZmI0 Li5jNDk4MTk2ZjNjZTEyYmFkNDMwYmIyNjJiYzNkNTFmNTZhY2I1ZDFkIDEwMDY0NAotLS0gYS9T b3VyY2UvSmF2YVNjcmlwdENvcmUvYnl0ZWNvbXBpbGVyL0J5dGVjb2RlR2VuZXJhdG9yLmgKKysr IGIvU291cmNlL0phdmFTY3JpcHRDb3JlL2J5dGVjb21waWxlci9CeXRlY29kZUdlbmVyYXRvci5o CkBAIC01NTQsNiArNTU0LDExIEBAIG5hbWVzcGFjZSBKU0MgewogICAgICAgICAgICAgcmV0dXJu IHRydWU7CiAgICAgICAgIH0KIAorICAgICAgICBib29sIHNob3VsZFRlYXJPZmZBcmd1bWVudHNF YWdlcmx5KCkKKyAgICAgICAgeworICAgICAgICAgICAgcmV0dXJuIG1fY29kZVR5cGUgPT0gRnVu Y3Rpb25Db2RlICYmIGlzU3RyaWN0TW9kZSgpICYmIG1fc2NvcGVOb2RlLT5tb2RpZmllc1BhcmFt ZXRlcigpOworICAgICAgICB9CisKICAgICAgICAgUmVnaXN0ZXJJRCogZW1pdFRocm93RXhwcmVz c2lvblRvb0RlZXBFeGNlcHRpb24oKTsKIAogICAgICAgICB2b2lkIGNyZWF0ZUFyZ3VtZW50c0lm TmVjZXNzYXJ5KCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcGFyc2VyL05v ZGVzLmggYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcGFyc2VyL05vZGVzLmgKaW5kZXggMTgwMGEx NjVkOTliMzU5ZGQ3YWI4NjJmNGUyYjAwYTQ3MWNhNWNhNC4uNGI2YjhkYTlmNWU0MGYwMTc3ZWJm YzdmZDZmYjNjNDdhNzdhZmYwNiAxMDA2NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3JlL3Bh cnNlci9Ob2Rlcy5oCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9wYXJzZXIvTm9kZXMuaApA QCAtMTM4NSw2ICsxMzg1LDcgQEAgbmFtZXNwYWNlIEpTQyB7CiAKICAgICAgICAgYm9vbCB1c2Vz RXZhbCgpIGNvbnN0IHsgcmV0dXJuIG1fZmVhdHVyZXMgJiBFdmFsRmVhdHVyZTsgfQogICAgICAg ICBib29sIHVzZXNBcmd1bWVudHMoKSBjb25zdCB7IHJldHVybiAobV9mZWF0dXJlcyAmIEFyZ3Vt ZW50c0ZlYXR1cmUpICYmICEobV9mZWF0dXJlcyAmIFNoYWRvd3NBcmd1bWVudHNGZWF0dXJlKTsg fQorICAgICAgICBib29sIG1vZGlmaWVzUGFyYW1ldGVyKCkgY29uc3QgeyByZXR1cm4gbV9mZWF0 dXJlcyAmIE1vZGlmaWVkUGFyYW1ldGVyRmVhdHVyZTsgfQogICAgICAgICBib29sIGlzU3RyaWN0 TW9kZSgpIGNvbnN0IHsgcmV0dXJuIG1fZmVhdHVyZXMgJiBTdHJpY3RNb2RlRmVhdHVyZTsgfQog ICAgICAgICB2b2lkIHNldFVzZXNBcmd1bWVudHMoKSB7IG1fZmVhdHVyZXMgfD0gQXJndW1lbnRz RmVhdHVyZTsgfQogICAgICAgICBib29sIHVzZXNUaGlzKCkgY29uc3QgeyByZXR1cm4gbV9mZWF0 dXJlcyAmIFRoaXNGZWF0dXJlOyB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUv cGFyc2VyL1BhcnNlci5jcHAgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcGFyc2VyL1BhcnNlci5j cHAKaW5kZXggMDdiZDU5NTc2MWJiMTk3YzM3ZGQ2MTcwNTIyNDI4ZWMxY2RjMTY2Zi4uMzQ3OGY1 NWFiNTVlZTFkOTVlZWM1ZmU3YmFhOGYzMTk2MTM0NDQxYyAxMDA2NDQKLS0tIGEvU291cmNlL0ph dmFTY3JpcHRDb3JlL3BhcnNlci9QYXJzZXIuY3BwCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29y ZS9wYXJzZXIvUGFyc2VyLmNwcApAQCAtMTIxLDEyICsxMjEsMTUgQEAgU3RyaW5nIFBhcnNlcjxM ZXhlclR5cGU+OjpwYXJzZUlubmVyKCkKICAgICB9CiAKICAgICBJZGVudGlmaWVyU2V0IGNhcHR1 cmVkVmFyaWFibGVzOwotICAgIHNjb3BlLT5nZXRDYXB0dXJlZFZhcmlhYmxlcyhjYXB0dXJlZFZh cmlhYmxlcyk7CisgICAgYm9vbCBtb2RpZmllZFBhcmFtZXRlciA9IGZhbHNlOworICAgIHNjb3Bl LT5nZXRDYXB0dXJlZFZhcmlhYmxlcyhjYXB0dXJlZFZhcmlhYmxlcywgbW9kaWZpZWRQYXJhbWV0 ZXIpOwogICAgIENvZGVGZWF0dXJlcyBmZWF0dXJlcyA9IGNvbnRleHQuZmVhdHVyZXMoKTsKICAg ICBpZiAoc2NvcGUtPnN0cmljdE1vZGUoKSkKICAgICAgICAgZmVhdHVyZXMgfD0gU3RyaWN0TW9k ZUZlYXR1cmU7CiAgICAgaWYgKHNjb3BlLT5zaGFkb3dzQXJndW1lbnRzKCkpCiAgICAgICAgIGZl YXR1cmVzIHw9IFNoYWRvd3NBcmd1bWVudHNGZWF0dXJlOworICAgIGlmIChtb2RpZmllZFBhcmFt ZXRlcikKKyAgICAgICAgZmVhdHVyZXMgfD0gTW9kaWZpZWRQYXJhbWV0ZXJGZWF0dXJlOwogCiAg ICAgZGlkRmluaXNoUGFyc2luZyhzb3VyY2VFbGVtZW50cywgY29udGV4dC52YXJEZWNsYXJhdGlv bnMoKSwgY29udGV4dC5mdW5jRGVjbGFyYXRpb25zKCksIGZlYXR1cmVzLAogICAgICAgICBjb250 ZXh0Lm51bUNvbnN0YW50cygpLCBjYXB0dXJlZFZhcmlhYmxlcyk7CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvSmF2YVNjcmlwdENvcmUvcGFyc2VyL1BhcnNlci5oIGIvU291cmNlL0phdmFTY3JpcHRDb3Jl L3BhcnNlci9QYXJzZXIuaAppbmRleCA4N2Q1MjM0MDRhYTVlNTExMzA4MDFhZjIzMWJiMWNiMjRj OWI4MmU0Li5mNzRjZTFiM2Y5MDdjZWY5NmFiZjdhZDAwMzNmMzAxZWU0NDY2YjE5IDEwMDY0NAot LS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcGFyc2VyL1BhcnNlci5oCisrKyBiL1NvdXJjZS9K YXZhU2NyaXB0Q29yZS9wYXJzZXIvUGFyc2VyLmgKQEAgLTIxNyw2ICsyMTcsOCBAQCBzdHJ1Y3Qg U2NvcGUgewogICAgICAgICBib29sIGlzQXJndW1lbnRzID0gbV92bS0+cHJvcGVydHlOYW1lcy0+ YXJndW1lbnRzID09ICppZGVudDsKICAgICAgICAgYm9vbCBpc1ZhbGlkU3RyaWN0TW9kZSA9IG1f ZGVjbGFyZWRWYXJpYWJsZXMuYWRkKGlkZW50LT5zdHJpbmcoKS5pbXBsKCkpLmlzTmV3RW50cnkg JiYgbV92bS0+cHJvcGVydHlOYW1lcy0+ZXZhbCAhPSAqaWRlbnQgJiYgIWlzQXJndW1lbnRzOwog ICAgICAgICBtX2lzVmFsaWRTdHJpY3RNb2RlID0gbV9pc1ZhbGlkU3RyaWN0TW9kZSAmJiBpc1Zh bGlkU3RyaWN0TW9kZTsKKyAgICAgICAgbV9kZWNsYXJlZFBhcmFtZXRlcnMuYWRkKGlkZW50LT5z dHJpbmcoKS5pbXBsKCkpOworCiAgICAgICAgIGlmIChpc0FyZ3VtZW50cykKICAgICAgICAgICAg IG1fc2hhZG93c0FyZ3VtZW50cyA9IHRydWU7CiAgICAgICAgIHJldHVybiBpc1ZhbGlkU3RyaWN0 TW9kZTsKQEAgLTI1NCwxOCArMjU2LDEwIEBAIHN0cnVjdCBTY29wZSB7CiAgICAgICAgIHJldHVy biB0cnVlOwogICAgIH0KIAotICAgIHZvaWQgZ2V0VW5jYXB0dXJlZFdyaXR0ZW5WYXJpYWJsZXMo SWRlbnRpZmllclNldCYgd3JpdHRlblZhcmlhYmxlcykKLSAgICB7Ci0gICAgICAgIElkZW50aWZp ZXJTZXQ6Oml0ZXJhdG9yIGVuZCA9IG1fd3JpdHRlblZhcmlhYmxlcy5lbmQoKTsKLSAgICAgICAg Zm9yIChJZGVudGlmaWVyU2V0OjppdGVyYXRvciBwdHIgPSBtX3dyaXR0ZW5WYXJpYWJsZXMuYmVn aW4oKTsgcHRyICE9IGVuZDsgKytwdHIpIHsKLSAgICAgICAgICAgIGlmICghbV9kZWNsYXJlZFZh cmlhYmxlcy5jb250YWlucygqcHRyKSkKLSAgICAgICAgICAgICAgICB3cml0dGVuVmFyaWFibGVz LmFkZCgqcHRyKTsKLSAgICAgICAgfQotICAgIH0KLQotICAgIHZvaWQgZ2V0Q2FwdHVyZWRWYXJp YWJsZXMoSWRlbnRpZmllclNldCYgY2FwdHVyZWRWYXJpYWJsZXMpCisgICAgdm9pZCBnZXRDYXB0 dXJlZFZhcmlhYmxlcyhJZGVudGlmaWVyU2V0JiBjYXB0dXJlZFZhcmlhYmxlcywgYm9vbCYgbW9k aWZpZWRQYXJhbWV0ZXIpCiAgICAgewogICAgICAgICBpZiAobV9uZWVkc0Z1bGxBY3RpdmF0aW9u IHx8IG1fdXNlc0V2YWwpIHsKKyAgICAgICAgICAgIG1vZGlmaWVkUGFyYW1ldGVyID0gdHJ1ZTsK ICAgICAgICAgICAgIGNhcHR1cmVkVmFyaWFibGVzLnN3YXAobV9kZWNsYXJlZFZhcmlhYmxlcyk7 CiAgICAgICAgICAgICByZXR1cm47CiAgICAgICAgIH0KQEAgLTI3NCw2ICsyNjgsMTYgQEAgc3Ry dWN0IFNjb3BlIHsKICAgICAgICAgICAgICAgICBjb250aW51ZTsKICAgICAgICAgICAgIGNhcHR1 cmVkVmFyaWFibGVzLmFkZCgqcHRyKTsKICAgICAgICAgfQorICAgICAgICBtb2RpZmllZFBhcmFt ZXRlciA9IGZhbHNlOworICAgICAgICBpZiAobV9kZWNsYXJlZFBhcmFtZXRlcnMuc2l6ZSgpKSB7 CisgICAgICAgICAgICBJZGVudGlmaWVyU2V0OjppdGVyYXRvciBlbmQgPSBtX3dyaXR0ZW5WYXJp YWJsZXMuZW5kKCk7CisgICAgICAgICAgICBmb3IgKElkZW50aWZpZXJTZXQ6Oml0ZXJhdG9yIHB0 ciA9IG1fd3JpdHRlblZhcmlhYmxlcy5iZWdpbigpOyBwdHIgIT0gZW5kOyArK3B0cikgeworICAg ICAgICAgICAgICAgIGlmICghbV9kZWNsYXJlZFBhcmFtZXRlcnMuY29udGFpbnMoKnB0cikpCisg ICAgICAgICAgICAgICAgICAgIGNvbnRpbnVlOworICAgICAgICAgICAgICAgIG1vZGlmaWVkUGFy YW1ldGVyID0gdHJ1ZTsKKyAgICAgICAgICAgICAgICBicmVhazsKKyAgICAgICAgICAgIH0KKyAg ICAgICAgfQogICAgIH0KICAgICB2b2lkIHNldFN0cmljdE1vZGUoKSB7IG1fc3RyaWN0TW9kZSA9 IHRydWU7IH0KICAgICBib29sIHN0cmljdE1vZGUoKSBjb25zdCB7IHJldHVybiBtX3N0cmljdE1v ZGU7IH0KQEAgLTMyNyw2ICszMzEsNyBAQCBwcml2YXRlOgogCiAgICAgdHlwZWRlZiBWZWN0b3I8 U2NvcGVMYWJlbEluZm8sIDI+IExhYmVsU3RhY2s7CiAgICAgT3duUHRyPExhYmVsU3RhY2s+IG1f bGFiZWxzOworICAgIElkZW50aWZpZXJTZXQgbV9kZWNsYXJlZFBhcmFtZXRlcnM7CiAgICAgSWRl bnRpZmllclNldCBtX2RlY2xhcmVkVmFyaWFibGVzOwogICAgIElkZW50aWZpZXJTZXQgbV91c2Vk VmFyaWFibGVzOwogICAgIElkZW50aWZpZXJTZXQgbV9jbG9zZWRWYXJpYWJsZXM7CkBAIC00NjAs NyArNDY1LDcgQEAgcHJpdmF0ZToKICAgICAKICAgICB2b2lkIGRlY2xhcmVXcml0ZShjb25zdCBJ ZGVudGlmaWVyKiBpZGVudCkKICAgICB7Ci0gICAgICAgIGlmICghbV9zeW50YXhBbHJlYWR5VmFs aWRhdGVkKQorICAgICAgICBpZiAoIW1fc3ludGF4QWxyZWFkeVZhbGlkYXRlZCB8fCBzdHJpY3RN b2RlKCkpCiAgICAgICAgICAgICBtX3Njb3BlU3RhY2subGFzdCgpLmRlY2xhcmVXcml0ZShpZGVu dCk7CiAgICAgfQogICAgIApkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL3BhcnNl ci9QYXJzZXJNb2Rlcy5oIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL3BhcnNlci9QYXJzZXJNb2Rl cy5oCmluZGV4IGE3MzgzYTNlMTA0YzgzZjRiZGQxN2FiMzdjZmNhYWI1Njg5ZTAyOWMuLjRlOWEx N2NkMjFjYTM0MTQ2YmJkNDgxNTZhMzcyY2Q0MDRkZWY2MGMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9K YXZhU2NyaXB0Q29yZS9wYXJzZXIvUGFyc2VyTW9kZXMuaAorKysgYi9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvcGFyc2VyL1BhcnNlck1vZGVzLmgKQEAgLTQ3LDggKzQ3LDkgQEAgY29uc3QgQ29kZUZl YXR1cmVzIENhdGNoRmVhdHVyZSA9IDEgPDwgMzsKIGNvbnN0IENvZGVGZWF0dXJlcyBUaGlzRmVh dHVyZSA9IDEgPDwgNDsKIGNvbnN0IENvZGVGZWF0dXJlcyBTdHJpY3RNb2RlRmVhdHVyZSA9IDEg PDwgNTsKIGNvbnN0IENvZGVGZWF0dXJlcyBTaGFkb3dzQXJndW1lbnRzRmVhdHVyZSA9IDEgPDwg NjsKK2NvbnN0IENvZGVGZWF0dXJlcyBNb2RpZmllZFBhcmFtZXRlckZlYXR1cmUgPSAxIDw8IDc7 CiAKLWNvbnN0IENvZGVGZWF0dXJlcyBBbGxGZWF0dXJlcyA9IEV2YWxGZWF0dXJlIHwgQXJndW1l bnRzRmVhdHVyZSB8IFdpdGhGZWF0dXJlIHwgQ2F0Y2hGZWF0dXJlIHwgVGhpc0ZlYXR1cmUgfCBT dHJpY3RNb2RlRmVhdHVyZSB8IFNoYWRvd3NBcmd1bWVudHNGZWF0dXJlOworY29uc3QgQ29kZUZl YXR1cmVzIEFsbEZlYXR1cmVzID0gRXZhbEZlYXR1cmUgfCBBcmd1bWVudHNGZWF0dXJlIHwgV2l0 aEZlYXR1cmUgfCBDYXRjaEZlYXR1cmUgfCBUaGlzRmVhdHVyZSB8IFN0cmljdE1vZGVGZWF0dXJl IHwgU2hhZG93c0FyZ3VtZW50c0ZlYXR1cmUgfCBNb2RpZmllZFBhcmFtZXRlckZlYXR1cmU7CiAK IH0gLy8gbmFtZXNwYWNlIEpTQwogCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cg Yi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggMzQzN2YzN2Q3MDY2NmQxYzg4YTI3OGVhNDRm Nzc3YzNlMGVjNjc2ZS4uYzNhZmRiMzE3MzE3ZWI5NGUxYjQwNjgyNTg2YzU3NmE2YmVkNGJkZiAx MDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3RzL0NoYW5n ZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDEzLTA4LTA2ICBPbGl2ZXIgSHVudCAgPG9saXZlckBh cHBsZS5jb20+CisKKyAgICAgICAgRGVsYXkgQXJndW1lbnRzIGNyZWF0aW9uIGluIHN0cmljdCBt b2RlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMTk1 MDUKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBZGQg cGVyZm9ybWFuY2UgdGVzdGNhc2UgZm9yIGxhenkgY3JlYXRpb24gb2YgYXJndW1lbnRzIGluIHN0 cmljdCBtb2RlCisKKyAgICAgICAgKiBmYXN0L2pzL3JlZ3Jlc3MvZGVsYXktdGVhci1vZmYtYXJn dW1lbnRzLXN0cmljdG1vZGUtZXhwZWN0ZWQudHh0OiBBZGRlZC4KKyAgICAgICAgKiBmYXN0L2pz L3JlZ3Jlc3MvZGVsYXktdGVhci1vZmYtYXJndW1lbnRzLXN0cmljdG1vZGUuaHRtbDogQWRkZWQu CisgICAgICAgICogZmFzdC9qcy9yZWdyZXNzL3NjcmlwdC10ZXN0cy9kZWxheS10ZWFyLW9mZi1h cmd1bWVudHMtc3RyaWN0bW9kZS5qczogQWRkZWQuCisgICAgICAgIChiYXIpOgorCiAyMDEzLTA4 LTA2ICBCZW0gSm9uZXMtQmV5ICA8YmpvbmVzYmVAYWRvYmUuY29tPgogCiAgICAgICAgIFtDU1Mg U2hhcGVzXSBOZXcgcG9zaXRpb25pbmcgbW9kZWw6IHN1cHBvcnQgZm9yIHNoYXBlLW1hcmdpbgpk aWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZmFzdC9qcy9yZWdyZXNzL2RlbGF5LXRlYXItb2ZmLWFy Z3VtZW50cy1zdHJpY3Rtb2RlLWV4cGVjdGVkLnR4dCBiL0xheW91dFRlc3RzL2Zhc3QvanMvcmVn cmVzcy9kZWxheS10ZWFyLW9mZi1hcmd1bWVudHMtc3RyaWN0bW9kZS1leHBlY3RlZC50eHQKbmV3 IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMC4uMjQ2MTliMDk0MzIyNGJmMWNhZTkwZTlmOWFkMzgyYTllOTcwNmExOAotLS0gL2Rl di9udWxsCisrKyBiL0xheW91dFRlc3RzL2Zhc3QvanMvcmVncmVzcy9kZWxheS10ZWFyLW9mZi1h cmd1bWVudHMtc3RyaWN0bW9kZS1leHBlY3RlZC50eHQKQEAgLTAsMCArMSwxMCBAQAorSlNSZWdy ZXNzL2RlbGF5LXRlYXItb2ZmLWFyZ3VtZW50cy1zdHJpY3Rtb2RlCisKK09uIHN1Y2Nlc3MsIHlv dSB3aWxsIHNlZSBhIHNlcmllcyBvZiAiUEFTUyIgbWVzc2FnZXMsIGZvbGxvd2VkIGJ5ICJURVNU IENPTVBMRVRFIi4KKworCitQQVNTIG5vIGV4Y2VwdGlvbiB0aHJvd24KK1BBU1Mgc3VjY2Vzc2Z1 bGx5UGFyc2VkIGlzIHRydWUKKworVEVTVCBDT01QTEVURQorCmRpZmYgLS1naXQgYS9MYXlvdXRU ZXN0cy9mYXN0L2pzL3JlZ3Jlc3MvZGVsYXktdGVhci1vZmYtYXJndW1lbnRzLXN0cmljdG1vZGUu aHRtbCBiL0xheW91dFRlc3RzL2Zhc3QvanMvcmVncmVzcy9kZWxheS10ZWFyLW9mZi1hcmd1bWVu dHMtc3RyaWN0bW9kZS5odG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLjg2N2U3MmY0ZmY5MmQzMDY5MmI3ZTAwZWM0 NWNkZGE4MTJiZTMwNDIKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9mYXN0L2pzL3Jl Z3Jlc3MvZGVsYXktdGVhci1vZmYtYXJndW1lbnRzLXN0cmljdG1vZGUuaHRtbApAQCAtMCwwICsx LDEyIEBACis8IURPQ1RZUEUgSFRNTCBQVUJMSUMgIi0vL0lFVEYvL0RURCBIVE1MLy9FTiI+Cis8 aHRtbD4KKzxoZWFkPgorPHNjcmlwdCBzcmM9Ii4uL3Jlc291cmNlcy9qcy10ZXN0LXByZS5qcyI+ PC9zY3JpcHQ+Cis8L2hlYWQ+Cis8Ym9keT4KKzxzY3JpcHQgc3JjPSJyZXNvdXJjZXMvcmVncmVz cy1wcmUuanMiPjwvc2NyaXB0PgorPHNjcmlwdCBzcmM9InNjcmlwdC10ZXN0cy9kZWxheS10ZWFy LW9mZi1hcmd1bWVudHMtc3RyaWN0bW9kZS5qcyI+PC9zY3JpcHQ+Cis8c2NyaXB0IHNyYz0icmVz b3VyY2VzL3JlZ3Jlc3MtcG9zdC5qcyI+PC9zY3JpcHQ+Cis8c2NyaXB0IHNyYz0iLi4vcmVzb3Vy Y2VzL2pzLXRlc3QtcG9zdC5qcyI+PC9zY3JpcHQ+Cis8L2JvZHk+Cis8L2h0bWw+CmRpZmYgLS1n aXQgYS9MYXlvdXRUZXN0cy9mYXN0L2pzL3JlZ3Jlc3Mvc2NyaXB0LXRlc3RzL2RlbGF5LXRlYXIt b2ZmLWFyZ3VtZW50cy1zdHJpY3Rtb2RlLmpzIGIvTGF5b3V0VGVzdHMvZmFzdC9qcy9yZWdyZXNz L3NjcmlwdC10ZXN0cy9kZWxheS10ZWFyLW9mZi1hcmd1bWVudHMtc3RyaWN0bW9kZS5qcwpuZXcg ZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwLi5hMmVkNDE3OGFkZjBiNGFiZTc0YTBjZWQwMGQzMWIzOTk3ZTg3ZmI3Ci0tLSAvZGV2 L251bGwKKysrIGIvTGF5b3V0VGVzdHMvZmFzdC9qcy9yZWdyZXNzL3NjcmlwdC10ZXN0cy9kZWxh eS10ZWFyLW9mZi1hcmd1bWVudHMtc3RyaWN0bW9kZS5qcwpAQCAtMCwwICsxLDE1IEBACitmdW5j dGlvbiBiYXIoeCkKK3sKKwkidXNlIHN0cmljdCI7CisgICAgdmFyIHJlc3VsdCA9IDA7CisgICAg Zm9yICh2YXIgaSA9IDA7IGkgPCBhcmd1bWVudHMubGVuZ3RoOyArK2kpCisgICAgICAgIHJlc3Vs dCArPSBhcmd1bWVudHNbaV07CisgICAgcmV0dXJuIHJlc3VsdDsKK30KKwordmFyIHJlc3VsdCA9 IDA7Citmb3IgKHZhciBpID0gMDsgaSA8IDEwMDAwMDsgKytpKQorICAgIHJlc3VsdCArPSBiYXIo aSwgaSArIDEsIGkgKyAyLCBpICsgMyk7CisKK2lmIChyZXN1bHQgIT0gMjAwMDA0MDAwMDApCisg ICAgdGhyb3cgIkJhZCByZXN1bHQ6ICIgKyByZXN1bHQ7Cg==