139196 2014-12-02 14:07:50 -0800 operationPutById's can potentially generate code for an out of date structure 2014-12-10 11:59:13 -0800 1 1 1 Unclassified WebKit JavaScriptCore 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 139424 1 mmirman mmirman commit-queue dino fpizlo ggaren kling mmirman oldest_to_newest 1051958 0 mmirman 2014-12-02 14:07:50 -0800 Similar to how operationGetByIdBuildList could have done so as seen in https://bugs.webkit.org/show_bug.cgi?id=136961 The fix will be different since the slot can not be generated separately from the put. Patch forthcoming. 1051972 1 242451 mmirman 2014-12-02 14:40:07 -0800 Created attachment 242451 operationPutByIds fix 1051975 2 242451 fpizlo 2014-12-02 14:47:34 -0800 Comment on attachment 242451 operationPutByIds fix Can you add a test that would fail without your patch? 1052550 3 242584 mmirman 2014-12-04 13:35:46 -0800 Created attachment 242584 operationPutByIds fix Adds a test that fails without the patch. 1053545 4 242584 commit-queue 2014-12-08 15:10:48 -0800 Comment on attachment 242584 operationPutByIds fix Clearing flags on attachment: 242584 Committed r176979: <http://trac.webkit.org/changeset/176979> 1053546 5 commit-queue 2014-12-08 15:10:52 -0800 All reviewed patches have been landed. Closing bug. 1053588 6 dino 2014-12-08 17:02:03 -0800 I think this broke some JS tests: https://build.webkit.org/builders/Apple%20Yosemite%20Release%20WK2%20%28Tests%29/builds/1158 1053598 7 commit-queue 2014-12-08 17:21:40 -0800 Re-opened since this is blocked by bug 139424 1054252 8 mmirman 2014-12-10 11:40:42 -0800 Committed a patch similar to the reviewed patch https://bug-139196-attachments.webkit.org/attachment.cgi?id=242584 but without the failing test. Committed r176979: http://trac.webkit.org/changeset/177083 1054263 9 mmirman 2014-12-10 11:59:13 -0800 Test added from the patch https://bugs.webkit.org/attachment.cgi?id=242584&action=edit is now included in <https://bugs.webkit.org/show_bug.cgi?id=139500> 242451 2014-12-02 14:40:07 -0800 2014-12-04 13:35:46 -0800 operationPutByIds fix 0001-Fixes-operationPutByIds-such-that-they-check-that-th.patch text/plain 10288 mmirman ZGlmZiAtLWdpdCBTb3VyY2UvSmF2YVNjcmlwdENvcmUvQ2hhbmdlTG9nIFNvdXJjZS9KYXZhU2Ny aXB0Q29yZS9DaGFuZ2VMb2cKaW5kZXggNWZmNjA1NC4uYmVjMjU2NyAxMDA2NDQKLS0tIFNvdXJj ZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFu Z2VMb2cKQEAgLTEsMCArMSwyNSBAQAorIDIwMTQtMTItMDIgIE1hdHRoZXcgTWlybWFuICA8bW1p cm1hbkBhcHBsZS5jb20+CisgCisgICAgICAgIEZpeGVzIG9wZXJhdGlvblB1dEJ5SWRzIHN1Y2gg dGhhdCB0aGV5IGNoZWNrIHRoYXQgdGhlIHB1dCBkaWRuJ3QKKyAgICAgICAgY2hhbmdlIHRoZSBz dHJ1Y3R1cmUgb2YgdGhlIG9iamVjdCB3aG8ncyBwcm9wZXJ0eSBhY2Nlc3MgaXMgYmVpbmcKKyAg ICAgICAgY2FjaGVkLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9MTM5MTk2CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgKiBqaXQvSklUT3BlcmF0aW9ucy5jcHA6CisgICAgICAgIChKU0M6Om9wZXJhdGlvbkdl dEJ5SWRPcHRpbWl6ZSk6IGNoYW5nZWQgZ2V0IHRvIGdldFByb3BlcnR5U2xvdAorICAgICAgICAo SlNDOjpvcGVyYXRpb25QdXRCeUlkU3RyaWN0QnVpbGRMaXN0KTogc2F2ZWQgdGhlIHN0cnVjdHVy ZSBiZWZvcmUgdGhlIHB1dC4KKyAgICAgICAgKEpTQzo6b3BlcmF0aW9uUHV0QnlJZE5vblN0cmlj dEJ1aWxkTGlzdCk6IGRpdHRvLgorICAgICAgICAoSlNDOjpvcGVyYXRpb25QdXRCeUlkRGlyZWN0 U3RyaWN0QnVpbGRMaXN0KTogZGl0dG8uCisgICAgICAgIChKU0M6Om9wZXJhdGlvblB1dEJ5SWRE aXJlY3ROb25TdHJpY3RCdWlsZExpc3QpOiBkaXR0by4KKyAgICAgICAgKiBqaXQvUmVwYXRjaC5j cHA6CisgICAgICAgIChKU0M6OnRyeUNhY2hlUHV0QnlJRCk6IGZpeGVkIHN0cnVjdHVyZSgpIHRv IHVzZSB0aGUgZXhpc3RhbnQgdm0uIAorICAgICAgICAoSlNDOjp0cnlCdWlsZFB1dEJ5SWRMaXN0 KTogQWRkZWQgYSBjaGVjayB0aGF0IHRoZSBvbGQgc3RydWN0dXJlJ3MgaWQgCisgICAgICAgIGlz IHRoZSBzYW1lIGFzIHRoZSBuZXcuCisgICAgICAgIChKU0M6OmJ1aWxkUHV0QnlJZExpc3QpOiBB ZGRlZCBhbiBhcmd1bWVudAorICAgICAgICAqIGppdC9SZXBhdGNoLmg6IAorICAgICAgICAoSlND OjpidWlsZFB1dEJ5SWRMaXN0KTogQWRkZWQgYW4gYXJndW1lbnQKKyAgICAgICAgKiB0ZXN0cy9z dHJlc3MvcHV0LWJ5LWlkLXN0cmljdC1idWlsZC1saXN0LW9yZGVyLmpzOiBBZGRlZC4KKyAgICAg ICAgKGZvbyk6CisKMjAxNC0xMi0wMiAgTWF0dGhldyBNaXJtYW4gIDxtbWlybWFuQGFwcGxlLmNv bT4KCiAgICAgICAgIEZpeGVzIGlubGluZSBjYWNoZSBmYXN0IHBhdGggYWNjZXNzaW5nIG5vbmV4 aXN0YW50IGdldHRlcnMuCmRpZmYgLS1naXQgU291cmNlL0phdmFTY3JpcHRDb3JlL2ppdC9KSVRP cGVyYXRpb25zLmNwcCBTb3VyY2UvSmF2YVNjcmlwdENvcmUvaml0L0pJVE9wZXJhdGlvbnMuY3Bw CmluZGV4IGQ2N2FhNjEuLjI5NWFhODQgMTAwNjQ0Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUv aml0L0pJVE9wZXJhdGlvbnMuY3BwCisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvaml0L0pJVE9w ZXJhdGlvbnMuY3BwCkBAIC0xNjMsMTQgKzE2MywxNSBAQCBFbmNvZGVkSlNWYWx1ZSBKSVRfT1BF UkFUSU9OIG9wZXJhdGlvbkdldEJ5SWRPcHRpbWl6ZShFeGVjU3RhdGUqIGV4ZWMsIFN0cnVjdHVy ZQogCiAgICAgSlNWYWx1ZSBiYXNlVmFsdWUgPSBKU1ZhbHVlOjpkZWNvZGUoYmFzZSk7CiAgICAg UHJvcGVydHlTbG90IHNsb3QoYmFzZVZhbHVlKTsKLSAgICBKU1ZhbHVlIHJlc3VsdCA9IGJhc2VW YWx1ZS5nZXQoZXhlYywgaWRlbnQsIHNsb3QpOwogICAgIAorICAgIGJvb2wgaGFzUmVzdWx0ID0g YmFzZVZhbHVlLmdldFByb3BlcnR5U2xvdChleGVjLCBpZGVudCwgc2xvdCk7CiAgICAgaWYgKHN0 dWJJbmZvLT5zZWVuKQogICAgICAgICByZXBhdGNoR2V0QnlJRChleGVjLCBiYXNlVmFsdWUsIGlk ZW50LCBzbG90LCAqc3R1YkluZm8pOwogICAgIGVsc2UKICAgICAgICAgc3R1YkluZm8tPnNlZW4g PSB0cnVlOworICAgIAorICAgIHJldHVybiBKU1ZhbHVlOjplbmNvZGUoaGFzUmVzdWx0PyBzbG90 LmdldFZhbHVlKGV4ZWMsIGlkZW50KSA6IGpzVW5kZWZpbmVkKCkpOwogCi0gICAgcmV0dXJuIEpT VmFsdWU6OmVuY29kZShyZXN1bHQpOwogfQogCiBFbmNvZGVkSlNWYWx1ZSBKSVRfT1BFUkFUSU9O IG9wZXJhdGlvbkluT3B0aW1pemUoRXhlY1N0YXRlKiBleGVjLCBTdHJ1Y3R1cmVTdHViSW5mbyog c3R1YkluZm8sIEpTQ2VsbCogYmFzZSwgU3RyaW5nSW1wbCoga2V5KQpAQCAtMzY1LDEyICszNjYs MTMgQEAgdm9pZCBKSVRfT1BFUkFUSU9OIG9wZXJhdGlvblB1dEJ5SWRTdHJpY3RCdWlsZExpc3Qo RXhlY1N0YXRlKiBleGVjLCBTdHJ1Y3R1cmVTdHUKICAgICBKU1ZhbHVlIGJhc2VWYWx1ZSA9IEpT VmFsdWU6OmRlY29kZShlbmNvZGVkQmFzZSk7CiAgICAgUHV0UHJvcGVydHlTbG90IHNsb3QoYmFz ZVZhbHVlLCB0cnVlLCBleGVjLT5jb2RlQmxvY2soKS0+cHV0QnlJZENvbnRleHQoKSk7CiAgICAg CisgICAgU3RydWN0dXJlKiBzdHJ1Y3R1cmUgPSBiYXNlVmFsdWUuaXNDZWxsKCkgPyBiYXNlVmFs dWUuYXNDZWxsKCktPnN0cnVjdHVyZSgqdm0pIDogbnVsbHB0cjsgCiAgICAgYmFzZVZhbHVlLnB1 dChleGVjLCBpZGVudCwgdmFsdWUsIHNsb3QpOwotICAgIAorCiAgICAgaWYgKGFjY2Vzc1R5cGUg IT0gc3RhdGljX2Nhc3Q8QWNjZXNzVHlwZT4oc3R1YkluZm8tPmFjY2Vzc1R5cGUpKQogICAgICAg ICByZXR1cm47Ci0gICAgCi0gICAgYnVpbGRQdXRCeUlkTGlzdChleGVjLCBiYXNlVmFsdWUsIGlk ZW50LCBzbG90LCAqc3R1YkluZm8sIE5vdERpcmVjdCk7CisKKyAgICBidWlsZFB1dEJ5SWRMaXN0 KGV4ZWMsIGJhc2VWYWx1ZSwgc3RydWN0dXJlLCBpZGVudCwgc2xvdCwgKnN0dWJJbmZvLCBOb3RE aXJlY3QpOwogfQogCiB2b2lkIEpJVF9PUEVSQVRJT04gb3BlcmF0aW9uUHV0QnlJZE5vblN0cmlj dEJ1aWxkTGlzdChFeGVjU3RhdGUqIGV4ZWMsIFN0cnVjdHVyZVN0dWJJbmZvKiBzdHViSW5mbywg RW5jb2RlZEpTVmFsdWUgZW5jb2RlZFZhbHVlLCBFbmNvZGVkSlNWYWx1ZSBlbmNvZGVkQmFzZSwg U3RyaW5nSW1wbCogdWlkKQpAQCAtMzg0LDEzICszODYsMTQgQEAgdm9pZCBKSVRfT1BFUkFUSU9O IG9wZXJhdGlvblB1dEJ5SWROb25TdHJpY3RCdWlsZExpc3QoRXhlY1N0YXRlKiBleGVjLCBTdHJ1 Y3R1cmUKICAgICBKU1ZhbHVlIHZhbHVlID0gSlNWYWx1ZTo6ZGVjb2RlKGVuY29kZWRWYWx1ZSk7 CiAgICAgSlNWYWx1ZSBiYXNlVmFsdWUgPSBKU1ZhbHVlOjpkZWNvZGUoZW5jb2RlZEJhc2UpOwog ICAgIFB1dFByb3BlcnR5U2xvdCBzbG90KGJhc2VWYWx1ZSwgZmFsc2UsIGV4ZWMtPmNvZGVCbG9j aygpLT5wdXRCeUlkQ29udGV4dCgpKTsKLSAgICAKKworICAgIFN0cnVjdHVyZSogc3RydWN0dXJl ID0gYmFzZVZhbHVlLmlzQ2VsbCgpID8gYmFzZVZhbHVlLmFzQ2VsbCgpLT5zdHJ1Y3R1cmUoKnZt KSA6IG51bGxwdHI7CiAgICAgYmFzZVZhbHVlLnB1dChleGVjLCBpZGVudCwgdmFsdWUsIHNsb3Qp OwogICAgIAogICAgIGlmIChhY2Nlc3NUeXBlICE9IHN0YXRpY19jYXN0PEFjY2Vzc1R5cGU+KHN0 dWJJbmZvLT5hY2Nlc3NUeXBlKSkKICAgICAgICAgcmV0dXJuOwogICAgIAotICAgIGJ1aWxkUHV0 QnlJZExpc3QoZXhlYywgYmFzZVZhbHVlLCBpZGVudCwgc2xvdCwgKnN0dWJJbmZvLCBOb3REaXJl Y3QpOworICAgIGJ1aWxkUHV0QnlJZExpc3QoZXhlYywgYmFzZVZhbHVlLCBzdHJ1Y3R1cmUsIGlk ZW50LCBzbG90LCAqc3R1YkluZm8sIE5vdERpcmVjdCk7CiB9CiAKIHZvaWQgSklUX09QRVJBVElP TiBvcGVyYXRpb25QdXRCeUlkRGlyZWN0U3RyaWN0QnVpbGRMaXN0KEV4ZWNTdGF0ZSogZXhlYywg U3RydWN0dXJlU3R1YkluZm8qIHN0dWJJbmZvLCBFbmNvZGVkSlNWYWx1ZSBlbmNvZGVkVmFsdWUs IEVuY29kZWRKU1ZhbHVlIGVuY29kZWRCYXNlLCBTdHJpbmdJbXBsKiB1aWQpCkBAIC00MDQsMTMg KzQwNywxNCBAQCB2b2lkIEpJVF9PUEVSQVRJT04gb3BlcmF0aW9uUHV0QnlJZERpcmVjdFN0cmlj dEJ1aWxkTGlzdChFeGVjU3RhdGUqIGV4ZWMsIFN0cnVjdAogICAgIEpTVmFsdWUgdmFsdWUgPSBK U1ZhbHVlOjpkZWNvZGUoZW5jb2RlZFZhbHVlKTsKICAgICBKU09iamVjdCogYmFzZU9iamVjdCA9 IGFzT2JqZWN0KEpTVmFsdWU6OmRlY29kZShlbmNvZGVkQmFzZSkpOwogICAgIFB1dFByb3BlcnR5 U2xvdCBzbG90KGJhc2VPYmplY3QsIHRydWUsIGV4ZWMtPmNvZGVCbG9jaygpLT5wdXRCeUlkQ29u dGV4dCgpKTsKLSAgICAKLSAgICBiYXNlT2JqZWN0LT5wdXREaXJlY3QoZXhlYy0+dm0oKSwgaWRl bnQsIHZhbHVlLCBzbG90KTsKKworICAgIFN0cnVjdHVyZSogc3RydWN0dXJlID0gYmFzZU9iamVj dC0+c3RydWN0dXJlKCp2bSk7ICAgIAorICAgIGJhc2VPYmplY3QtPnB1dERpcmVjdCgqdm0sIGlk ZW50LCB2YWx1ZSwgc2xvdCk7CiAgICAgCiAgICAgaWYgKGFjY2Vzc1R5cGUgIT0gc3RhdGljX2Nh c3Q8QWNjZXNzVHlwZT4oc3R1YkluZm8tPmFjY2Vzc1R5cGUpKQogICAgICAgICByZXR1cm47CiAg ICAgCi0gICAgYnVpbGRQdXRCeUlkTGlzdChleGVjLCBiYXNlT2JqZWN0LCBpZGVudCwgc2xvdCwg KnN0dWJJbmZvLCBEaXJlY3QpOworICAgIGJ1aWxkUHV0QnlJZExpc3QoZXhlYywgYmFzZU9iamVj dCwgc3RydWN0dXJlLCBpZGVudCwgc2xvdCwgKnN0dWJJbmZvLCBEaXJlY3QpOwogfQogCiB2b2lk IEpJVF9PUEVSQVRJT04gb3BlcmF0aW9uUHV0QnlJZERpcmVjdE5vblN0cmljdEJ1aWxkTGlzdChF eGVjU3RhdGUqIGV4ZWMsIFN0cnVjdHVyZVN0dWJJbmZvKiBzdHViSW5mbywgRW5jb2RlZEpTVmFs dWUgZW5jb2RlZFZhbHVlLCBFbmNvZGVkSlNWYWx1ZSBlbmNvZGVkQmFzZSwgU3RyaW5nSW1wbCog dWlkKQpAQCAtNDI0LDEzICs0MjgsMTQgQEAgdm9pZCBKSVRfT1BFUkFUSU9OIG9wZXJhdGlvblB1 dEJ5SWREaXJlY3ROb25TdHJpY3RCdWlsZExpc3QoRXhlY1N0YXRlKiBleGVjLCBTdHIKICAgICBK U1ZhbHVlIHZhbHVlID0gSlNWYWx1ZTo6ZGVjb2RlKGVuY29kZWRWYWx1ZSk7CiAgICAgSlNPYmpl Y3QqIGJhc2VPYmplY3QgPSBhc09iamVjdChKU1ZhbHVlOjpkZWNvZGUoZW5jb2RlZEJhc2UpKTsK ICAgICBQdXRQcm9wZXJ0eVNsb3Qgc2xvdChiYXNlT2JqZWN0LCBmYWxzZSwgZXhlYy0+Y29kZUJs b2NrKCktPnB1dEJ5SWRDb250ZXh0KCkpOwotICAgIAotICAgIGJhc2VPYmplY3QgLT5wdXREaXJl Y3QoZXhlYy0+dm0oKSwgaWRlbnQsIHZhbHVlLCBzbG90KTsKLSAgICAKKworICAgIFN0cnVjdHVy ZSogc3RydWN0dXJlID0gYmFzZU9iamVjdC0+c3RydWN0dXJlKCp2bSk7ICAgIAorICAgIGJhc2VP YmplY3QtPnB1dERpcmVjdCgqdm0sIGlkZW50LCB2YWx1ZSwgc2xvdCk7CisKICAgICBpZiAoYWNj ZXNzVHlwZSAhPSBzdGF0aWNfY2FzdDxBY2Nlc3NUeXBlPihzdHViSW5mby0+YWNjZXNzVHlwZSkp CiAgICAgICAgIHJldHVybjsKICAgICAKLSAgICBidWlsZFB1dEJ5SWRMaXN0KGV4ZWMsIGJhc2VP YmplY3QsIGlkZW50LCBzbG90LCAqc3R1YkluZm8sIERpcmVjdCk7CisgICAgYnVpbGRQdXRCeUlk TGlzdChleGVjLCBiYXNlT2JqZWN0LCBzdHJ1Y3R1cmUsIGlkZW50LCBzbG90LCAqc3R1YkluZm8s IERpcmVjdCk7CiB9CiAKIHZvaWQgSklUX09QRVJBVElPTiBvcGVyYXRpb25SZWFsbG9jYXRlU3Rv cmFnZUFuZEZpbmlzaFB1dChFeGVjU3RhdGUqIGV4ZWMsIEpTT2JqZWN0KiBiYXNlLCBTdHJ1Y3R1 cmUqIHN0cnVjdHVyZSwgUHJvcGVydHlPZmZzZXQgb2Zmc2V0LCBFbmNvZGVkSlNWYWx1ZSB2YWx1 ZSkKZGlmZiAtLWdpdCBTb3VyY2UvSmF2YVNjcmlwdENvcmUvaml0L1JlcGF0Y2guY3BwIFNvdXJj ZS9KYXZhU2NyaXB0Q29yZS9qaXQvUmVwYXRjaC5jcHAKaW5kZXggYjJlYzU2Zi4uZmQ2YTM3NCAx MDA2NDQKLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9qaXQvUmVwYXRjaC5jcHAKKysrIFNvdXJj ZS9KYXZhU2NyaXB0Q29yZS9qaXQvUmVwYXRjaC5jcHAKQEAgLTEyMzUsNyArMTIzNSw3IEBAIHN0 YXRpYyBJbmxpbmVDYWNoZUFjdGlvbiB0cnlDYWNoZVB1dEJ5SUQoRXhlY1N0YXRlKiBleGVjLCBK U1ZhbHVlIGJhc2VWYWx1ZSwgY29uCiAgICAgaWYgKCFiYXNlVmFsdWUuaXNDZWxsKCkpCiAgICAg ICAgIHJldHVybiBHaXZlVXBPbkNhY2hlOwogICAgIEpTQ2VsbCogYmFzZUNlbGwgPSBiYXNlVmFs dWUuYXNDZWxsKCk7Ci0gICAgU3RydWN0dXJlKiBzdHJ1Y3R1cmUgPSBiYXNlQ2VsbC0+c3RydWN0 dXJlKCk7CisgICAgU3RydWN0dXJlKiBzdHJ1Y3R1cmUgPSBiYXNlQ2VsbC0+c3RydWN0dXJlKCp2 bSk7CiAgICAgU3RydWN0dXJlKiBvbGRTdHJ1Y3R1cmUgPSBzdHJ1Y3R1cmUtPnByZXZpb3VzSUQo KTsKICAgICAKICAgICBpZiAoIXNsb3QuaXNDYWNoZWFibGVQdXQoKSAmJiAhc2xvdC5pc0NhY2hl YWJsZUN1c3RvbSgpICYmICFzbG90LmlzQ2FjaGVhYmxlU2V0dGVyKCkpCkBAIC0xMzQxLDE1ICsx MzQxLDE4IEBAIHZvaWQgcmVwYXRjaFB1dEJ5SUQoRXhlY1N0YXRlKiBleGVjLCBKU1ZhbHVlIGJh c2VWYWx1ZSwgY29uc3QgSWRlbnRpZmllciYgcHJvcGVyCiAgICAgICAgIHJlcGF0Y2hDYWxsKGV4 ZWMtPmNvZGVCbG9jaygpLCBzdHViSW5mby5jYWxsUmV0dXJuTG9jYXRpb24sIGFwcHJvcHJpYXRl R2VuZXJpY1B1dEJ5SWRGdW5jdGlvbihzbG90LCBwdXRLaW5kKSk7CiB9CiAKLXN0YXRpYyBJbmxp bmVDYWNoZUFjdGlvbiB0cnlCdWlsZFB1dEJ5SWRMaXN0KEV4ZWNTdGF0ZSogZXhlYywgSlNWYWx1 ZSBiYXNlVmFsdWUsIGNvbnN0IElkZW50aWZpZXImIHByb3BlcnR5TmFtZSwgY29uc3QgUHV0UHJv cGVydHlTbG90JiBzbG90LCBTdHJ1Y3R1cmVTdHViSW5mbyYgc3R1YkluZm8sIFB1dEtpbmQgcHV0 S2luZCkKK3N0YXRpYyBJbmxpbmVDYWNoZUFjdGlvbiB0cnlCdWlsZFB1dEJ5SWRMaXN0KEV4ZWNT dGF0ZSogZXhlYywgSlNWYWx1ZSBiYXNlVmFsdWUsIFN0cnVjdHVyZSogc3RydWN0dXJlLCBjb25z dCBJZGVudGlmaWVyJiBwcm9wZXJ0eU5hbWUsIGNvbnN0IFB1dFByb3BlcnR5U2xvdCYgc2xvdCwg U3RydWN0dXJlU3R1YkluZm8mIHN0dWJJbmZvLCBQdXRLaW5kIHB1dEtpbmQpCiB7CiAgICAgQ29k ZUJsb2NrKiBjb2RlQmxvY2sgPSBleGVjLT5jb2RlQmxvY2soKTsKICAgICBWTSogdm0gPSAmZXhl Yy0+dm0oKTsKIAotICAgIGlmICghYmFzZVZhbHVlLmlzQ2VsbCgpKQorICAgIGlmICghYmFzZVZh bHVlLmlzQ2VsbCgpIHx8ICFzdHJ1Y3R1cmUpCiAgICAgICAgIHJldHVybiBHaXZlVXBPbkNhY2hl OwogICAgIEpTQ2VsbCogYmFzZUNlbGwgPSBiYXNlVmFsdWUuYXNDZWxsKCk7Ci0gICAgU3RydWN0 dXJlKiBzdHJ1Y3R1cmUgPSBiYXNlQ2VsbC0+c3RydWN0dXJlKCk7CisKKyAgICBpZiAoYmFzZUNl bGwtPnN0cnVjdHVyZSgqdm0pLT5pZCgpICE9IHN0cnVjdHVyZS0+aWQoKSkKKyAgICAgICAgcmV0 dXJuIEdpdmVVcE9uQ2FjaGU7CisKICAgICBTdHJ1Y3R1cmUqIG9sZFN0cnVjdHVyZSA9IHN0cnVj dHVyZS0+cHJldmlvdXNJRCgpOwogICAgIAogICAgIApAQCAtMTQ2NiwxMSArMTQ2OSwxMSBAQCBz dGF0aWMgSW5saW5lQ2FjaGVBY3Rpb24gdHJ5QnVpbGRQdXRCeUlkTGlzdChFeGVjU3RhdGUqIGV4 ZWMsIEpTVmFsdWUgYmFzZVZhbHVlLAogICAgIHJldHVybiBHaXZlVXBPbkNhY2hlOwogfQogCi12 b2lkIGJ1aWxkUHV0QnlJZExpc3QoRXhlY1N0YXRlKiBleGVjLCBKU1ZhbHVlIGJhc2VWYWx1ZSwg Y29uc3QgSWRlbnRpZmllciYgcHJvcGVydHlOYW1lLCBjb25zdCBQdXRQcm9wZXJ0eVNsb3QmIHNs b3QsIFN0cnVjdHVyZVN0dWJJbmZvJiBzdHViSW5mbywgUHV0S2luZCBwdXRLaW5kKQordm9pZCBi dWlsZFB1dEJ5SWRMaXN0KEV4ZWNTdGF0ZSogZXhlYywgSlNWYWx1ZSBiYXNlVmFsdWUsIFN0cnVj dHVyZSogc3RydWN0dXJlLCBjb25zdCBJZGVudGlmaWVyJiBwcm9wZXJ0eU5hbWUsIGNvbnN0IFB1 dFByb3BlcnR5U2xvdCYgc2xvdCwgU3RydWN0dXJlU3R1YkluZm8mIHN0dWJJbmZvLCBQdXRLaW5k IHB1dEtpbmQpCiB7CiAgICAgR0NTYWZlQ29uY3VycmVudEpJVExvY2tlciBsb2NrZXIoZXhlYy0+ Y29kZUJsb2NrKCktPm1fbG9jaywgZXhlYy0+dm0oKS5oZWFwKTsKICAgICAKLSAgICBpZiAodHJ5 QnVpbGRQdXRCeUlkTGlzdChleGVjLCBiYXNlVmFsdWUsIHByb3BlcnR5TmFtZSwgc2xvdCwgc3R1 YkluZm8sIHB1dEtpbmQpID09IEdpdmVVcE9uQ2FjaGUpCisgICAgaWYgKHRyeUJ1aWxkUHV0QnlJ ZExpc3QoZXhlYywgYmFzZVZhbHVlLCBzdHJ1Y3R1cmUsIHByb3BlcnR5TmFtZSwgc2xvdCwgc3R1 YkluZm8sIHB1dEtpbmQpID09IEdpdmVVcE9uQ2FjaGUpCiAgICAgICAgIHJlcGF0Y2hDYWxsKGV4 ZWMtPmNvZGVCbG9jaygpLCBzdHViSW5mby5jYWxsUmV0dXJuTG9jYXRpb24sIGFwcHJvcHJpYXRl R2VuZXJpY1B1dEJ5SWRGdW5jdGlvbihzbG90LCBwdXRLaW5kKSk7CiB9CiAKZGlmZiAtLWdpdCBT b3VyY2UvSmF2YVNjcmlwdENvcmUvaml0L1JlcGF0Y2guaCBTb3VyY2UvSmF2YVNjcmlwdENvcmUv aml0L1JlcGF0Y2guaAppbmRleCBkNjBmNGZkLi5jYjMzNDIwIDEwMDY0NAotLS0gU291cmNlL0ph dmFTY3JpcHRDb3JlL2ppdC9SZXBhdGNoLmgKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9qaXQv UmVwYXRjaC5oCkBAIC0zNyw3ICszNyw3IEBAIHZvaWQgcmVwYXRjaEdldEJ5SUQoRXhlY1N0YXRl KiwgSlNWYWx1ZSwgY29uc3QgSWRlbnRpZmllciYsIGNvbnN0IFByb3BlcnR5U2xvdCYsCiB2b2lk IGJ1aWxkR2V0QnlJRExpc3QoRXhlY1N0YXRlKiwgSlNWYWx1ZSwgY29uc3QgSWRlbnRpZmllciYs IGNvbnN0IFByb3BlcnR5U2xvdCYsIFN0cnVjdHVyZVN0dWJJbmZvJik7CiB2b2lkIGJ1aWxkR2V0 QnlJRFByb3RvTGlzdChFeGVjU3RhdGUqLCBKU1ZhbHVlLCBjb25zdCBJZGVudGlmaWVyJiwgY29u c3QgUHJvcGVydHlTbG90JiwgU3RydWN0dXJlU3R1YkluZm8mKTsKIHZvaWQgcmVwYXRjaFB1dEJ5 SUQoRXhlY1N0YXRlKiwgSlNWYWx1ZSwgY29uc3QgSWRlbnRpZmllciYsIGNvbnN0IFB1dFByb3Bl cnR5U2xvdCYsIFN0cnVjdHVyZVN0dWJJbmZvJiwgUHV0S2luZCk7Ci12b2lkIGJ1aWxkUHV0QnlJ ZExpc3QoRXhlY1N0YXRlKiwgSlNWYWx1ZSwgY29uc3QgSWRlbnRpZmllciYsIGNvbnN0IFB1dFBy b3BlcnR5U2xvdCYsIFN0cnVjdHVyZVN0dWJJbmZvJiwgUHV0S2luZCk7Cit2b2lkIGJ1aWxkUHV0 QnlJZExpc3QoRXhlY1N0YXRlKiwgSlNWYWx1ZSwgU3RydWN0dXJlKiwgY29uc3QgSWRlbnRpZmll ciYsIGNvbnN0IFB1dFByb3BlcnR5U2xvdCYsIFN0cnVjdHVyZVN0dWJJbmZvJiwgUHV0S2luZCk7 CiB2b2lkIHJlcGF0Y2hJbihFeGVjU3RhdGUqLCBKU0NlbGwqLCBjb25zdCBJZGVudGlmaWVyJiwg Ym9vbCB3YXNGb3VuZCwgY29uc3QgUHJvcGVydHlTbG90JiwgU3RydWN0dXJlU3R1YkluZm8mKTsK IHZvaWQgbGlua0ZvcihFeGVjU3RhdGUqLCBDYWxsTGlua0luZm8mLCBDb2RlQmxvY2sqLCBKU0Z1 bmN0aW9uKiBjYWxsZWUsIE1hY3JvQXNzZW1ibGVyQ29kZVB0ciwgQ29kZVNwZWNpYWxpemF0aW9u S2luZCwgUmVnaXN0ZXJQcmVzZXJ2YXRpb25Nb2RlKTsKIHZvaWQgbGlua1Nsb3dGb3IoRXhlY1N0 YXRlKiwgQ2FsbExpbmtJbmZvJiwgQ29kZVNwZWNpYWxpemF0aW9uS2luZCwgUmVnaXN0ZXJQcmVz ZXJ2YXRpb25Nb2RlKTsKZGlmZiAtLWdpdCBTb3VyY2UvSmF2YVNjcmlwdENvcmUvdGVzdHMvc3Ry ZXNzL3B1dC1ieS1pZC1zdHJpY3QtYnVpbGQtbGlzdC1vcmRlci5qcyBTb3VyY2UvSmF2YVNjcmlw dENvcmUvdGVzdHMvc3RyZXNzL3B1dC1ieS1pZC1zdHJpY3QtYnVpbGQtbGlzdC1vcmRlci5qcwpu ZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi5iYWFiOGU1Ci0tLSAvZGV2L251bGwK KysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS90ZXN0cy9zdHJlc3MvcHV0LWJ5LWlkLXN0cmljdC1i dWlsZC1saXN0LW9yZGVyLmpzCkBAIC0wLDAgKzEsMTYgQEAKK2Z1bmN0aW9uIGZvbyhvKSB7Cisg ICAgInVzZSBzdHJpY3QiOworICAgIG8uZiA9IDQyOworfQorCitub0lubGluZShmb28pOworCit2 YXIgYSA9IHt9OworZm9vKGEpOworZm9vKGEpOworYSA9IHtmIDogM307Citmb28oYSk7CisKK3Zh ciBiID0ge307Citmb28oYik7Citmb28oYik7Cg== 242584 2014-12-04 13:35:46 -0800 2014-12-08 15:10:48 -0800 operationPutByIds fix 0001-Fixes-operationPutByIds-such-that-they-check-that-th.patch text/plain 11421 mmirman ZGlmZiAtLWdpdCBTb3VyY2UvSmF2YVNjcmlwdENvcmUvQ2hhbmdlTG9nIFNvdXJjZS9KYXZhU2Ny aXB0Q29yZS9DaGFuZ2VMb2cKaW5kZXggNWZmNjA1NC4uYTBkZTRmNiAxMDA2NDQKLS0tIFNvdXJj ZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFu Z2VMb2cKQEAgLTEsNSArMSwzMSBAQAogMjAxNC0xMi0wMiAgTWF0dGhldyBNaXJtYW4gIDxtbWly bWFuQGFwcGxlLmNvbT4KIAorICAgICAgICBGaXhlcyBvcGVyYXRpb25QdXRCeUlkcyBzdWNoIHRo YXQgdGhleSBjaGVjayB0aGF0IHRoZSBwdXQgZGlkbid0CisgICAgICAgIGNoYW5nZSB0aGUgc3Ry dWN0dXJlIG9mIHRoZSBvYmplY3Qgd2hvJ3MgcHJvcGVydHkgYWNjZXNzIGlzIGJlaW5nCisgICAg ICAgIGNhY2hlZC4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTEzOTE5NgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg ICAgICogaml0L0pJVE9wZXJhdGlvbnMuY3BwOgorICAgICAgICAoSlNDOjpvcGVyYXRpb25HZXRC eUlkT3B0aW1pemUpOiBjaGFuZ2VkIGdldCB0byBnZXRQcm9wZXJ0eVNsb3QKKyAgICAgICAgKEpT Qzo6b3BlcmF0aW9uUHV0QnlJZFN0cmljdEJ1aWxkTGlzdCk6IHNhdmVkIHRoZSBzdHJ1Y3R1cmUg YmVmb3JlIHRoZSBwdXQuCisgICAgICAgIChKU0M6Om9wZXJhdGlvblB1dEJ5SWROb25TdHJpY3RC dWlsZExpc3QpOiBkaXR0by4KKyAgICAgICAgKEpTQzo6b3BlcmF0aW9uUHV0QnlJZERpcmVjdFN0 cmljdEJ1aWxkTGlzdCk6IGRpdHRvLgorICAgICAgICAoSlNDOjpvcGVyYXRpb25QdXRCeUlkRGly ZWN0Tm9uU3RyaWN0QnVpbGRMaXN0KTogZGl0dG8uCisgICAgICAgICogaml0L1JlcGF0Y2guY3Bw OgorICAgICAgICAoSlNDOjp0cnlDYWNoZVB1dEJ5SUQpOiBmaXhlZCBzdHJ1Y3R1cmUoKSB0byB1 c2UgdGhlIGV4aXN0YW50IHZtLiAKKyAgICAgICAgKEpTQzo6dHJ5QnVpbGRQdXRCeUlkTGlzdCk6 IEFkZGVkIGEgY2hlY2sgdGhhdCB0aGUgb2xkIHN0cnVjdHVyZSdzIGlkIAorICAgICAgICBpcyB0 aGUgc2FtZSBhcyB0aGUgbmV3LgorICAgICAgICAoSlNDOjpidWlsZFB1dEJ5SWRMaXN0KTogQWRk ZWQgYW4gYXJndW1lbnQKKyAgICAgICAgKiBqaXQvUmVwYXRjaC5oOiAKKyAgICAgICAgKEpTQzo6 YnVpbGRQdXRCeUlkTGlzdCk6IEFkZGVkIGFuIGFyZ3VtZW50CisgICAgICAgICogdGVzdHMvc3Ry ZXNzL3B1dC1ieS1pZC1idWlsZC1saXN0LW9yZGVyLXJlY3Vyc2UuanM6IFRlc3QgdGhhdCBmYWls ZWQgYmVmb3JlIHRoZSBjaGFuZ2UKKyAgICAgICAgKiB0ZXN0cy9zdHJlc3MvcHV0LWJ5LWlkLXN0 cmljdC1idWlsZC1saXN0LW9yZGVyLmpzOiBBZGRlZC4KKworIAorMjAxNC0xMi0wMiAgTWF0dGhl dyBNaXJtYW4gIDxtbWlybWFuQGFwcGxlLmNvbT4KKwogICAgICAgICBGaXhlcyBpbmxpbmUgY2Fj aGUgZmFzdCBwYXRoIGFjY2Vzc2luZyBub25leGlzdGFudCBnZXR0ZXJzLgogICAgICAgICA8cmRh cjovL3Byb2JsZW0vMTg0MTY5MTg+CiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0xMzY5NjEKZGlmZiAtLWdpdCBTb3VyY2UvSmF2YVNjcmlwdENvcmUvaml0 L0pJVE9wZXJhdGlvbnMuY3BwIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9qaXQvSklUT3BlcmF0aW9u cy5jcHAKaW5kZXggZDY3YWE2MS4uMjk1YWE4NCAxMDA2NDQKLS0tIFNvdXJjZS9KYXZhU2NyaXB0 Q29yZS9qaXQvSklUT3BlcmF0aW9ucy5jcHAKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9qaXQv SklUT3BlcmF0aW9ucy5jcHAKQEAgLTE2MywxNCArMTYzLDE1IEBAIEVuY29kZWRKU1ZhbHVlIEpJ VF9PUEVSQVRJT04gb3BlcmF0aW9uR2V0QnlJZE9wdGltaXplKEV4ZWNTdGF0ZSogZXhlYywgU3Ry dWN0dXJlCiAKICAgICBKU1ZhbHVlIGJhc2VWYWx1ZSA9IEpTVmFsdWU6OmRlY29kZShiYXNlKTsK ICAgICBQcm9wZXJ0eVNsb3Qgc2xvdChiYXNlVmFsdWUpOwotICAgIEpTVmFsdWUgcmVzdWx0ID0g YmFzZVZhbHVlLmdldChleGVjLCBpZGVudCwgc2xvdCk7CiAgICAgCisgICAgYm9vbCBoYXNSZXN1 bHQgPSBiYXNlVmFsdWUuZ2V0UHJvcGVydHlTbG90KGV4ZWMsIGlkZW50LCBzbG90KTsKICAgICBp ZiAoc3R1YkluZm8tPnNlZW4pCiAgICAgICAgIHJlcGF0Y2hHZXRCeUlEKGV4ZWMsIGJhc2VWYWx1 ZSwgaWRlbnQsIHNsb3QsICpzdHViSW5mbyk7CiAgICAgZWxzZQogICAgICAgICBzdHViSW5mby0+ c2VlbiA9IHRydWU7CisgICAgCisgICAgcmV0dXJuIEpTVmFsdWU6OmVuY29kZShoYXNSZXN1bHQ/ IHNsb3QuZ2V0VmFsdWUoZXhlYywgaWRlbnQpIDoganNVbmRlZmluZWQoKSk7CiAKLSAgICByZXR1 cm4gSlNWYWx1ZTo6ZW5jb2RlKHJlc3VsdCk7CiB9CiAKIEVuY29kZWRKU1ZhbHVlIEpJVF9PUEVS QVRJT04gb3BlcmF0aW9uSW5PcHRpbWl6ZShFeGVjU3RhdGUqIGV4ZWMsIFN0cnVjdHVyZVN0dWJJ bmZvKiBzdHViSW5mbywgSlNDZWxsKiBiYXNlLCBTdHJpbmdJbXBsKiBrZXkpCkBAIC0zNjUsMTIg KzM2NiwxMyBAQCB2b2lkIEpJVF9PUEVSQVRJT04gb3BlcmF0aW9uUHV0QnlJZFN0cmljdEJ1aWxk TGlzdChFeGVjU3RhdGUqIGV4ZWMsIFN0cnVjdHVyZVN0dQogICAgIEpTVmFsdWUgYmFzZVZhbHVl ID0gSlNWYWx1ZTo6ZGVjb2RlKGVuY29kZWRCYXNlKTsKICAgICBQdXRQcm9wZXJ0eVNsb3Qgc2xv dChiYXNlVmFsdWUsIHRydWUsIGV4ZWMtPmNvZGVCbG9jaygpLT5wdXRCeUlkQ29udGV4dCgpKTsK ICAgICAKKyAgICBTdHJ1Y3R1cmUqIHN0cnVjdHVyZSA9IGJhc2VWYWx1ZS5pc0NlbGwoKSA/IGJh c2VWYWx1ZS5hc0NlbGwoKS0+c3RydWN0dXJlKCp2bSkgOiBudWxscHRyOyAKICAgICBiYXNlVmFs dWUucHV0KGV4ZWMsIGlkZW50LCB2YWx1ZSwgc2xvdCk7Ci0gICAgCisKICAgICBpZiAoYWNjZXNz VHlwZSAhPSBzdGF0aWNfY2FzdDxBY2Nlc3NUeXBlPihzdHViSW5mby0+YWNjZXNzVHlwZSkpCiAg ICAgICAgIHJldHVybjsKLSAgICAKLSAgICBidWlsZFB1dEJ5SWRMaXN0KGV4ZWMsIGJhc2VWYWx1 ZSwgaWRlbnQsIHNsb3QsICpzdHViSW5mbywgTm90RGlyZWN0KTsKKworICAgIGJ1aWxkUHV0QnlJ ZExpc3QoZXhlYywgYmFzZVZhbHVlLCBzdHJ1Y3R1cmUsIGlkZW50LCBzbG90LCAqc3R1YkluZm8s IE5vdERpcmVjdCk7CiB9CiAKIHZvaWQgSklUX09QRVJBVElPTiBvcGVyYXRpb25QdXRCeUlkTm9u U3RyaWN0QnVpbGRMaXN0KEV4ZWNTdGF0ZSogZXhlYywgU3RydWN0dXJlU3R1YkluZm8qIHN0dWJJ bmZvLCBFbmNvZGVkSlNWYWx1ZSBlbmNvZGVkVmFsdWUsIEVuY29kZWRKU1ZhbHVlIGVuY29kZWRC YXNlLCBTdHJpbmdJbXBsKiB1aWQpCkBAIC0zODQsMTMgKzM4NiwxNCBAQCB2b2lkIEpJVF9PUEVS QVRJT04gb3BlcmF0aW9uUHV0QnlJZE5vblN0cmljdEJ1aWxkTGlzdChFeGVjU3RhdGUqIGV4ZWMs IFN0cnVjdHVyZQogICAgIEpTVmFsdWUgdmFsdWUgPSBKU1ZhbHVlOjpkZWNvZGUoZW5jb2RlZFZh bHVlKTsKICAgICBKU1ZhbHVlIGJhc2VWYWx1ZSA9IEpTVmFsdWU6OmRlY29kZShlbmNvZGVkQmFz ZSk7CiAgICAgUHV0UHJvcGVydHlTbG90IHNsb3QoYmFzZVZhbHVlLCBmYWxzZSwgZXhlYy0+Y29k ZUJsb2NrKCktPnB1dEJ5SWRDb250ZXh0KCkpOwotICAgIAorCisgICAgU3RydWN0dXJlKiBzdHJ1 Y3R1cmUgPSBiYXNlVmFsdWUuaXNDZWxsKCkgPyBiYXNlVmFsdWUuYXNDZWxsKCktPnN0cnVjdHVy ZSgqdm0pIDogbnVsbHB0cjsKICAgICBiYXNlVmFsdWUucHV0KGV4ZWMsIGlkZW50LCB2YWx1ZSwg c2xvdCk7CiAgICAgCiAgICAgaWYgKGFjY2Vzc1R5cGUgIT0gc3RhdGljX2Nhc3Q8QWNjZXNzVHlw ZT4oc3R1YkluZm8tPmFjY2Vzc1R5cGUpKQogICAgICAgICByZXR1cm47CiAgICAgCi0gICAgYnVp bGRQdXRCeUlkTGlzdChleGVjLCBiYXNlVmFsdWUsIGlkZW50LCBzbG90LCAqc3R1YkluZm8sIE5v dERpcmVjdCk7CisgICAgYnVpbGRQdXRCeUlkTGlzdChleGVjLCBiYXNlVmFsdWUsIHN0cnVjdHVy ZSwgaWRlbnQsIHNsb3QsICpzdHViSW5mbywgTm90RGlyZWN0KTsKIH0KIAogdm9pZCBKSVRfT1BF UkFUSU9OIG9wZXJhdGlvblB1dEJ5SWREaXJlY3RTdHJpY3RCdWlsZExpc3QoRXhlY1N0YXRlKiBl eGVjLCBTdHJ1Y3R1cmVTdHViSW5mbyogc3R1YkluZm8sIEVuY29kZWRKU1ZhbHVlIGVuY29kZWRW YWx1ZSwgRW5jb2RlZEpTVmFsdWUgZW5jb2RlZEJhc2UsIFN0cmluZ0ltcGwqIHVpZCkKQEAgLTQw NCwxMyArNDA3LDE0IEBAIHZvaWQgSklUX09QRVJBVElPTiBvcGVyYXRpb25QdXRCeUlkRGlyZWN0 U3RyaWN0QnVpbGRMaXN0KEV4ZWNTdGF0ZSogZXhlYywgU3RydWN0CiAgICAgSlNWYWx1ZSB2YWx1 ZSA9IEpTVmFsdWU6OmRlY29kZShlbmNvZGVkVmFsdWUpOwogICAgIEpTT2JqZWN0KiBiYXNlT2Jq ZWN0ID0gYXNPYmplY3QoSlNWYWx1ZTo6ZGVjb2RlKGVuY29kZWRCYXNlKSk7CiAgICAgUHV0UHJv cGVydHlTbG90IHNsb3QoYmFzZU9iamVjdCwgdHJ1ZSwgZXhlYy0+Y29kZUJsb2NrKCktPnB1dEJ5 SWRDb250ZXh0KCkpOwotICAgIAotICAgIGJhc2VPYmplY3QtPnB1dERpcmVjdChleGVjLT52bSgp LCBpZGVudCwgdmFsdWUsIHNsb3QpOworCisgICAgU3RydWN0dXJlKiBzdHJ1Y3R1cmUgPSBiYXNl T2JqZWN0LT5zdHJ1Y3R1cmUoKnZtKTsgICAgCisgICAgYmFzZU9iamVjdC0+cHV0RGlyZWN0KCp2 bSwgaWRlbnQsIHZhbHVlLCBzbG90KTsKICAgICAKICAgICBpZiAoYWNjZXNzVHlwZSAhPSBzdGF0 aWNfY2FzdDxBY2Nlc3NUeXBlPihzdHViSW5mby0+YWNjZXNzVHlwZSkpCiAgICAgICAgIHJldHVy bjsKICAgICAKLSAgICBidWlsZFB1dEJ5SWRMaXN0KGV4ZWMsIGJhc2VPYmplY3QsIGlkZW50LCBz bG90LCAqc3R1YkluZm8sIERpcmVjdCk7CisgICAgYnVpbGRQdXRCeUlkTGlzdChleGVjLCBiYXNl T2JqZWN0LCBzdHJ1Y3R1cmUsIGlkZW50LCBzbG90LCAqc3R1YkluZm8sIERpcmVjdCk7CiB9CiAK IHZvaWQgSklUX09QRVJBVElPTiBvcGVyYXRpb25QdXRCeUlkRGlyZWN0Tm9uU3RyaWN0QnVpbGRM aXN0KEV4ZWNTdGF0ZSogZXhlYywgU3RydWN0dXJlU3R1YkluZm8qIHN0dWJJbmZvLCBFbmNvZGVk SlNWYWx1ZSBlbmNvZGVkVmFsdWUsIEVuY29kZWRKU1ZhbHVlIGVuY29kZWRCYXNlLCBTdHJpbmdJ bXBsKiB1aWQpCkBAIC00MjQsMTMgKzQyOCwxNCBAQCB2b2lkIEpJVF9PUEVSQVRJT04gb3BlcmF0 aW9uUHV0QnlJZERpcmVjdE5vblN0cmljdEJ1aWxkTGlzdChFeGVjU3RhdGUqIGV4ZWMsIFN0cgog ICAgIEpTVmFsdWUgdmFsdWUgPSBKU1ZhbHVlOjpkZWNvZGUoZW5jb2RlZFZhbHVlKTsKICAgICBK U09iamVjdCogYmFzZU9iamVjdCA9IGFzT2JqZWN0KEpTVmFsdWU6OmRlY29kZShlbmNvZGVkQmFz ZSkpOwogICAgIFB1dFByb3BlcnR5U2xvdCBzbG90KGJhc2VPYmplY3QsIGZhbHNlLCBleGVjLT5j b2RlQmxvY2soKS0+cHV0QnlJZENvbnRleHQoKSk7Ci0gICAgCi0gICAgYmFzZU9iamVjdCAtPnB1 dERpcmVjdChleGVjLT52bSgpLCBpZGVudCwgdmFsdWUsIHNsb3QpOwotICAgIAorCisgICAgU3Ry dWN0dXJlKiBzdHJ1Y3R1cmUgPSBiYXNlT2JqZWN0LT5zdHJ1Y3R1cmUoKnZtKTsgICAgCisgICAg YmFzZU9iamVjdC0+cHV0RGlyZWN0KCp2bSwgaWRlbnQsIHZhbHVlLCBzbG90KTsKKwogICAgIGlm IChhY2Nlc3NUeXBlICE9IHN0YXRpY19jYXN0PEFjY2Vzc1R5cGU+KHN0dWJJbmZvLT5hY2Nlc3NU eXBlKSkKICAgICAgICAgcmV0dXJuOwogICAgIAotICAgIGJ1aWxkUHV0QnlJZExpc3QoZXhlYywg YmFzZU9iamVjdCwgaWRlbnQsIHNsb3QsICpzdHViSW5mbywgRGlyZWN0KTsKKyAgICBidWlsZFB1 dEJ5SWRMaXN0KGV4ZWMsIGJhc2VPYmplY3QsIHN0cnVjdHVyZSwgaWRlbnQsIHNsb3QsICpzdHVi SW5mbywgRGlyZWN0KTsKIH0KIAogdm9pZCBKSVRfT1BFUkFUSU9OIG9wZXJhdGlvblJlYWxsb2Nh dGVTdG9yYWdlQW5kRmluaXNoUHV0KEV4ZWNTdGF0ZSogZXhlYywgSlNPYmplY3QqIGJhc2UsIFN0 cnVjdHVyZSogc3RydWN0dXJlLCBQcm9wZXJ0eU9mZnNldCBvZmZzZXQsIEVuY29kZWRKU1ZhbHVl IHZhbHVlKQpkaWZmIC0tZ2l0IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9qaXQvUmVwYXRjaC5jcHAg U291cmNlL0phdmFTY3JpcHRDb3JlL2ppdC9SZXBhdGNoLmNwcAppbmRleCBiMmVjNTZmLi5mZDZh Mzc0IDEwMDY0NAotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL2ppdC9SZXBhdGNoLmNwcAorKysg U291cmNlL0phdmFTY3JpcHRDb3JlL2ppdC9SZXBhdGNoLmNwcApAQCAtMTIzNSw3ICsxMjM1LDcg QEAgc3RhdGljIElubGluZUNhY2hlQWN0aW9uIHRyeUNhY2hlUHV0QnlJRChFeGVjU3RhdGUqIGV4 ZWMsIEpTVmFsdWUgYmFzZVZhbHVlLCBjb24KICAgICBpZiAoIWJhc2VWYWx1ZS5pc0NlbGwoKSkK ICAgICAgICAgcmV0dXJuIEdpdmVVcE9uQ2FjaGU7CiAgICAgSlNDZWxsKiBiYXNlQ2VsbCA9IGJh c2VWYWx1ZS5hc0NlbGwoKTsKLSAgICBTdHJ1Y3R1cmUqIHN0cnVjdHVyZSA9IGJhc2VDZWxsLT5z dHJ1Y3R1cmUoKTsKKyAgICBTdHJ1Y3R1cmUqIHN0cnVjdHVyZSA9IGJhc2VDZWxsLT5zdHJ1Y3R1 cmUoKnZtKTsKICAgICBTdHJ1Y3R1cmUqIG9sZFN0cnVjdHVyZSA9IHN0cnVjdHVyZS0+cHJldmlv dXNJRCgpOwogICAgIAogICAgIGlmICghc2xvdC5pc0NhY2hlYWJsZVB1dCgpICYmICFzbG90Lmlz Q2FjaGVhYmxlQ3VzdG9tKCkgJiYgIXNsb3QuaXNDYWNoZWFibGVTZXR0ZXIoKSkKQEAgLTEzNDEs MTUgKzEzNDEsMTggQEAgdm9pZCByZXBhdGNoUHV0QnlJRChFeGVjU3RhdGUqIGV4ZWMsIEpTVmFs dWUgYmFzZVZhbHVlLCBjb25zdCBJZGVudGlmaWVyJiBwcm9wZXIKICAgICAgICAgcmVwYXRjaENh bGwoZXhlYy0+Y29kZUJsb2NrKCksIHN0dWJJbmZvLmNhbGxSZXR1cm5Mb2NhdGlvbiwgYXBwcm9w cmlhdGVHZW5lcmljUHV0QnlJZEZ1bmN0aW9uKHNsb3QsIHB1dEtpbmQpKTsKIH0KIAotc3RhdGlj IElubGluZUNhY2hlQWN0aW9uIHRyeUJ1aWxkUHV0QnlJZExpc3QoRXhlY1N0YXRlKiBleGVjLCBK U1ZhbHVlIGJhc2VWYWx1ZSwgY29uc3QgSWRlbnRpZmllciYgcHJvcGVydHlOYW1lLCBjb25zdCBQ dXRQcm9wZXJ0eVNsb3QmIHNsb3QsIFN0cnVjdHVyZVN0dWJJbmZvJiBzdHViSW5mbywgUHV0S2lu ZCBwdXRLaW5kKQorc3RhdGljIElubGluZUNhY2hlQWN0aW9uIHRyeUJ1aWxkUHV0QnlJZExpc3Qo RXhlY1N0YXRlKiBleGVjLCBKU1ZhbHVlIGJhc2VWYWx1ZSwgU3RydWN0dXJlKiBzdHJ1Y3R1cmUs IGNvbnN0IElkZW50aWZpZXImIHByb3BlcnR5TmFtZSwgY29uc3QgUHV0UHJvcGVydHlTbG90JiBz bG90LCBTdHJ1Y3R1cmVTdHViSW5mbyYgc3R1YkluZm8sIFB1dEtpbmQgcHV0S2luZCkKIHsKICAg ICBDb2RlQmxvY2sqIGNvZGVCbG9jayA9IGV4ZWMtPmNvZGVCbG9jaygpOwogICAgIFZNKiB2bSA9 ICZleGVjLT52bSgpOwogCi0gICAgaWYgKCFiYXNlVmFsdWUuaXNDZWxsKCkpCisgICAgaWYgKCFi YXNlVmFsdWUuaXNDZWxsKCkgfHwgIXN0cnVjdHVyZSkKICAgICAgICAgcmV0dXJuIEdpdmVVcE9u Q2FjaGU7CiAgICAgSlNDZWxsKiBiYXNlQ2VsbCA9IGJhc2VWYWx1ZS5hc0NlbGwoKTsKLSAgICBT dHJ1Y3R1cmUqIHN0cnVjdHVyZSA9IGJhc2VDZWxsLT5zdHJ1Y3R1cmUoKTsKKworICAgIGlmIChi YXNlQ2VsbC0+c3RydWN0dXJlKCp2bSktPmlkKCkgIT0gc3RydWN0dXJlLT5pZCgpKQorICAgICAg ICByZXR1cm4gR2l2ZVVwT25DYWNoZTsKKwogICAgIFN0cnVjdHVyZSogb2xkU3RydWN0dXJlID0g c3RydWN0dXJlLT5wcmV2aW91c0lEKCk7CiAgICAgCiAgICAgCkBAIC0xNDY2LDExICsxNDY5LDEx IEBAIHN0YXRpYyBJbmxpbmVDYWNoZUFjdGlvbiB0cnlCdWlsZFB1dEJ5SWRMaXN0KEV4ZWNTdGF0 ZSogZXhlYywgSlNWYWx1ZSBiYXNlVmFsdWUsCiAgICAgcmV0dXJuIEdpdmVVcE9uQ2FjaGU7CiB9 CiAKLXZvaWQgYnVpbGRQdXRCeUlkTGlzdChFeGVjU3RhdGUqIGV4ZWMsIEpTVmFsdWUgYmFzZVZh bHVlLCBjb25zdCBJZGVudGlmaWVyJiBwcm9wZXJ0eU5hbWUsIGNvbnN0IFB1dFByb3BlcnR5U2xv dCYgc2xvdCwgU3RydWN0dXJlU3R1YkluZm8mIHN0dWJJbmZvLCBQdXRLaW5kIHB1dEtpbmQpCit2 b2lkIGJ1aWxkUHV0QnlJZExpc3QoRXhlY1N0YXRlKiBleGVjLCBKU1ZhbHVlIGJhc2VWYWx1ZSwg U3RydWN0dXJlKiBzdHJ1Y3R1cmUsIGNvbnN0IElkZW50aWZpZXImIHByb3BlcnR5TmFtZSwgY29u c3QgUHV0UHJvcGVydHlTbG90JiBzbG90LCBTdHJ1Y3R1cmVTdHViSW5mbyYgc3R1YkluZm8sIFB1 dEtpbmQgcHV0S2luZCkKIHsKICAgICBHQ1NhZmVDb25jdXJyZW50SklUTG9ja2VyIGxvY2tlcihl eGVjLT5jb2RlQmxvY2soKS0+bV9sb2NrLCBleGVjLT52bSgpLmhlYXApOwogICAgIAotICAgIGlm ICh0cnlCdWlsZFB1dEJ5SWRMaXN0KGV4ZWMsIGJhc2VWYWx1ZSwgcHJvcGVydHlOYW1lLCBzbG90 LCBzdHViSW5mbywgcHV0S2luZCkgPT0gR2l2ZVVwT25DYWNoZSkKKyAgICBpZiAodHJ5QnVpbGRQ dXRCeUlkTGlzdChleGVjLCBiYXNlVmFsdWUsIHN0cnVjdHVyZSwgcHJvcGVydHlOYW1lLCBzbG90 LCBzdHViSW5mbywgcHV0S2luZCkgPT0gR2l2ZVVwT25DYWNoZSkKICAgICAgICAgcmVwYXRjaENh bGwoZXhlYy0+Y29kZUJsb2NrKCksIHN0dWJJbmZvLmNhbGxSZXR1cm5Mb2NhdGlvbiwgYXBwcm9w cmlhdGVHZW5lcmljUHV0QnlJZEZ1bmN0aW9uKHNsb3QsIHB1dEtpbmQpKTsKIH0KIApkaWZmIC0t Z2l0IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9qaXQvUmVwYXRjaC5oIFNvdXJjZS9KYXZhU2NyaXB0 Q29yZS9qaXQvUmVwYXRjaC5oCmluZGV4IGQ2MGY0ZmQuLmNiMzM0MjAgMTAwNjQ0Ci0tLSBTb3Vy Y2UvSmF2YVNjcmlwdENvcmUvaml0L1JlcGF0Y2guaAorKysgU291cmNlL0phdmFTY3JpcHRDb3Jl L2ppdC9SZXBhdGNoLmgKQEAgLTM3LDcgKzM3LDcgQEAgdm9pZCByZXBhdGNoR2V0QnlJRChFeGVj U3RhdGUqLCBKU1ZhbHVlLCBjb25zdCBJZGVudGlmaWVyJiwgY29uc3QgUHJvcGVydHlTbG90JiwK IHZvaWQgYnVpbGRHZXRCeUlETGlzdChFeGVjU3RhdGUqLCBKU1ZhbHVlLCBjb25zdCBJZGVudGlm aWVyJiwgY29uc3QgUHJvcGVydHlTbG90JiwgU3RydWN0dXJlU3R1YkluZm8mKTsKIHZvaWQgYnVp bGRHZXRCeUlEUHJvdG9MaXN0KEV4ZWNTdGF0ZSosIEpTVmFsdWUsIGNvbnN0IElkZW50aWZpZXIm LCBjb25zdCBQcm9wZXJ0eVNsb3QmLCBTdHJ1Y3R1cmVTdHViSW5mbyYpOwogdm9pZCByZXBhdGNo UHV0QnlJRChFeGVjU3RhdGUqLCBKU1ZhbHVlLCBjb25zdCBJZGVudGlmaWVyJiwgY29uc3QgUHV0 UHJvcGVydHlTbG90JiwgU3RydWN0dXJlU3R1YkluZm8mLCBQdXRLaW5kKTsKLXZvaWQgYnVpbGRQ dXRCeUlkTGlzdChFeGVjU3RhdGUqLCBKU1ZhbHVlLCBjb25zdCBJZGVudGlmaWVyJiwgY29uc3Qg UHV0UHJvcGVydHlTbG90JiwgU3RydWN0dXJlU3R1YkluZm8mLCBQdXRLaW5kKTsKK3ZvaWQgYnVp bGRQdXRCeUlkTGlzdChFeGVjU3RhdGUqLCBKU1ZhbHVlLCBTdHJ1Y3R1cmUqLCBjb25zdCBJZGVu dGlmaWVyJiwgY29uc3QgUHV0UHJvcGVydHlTbG90JiwgU3RydWN0dXJlU3R1YkluZm8mLCBQdXRL aW5kKTsKIHZvaWQgcmVwYXRjaEluKEV4ZWNTdGF0ZSosIEpTQ2VsbCosIGNvbnN0IElkZW50aWZp ZXImLCBib29sIHdhc0ZvdW5kLCBjb25zdCBQcm9wZXJ0eVNsb3QmLCBTdHJ1Y3R1cmVTdHViSW5m byYpOwogdm9pZCBsaW5rRm9yKEV4ZWNTdGF0ZSosIENhbGxMaW5rSW5mbyYsIENvZGVCbG9jayos IEpTRnVuY3Rpb24qIGNhbGxlZSwgTWFjcm9Bc3NlbWJsZXJDb2RlUHRyLCBDb2RlU3BlY2lhbGl6 YXRpb25LaW5kLCBSZWdpc3RlclByZXNlcnZhdGlvbk1vZGUpOwogdm9pZCBsaW5rU2xvd0ZvcihF eGVjU3RhdGUqLCBDYWxsTGlua0luZm8mLCBDb2RlU3BlY2lhbGl6YXRpb25LaW5kLCBSZWdpc3Rl clByZXNlcnZhdGlvbk1vZGUpOwpkaWZmIC0tZ2l0IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS90ZXN0 cy9zdHJlc3MvcHV0LWJ5LWlkLWJ1aWxkLWxpc3Qtb3JkZXItcmVjdXJzZS5qcyBTb3VyY2UvSmF2 YVNjcmlwdENvcmUvdGVzdHMvc3RyZXNzL3B1dC1ieS1pZC1idWlsZC1saXN0LW9yZGVyLXJlY3Vy c2UuanMKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uYmE4MGRhNgotLS0gL2Rl di9udWxsCisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvdGVzdHMvc3RyZXNzL3B1dC1ieS1pZC1i dWlsZC1saXN0LW9yZGVyLXJlY3Vyc2UuanMKQEAgLTAsMCArMSwzMSBAQAordmFyIGNvdW50ID0g MDsKKworZnVuY3Rpb24gc2V0dGVyKHZhbHVlKSB7CisgICAgT2JqZWN0LmRlZmluZVByb3BlcnR5 KAorICAgICAgICB0aGlzLCAiZiIsIHsKKyAgICAgICAgZW51bWVyYWJsZTogdHJ1ZSwKKyAgICAg ICAgICAgICAgICBjb25maWd1cmFibGU6IHRydWUsCisgICAgICAgICAgICAgICAgd3JpdGFibGU6 IHRydWUsCisgICAgICAgICAgICAgICAgdmFsdWU6IDQyCisgICAgICAgICAgICAgICAgfSk7Cisg ICAgdmFyIG8gPSBPYmplY3QuY3JlYXRlKHRoaXMpOworICAgIHZhciBjdXJyZW50Q291bnQgPSBj b3VudCsrOworICAgdmFyIHN0ciA9CisgICAgICAgImZvciAodmFyIGkgPSAiICsgY3VycmVudENv dW50ICsgIjsgaSA8ICIgKyAoMTAwICsgY3VycmVudENvdW50KSArICI7ICsraSlcbiIgKworICAg ICAgICIgICAgby5mXG4iOworICAgZXZhbChzdHIpOworfQorCitmdW5jdGlvbiBmb28obykgewor ICAgIG8uZiA9IDQyOworfQorCitub0lubGluZShmb28pOworCitmb3IgKHZhciBpID0gMDsgaSA8 IDEwMDA7ICsraSkgeworICAgIHByaW50KCJpID0gIiArIGkpOworICAgIHZhciBvID0ge307Cisg ICAgby5fX2RlZmluZVNldHRlcl9fKCJmIiwgc2V0dGVyKTsKKyAgICBmb28obyk7CisgICAgZm9v KG8pOworfQpkaWZmIC0tZ2l0IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS90ZXN0cy9zdHJlc3MvcHV0 LWJ5LWlkLXN0cmljdC1idWlsZC1saXN0LW9yZGVyLmpzIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS90 ZXN0cy9zdHJlc3MvcHV0LWJ5LWlkLXN0cmljdC1idWlsZC1saXN0LW9yZGVyLmpzCm5ldyBmaWxl IG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLmJhYWI4ZTUKLS0tIC9kZXYvbnVsbAorKysgU291 cmNlL0phdmFTY3JpcHRDb3JlL3Rlc3RzL3N0cmVzcy9wdXQtYnktaWQtc3RyaWN0LWJ1aWxkLWxp c3Qtb3JkZXIuanMKQEAgLTAsMCArMSwxNiBAQAorZnVuY3Rpb24gZm9vKG8pIHsKKyAgICAidXNl IHN0cmljdCI7CisgICAgby5mID0gNDI7Cit9CisKK25vSW5saW5lKGZvbyk7CisKK3ZhciBhID0g e307Citmb28oYSk7Citmb28oYSk7CithID0ge2YgOiAzfTsKK2ZvbyhhKTsKKwordmFyIGIgPSB7 fTsKK2ZvbyhiKTsKK2ZvbyhiKTsK