69012 2011-09-28 11:58:50 -0700 layout test demonstrating IDBCursor inconsistency bug 2011-09-29 09:42:00 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 dgrogan dgrogan hans japhet jsbell michaeln webkit.review.bot oldest_to_newest 474879 0 dgrogan 2011-09-28 11:58:50 -0700 layout test demonstrating IDBCursor inconsistency bug 474887 1 109048 dgrogan 2011-09-28 12:05:22 -0700 Created attachment 109048 Patch 474904 2 dgrogan 2011-09-28 12:21:51 -0700 Michael, could you review this layout test? It's the one I mentioned in http://codereview.chromium.org/7834006/. I can see the inconsistency issue discussion taking a while so want to get this layout test in and out of my local client. 474942 3 109048 michaeln 2011-09-28 13:04:41 -0700 Comment on attachment 109048 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=109048&action=review > LayoutTests/storage/indexeddb/cursor-inconsistency.html:80 > + shouldBeEqualToString("storedCursor.key", "someKey" + counter); would it make sense to have a test for cursor object equality too... shouldBeEqualTo(storedCursor, event.target.result); 475049 4 michaeln 2011-09-28 15:31:31 -0700 Also, this looks like a fairly significant correction bug, if the caller uses the 'wrong' cursor object to retrieve the values, results are completely whacked. The test lgtm (fwiw, i don't have review rights), but i also think it'd be good to add the stored vs result cursor equality test. 475059 5 109048 jsbell 2011-09-28 16:03:05 -0700 Comment on attachment 109048 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=109048&action=review > LayoutTests/storage/indexeddb/cursor-inconsistency.html:83 > + shouldBeEqualToString("event.target.result.value", "someValue" + counter++); Nit: Just for readability, I'd pull the counter++ onto its own line. 475108 6 109100 dgrogan 2011-09-28 17:21:12 -0700 Created attachment 109100 Patch 475109 7 109048 dgrogan 2011-09-28 17:21:48 -0700 Comment on attachment 109048 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=109048&action=review >> LayoutTests/storage/indexeddb/cursor-inconsistency.html:80 >> + shouldBeEqualToString("storedCursor.key", "someKey" + counter); > > would it make sense to have a test for cursor object equality too... > > shouldBeEqualTo(storedCursor, event.target.result); Added. >> LayoutTests/storage/indexeddb/cursor-inconsistency.html:83 >> + shouldBeEqualToString("event.target.result.value", "someValue" + counter++); > > Nit: Just for readability, I'd pull the counter++ onto its own line. Done 475111 8 dgrogan 2011-09-28 17:23:19 -0700 Nate, could you review this test? (Also I'm now a committer, thanks for the nomination!) 475395 9 hans 2011-09-29 06:22:32 -0700 lgtm too; scary stuff 475467 10 109100 webkit.review.bot 2011-09-29 09:41:56 -0700 Comment on attachment 109100 Patch Clearing flags on attachment: 109100 Committed r96335: <http://trac.webkit.org/changeset/96335> 475468 11 webkit.review.bot 2011-09-29 09:42:00 -0700 All reviewed patches have been landed. Closing bug. 109048 2011-09-28 12:05:22 -0700 2011-09-28 17:21:48 -0700 Patch bug-69012-20110928120521.patch text/plain 6427 dgrogan U3VidmVyc2lvbiBSZXZpc2lvbjogOTYyMDEKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5n ZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCAzMmIzN2Y4NmVlZDlhMDkzZTNkYzdm MmFkNWVkMDQ1ZTNiMTkzN2Y5Li5jNmZmYTBlN2YyM2MyNjNhNjZkMGU4ODM3ZWY0YmIwZjkyYzc0 MTkxIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMv Q2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAKKzIwMTEtMDktMjggIERhdmlkIEdyb2dhbiAgPGRn cm9nYW5AY2hyb21pdW0ub3JnPgorCisgICAgICAgIExheW91dCB0ZXN0IGRlbW9uc3RyYXRpbmcg SURCQ3Vyc29yIGluY29uc2lzdGVuY3kgYnVnLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NjkwMTIKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICAqIHN0b3JhZ2UvaW5kZXhlZGRiL2N1cnNvci1pbmNvbnNpc3Rl bmN5LWV4cGVjdGVkLnR4dDogQWRkZWQuCisgICAgICAgICogc3RvcmFnZS9pbmRleGVkZGIvY3Vy c29yLWluY29uc2lzdGVuY3kuaHRtbDogQWRkZWQuCisKIDIwMTEtMDktMjggIFNoaW5pY2hpcm8g SGFtYWppICA8aGFtYWppQGNocm9taXVtLm9yZz4KIAogICAgICAgICBbQ2hyb21pdW1dIExheW91 dCBUZXN0IGZhc3QvY2FudmFzL2NhbnZhcy1jb21wb3NpdGUtdHJhbnNmb3JtY2xpcC5odG1sIGlz IGZhaWxpbmcKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL3N0b3JhZ2UvaW5kZXhlZGRiL2N1cnNv ci1pbmNvbnNpc3RlbmN5LWV4cGVjdGVkLnR4dCBiL0xheW91dFRlc3RzL3N0b3JhZ2UvaW5kZXhl ZGRiL2N1cnNvci1pbmNvbnNpc3RlbmN5LWV4cGVjdGVkLnR4dApuZXcgZmlsZSBtb2RlIDEwMDY0 NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi41ZDUzOWMz Nzk5YjAwYmEyZmVjYjFmYzAzZmU5ZWJhNzg1YjMwN2FhCi0tLSAvZGV2L251bGwKKysrIGIvTGF5 b3V0VGVzdHMvc3RvcmFnZS9pbmRleGVkZGIvY3Vyc29yLWluY29uc2lzdGVuY3ktZXhwZWN0ZWQu dHh0CkBAIC0wLDAgKzEsNTggQEAKK1Rlc3QgY29uc2lzdGVuY3kgb2YgSW5kZXhlZERCJ3MgY3Vy c29yIG9iamVjdHMuCisKK09uIHN1Y2Nlc3MsIHlvdSB3aWxsIHNlZSBhIHNlcmllcyBvZiAiUEFT UyIgbWVzc2FnZXMsIGZvbGxvd2VkIGJ5ICJURVNUIENPTVBMRVRFIi4KKworCit3ZWJraXRJbmRl eGVkREIub3BlbignY3Vyc29yLWluY29uc2lzdGVuY3knKQorZGIgPSBldmVudC50YXJnZXQucmVz dWx0CitkYi5zZXRWZXJzaW9uKCduZXcgdmVyc2lvbicpCitzZXRWZXJzaW9uU3VjY2VzcygpOgor dHJhbnMgPSBldmVudC50YXJnZXQucmVzdWx0CitQQVNTIHRyYW5zICE9PSBudWxsIGlzIHRydWUK K0RlbGV0ZWQgYWxsIG9iamVjdCBzdG9yZXMuCitvYmplY3RTdG9yZSA9IGRiLmNyZWF0ZU9iamVj dFN0b3JlKCdiYXNpY1N0b3JlJykKK29iamVjdFN0b3JlLmFkZCgnc29tZVZhbHVlMScsICdzb21l S2V5MScpLm9uZXJyb3IgPSB1bmV4cGVjdGVkRXJyb3JDYWxsYmFjaworb2JqZWN0U3RvcmUuYWRk KCdzb21lVmFsdWUyJywgJ3NvbWVLZXkyJykub25lcnJvciA9IHVuZXhwZWN0ZWRFcnJvckNhbGxi YWNrCitvYmplY3RTdG9yZS5hZGQoJ3NvbWVWYWx1ZTMnLCAnc29tZUtleTMnKS5vbmVycm9yID0g dW5leHBlY3RlZEVycm9yQ2FsbGJhY2sKK29iamVjdFN0b3JlLmFkZCgnc29tZVZhbHVlNCcsICdz b21lS2V5NCcpLm9uZXJyb3IgPSB1bmV4cGVjdGVkRXJyb3JDYWxsYmFjaworb3BlbkJhc2ljQ3Vy c29yKCkKK3RyYW5zID0gZGIudHJhbnNhY3Rpb24oW10sIHdlYmtpdElEQlRyYW5zYWN0aW9uLlJF QURfV1JJVEUpCit0cmFucy5vYmplY3RTdG9yZSgnYmFzaWNTdG9yZScpCitvYmplY3RTdG9yZS5v cGVuQ3Vyc29yKGtleVJhbmdlKQorCitjaGVja0N1cnNvcigpCitzdG9yZWRDdXJzb3IgPSBldmVu dC50YXJnZXQucmVzdWx0CitQQVNTIHN0b3JlZEN1cnNvci5rZXkgaXMgInNvbWVLZXkxIgorUEFT UyBldmVudC50YXJnZXQucmVzdWx0LmtleSBpcyAic29tZUtleTEiCitQQVNTIHN0b3JlZEN1cnNv ci52YWx1ZSBpcyAic29tZVZhbHVlMSIKK1BBU1MgZXZlbnQudGFyZ2V0LnJlc3VsdC52YWx1ZSBp cyAic29tZVZhbHVlMSIKK2V2ZW50LnRhcmdldC5yZXN1bHQuY29udGludWUoKQorCitjaGVja0N1 cnNvcigpCitQQVNTIHN0b3JlZEN1cnNvci5rZXkgaXMgInNvbWVLZXkyIgorUEFTUyBldmVudC50 YXJnZXQucmVzdWx0LmtleSBpcyAic29tZUtleTIiCitGQUlMIHN0b3JlZEN1cnNvci52YWx1ZSBz aG91bGQgYmUgc29tZVZhbHVlMi4gV2FzIHNvbWVWYWx1ZTEuCitQQVNTIGV2ZW50LnRhcmdldC5y ZXN1bHQudmFsdWUgaXMgInNvbWVWYWx1ZTIiCitldmVudC50YXJnZXQucmVzdWx0LmNvbnRpbnVl KCkKKworY2hlY2tDdXJzb3IoKQorUEFTUyBzdG9yZWRDdXJzb3Iua2V5IGlzICJzb21lS2V5MyIK K1BBU1MgZXZlbnQudGFyZ2V0LnJlc3VsdC5rZXkgaXMgInNvbWVLZXkzIgorRkFJTCBzdG9yZWRD dXJzb3IudmFsdWUgc2hvdWxkIGJlIHNvbWVWYWx1ZTMuIFdhcyBzb21lVmFsdWUxLgorUEFTUyBl dmVudC50YXJnZXQucmVzdWx0LnZhbHVlIGlzICJzb21lVmFsdWUzIgorZXZlbnQudGFyZ2V0LnJl c3VsdC5jb250aW51ZSgpCisKK2NoZWNrQ3Vyc29yKCkKK1BBU1Mgc3RvcmVkQ3Vyc29yLmtleSBp cyAic29tZUtleTQiCitQQVNTIGV2ZW50LnRhcmdldC5yZXN1bHQua2V5IGlzICJzb21lS2V5NCIK K0ZBSUwgc3RvcmVkQ3Vyc29yLnZhbHVlIHNob3VsZCBiZSBzb21lVmFsdWU0LiBXYXMgc29tZVZh bHVlMS4KK1BBU1MgZXZlbnQudGFyZ2V0LnJlc3VsdC52YWx1ZSBpcyAic29tZVZhbHVlNCIKK2V2 ZW50LnRhcmdldC5yZXN1bHQuY29udGludWUoKQorCitjaGVja0N1cnNvcigpCitQQVNTIGNvdW50 ZXIgaXMgNQordHJhbnNhY3Rpb25Db21wbGV0ZSgpCitQQVNTIHN1Y2Nlc3NmdWxseVBhcnNlZCBp cyB0cnVlCisKK1RFU1QgQ09NUExFVEUKKwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvc3RvcmFn ZS9pbmRleGVkZGIvY3Vyc29yLWluY29uc2lzdGVuY3kuaHRtbCBiL0xheW91dFRlc3RzL3N0b3Jh Z2UvaW5kZXhlZGRiL2N1cnNvci1pbmNvbnNpc3RlbmN5Lmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2 NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uMTVlNDg0 Y2JiY2QwMDI2YWVhMzJjMDMxMThiNTg3YjA2NTUwODA5MAotLS0gL2Rldi9udWxsCisrKyBiL0xh eW91dFRlc3RzL3N0b3JhZ2UvaW5kZXhlZGRiL2N1cnNvci1pbmNvbnNpc3RlbmN5Lmh0bWwKQEAg LTAsMCArMSw5NyBAQAorPGh0bWw+Cis8aGVhZD4KKzxsaW5rIHJlbD0ic3R5bGVzaGVldCIgaHJl Zj0iLi4vLi4vZmFzdC9qcy9yZXNvdXJjZXMvanMtdGVzdC1zdHlsZS5jc3MiPgorPHNjcmlwdCBz cmM9Ii4uLy4uL2Zhc3QvanMvcmVzb3VyY2VzL2pzLXRlc3QtcHJlLmpzIj48L3NjcmlwdD4KKzxz Y3JpcHQgc3JjPSIuLi8uLi9mYXN0L2pzL3Jlc291cmNlcy9qcy10ZXN0LXBvc3QtZnVuY3Rpb24u anMiPjwvc2NyaXB0PgorPHNjcmlwdCBzcmM9InJlc291cmNlcy9zaGFyZWQuanMiPjwvc2NyaXB0 PgorPC9oZWFkPgorPGJvZHk+Cis8cCBpZD0iZGVzY3JpcHRpb24iPjwvcD4KKzxkaXYgaWQ9ImNv bnNvbGUiPjwvZGl2PgorPHNjcmlwdD4KKworZGVzY3JpcHRpb24oIlRlc3QgY29uc2lzdGVuY3kg b2YgSW5kZXhlZERCJ3MgY3Vyc29yIG9iamVjdHMuIik7CitpZiAod2luZG93LmxheW91dFRlc3RD b250cm9sbGVyKQorICAgIGxheW91dFRlc3RDb250cm9sbGVyLndhaXRVbnRpbERvbmUoKTsKKwor dGVzdCgpOworCitmdW5jdGlvbiB0ZXN0KCkKK3sKKyAgICByZXF1ZXN0ID0gZXZhbEFuZExvZygi d2Via2l0SW5kZXhlZERCLm9wZW4oJ2N1cnNvci1pbmNvbnNpc3RlbmN5JykiKTsKKyAgICByZXF1 ZXN0Lm9uc3VjY2VzcyA9IG9wZW5TdWNjZXNzOworICAgIHJlcXVlc3Qub25lcnJvciA9IHVuZXhw ZWN0ZWRFcnJvckNhbGxiYWNrOworfQorCitmdW5jdGlvbiBvcGVuU3VjY2VzcygpCit7CisgICAg dmFyIGRiID0gZXZhbEFuZExvZygiZGIgPSBldmVudC50YXJnZXQucmVzdWx0Iik7CisKKyAgICBy ZXF1ZXN0ID0gZXZhbEFuZExvZygiZGIuc2V0VmVyc2lvbignbmV3IHZlcnNpb24nKSIpOworICAg IHJlcXVlc3Qub25zdWNjZXNzID0gc2V0VmVyc2lvblN1Y2Nlc3M7CisgICAgcmVxdWVzdC5vbmVy cm9yID0gdW5leHBlY3RlZEVycm9yQ2FsbGJhY2s7Cit9CisKK2Z1bmN0aW9uIHNldFZlcnNpb25T dWNjZXNzKCkKK3sKKyAgICBkZWJ1Zygic2V0VmVyc2lvblN1Y2Nlc3MoKToiKTsKKyAgICB3aW5k b3cudHJhbnMgPSBldmFsQW5kTG9nKCJ0cmFucyA9IGV2ZW50LnRhcmdldC5yZXN1bHQiKTsKKyAg ICBzaG91bGRCZVRydWUoInRyYW5zICE9PSBudWxsIik7CisgICAgdHJhbnMub25hYm9ydCA9IHVu ZXhwZWN0ZWRBYm9ydENhbGxiYWNrOworICAgIHRyYW5zLm9uY29tcGxldGUgPSBvcGVuQmFzaWND dXJzb3I7CisKKyAgICBkZWxldGVBbGxPYmplY3RTdG9yZXMoZGIpOworCisgICAgdmFyIG9iamVj dFN0b3JlID0gZXZhbEFuZExvZygib2JqZWN0U3RvcmUgPSBkYi5jcmVhdGVPYmplY3RTdG9yZSgn YmFzaWNTdG9yZScpIik7CisgICAgZXZhbEFuZExvZygib2JqZWN0U3RvcmUuYWRkKCdzb21lVmFs dWUxJywgJ3NvbWVLZXkxJykub25lcnJvciA9IHVuZXhwZWN0ZWRFcnJvckNhbGxiYWNrIik7Cisg ICAgZXZhbEFuZExvZygib2JqZWN0U3RvcmUuYWRkKCdzb21lVmFsdWUyJywgJ3NvbWVLZXkyJyku b25lcnJvciA9IHVuZXhwZWN0ZWRFcnJvckNhbGxiYWNrIik7CisgICAgZXZhbEFuZExvZygib2Jq ZWN0U3RvcmUuYWRkKCdzb21lVmFsdWUzJywgJ3NvbWVLZXkzJykub25lcnJvciA9IHVuZXhwZWN0 ZWRFcnJvckNhbGxiYWNrIik7CisgICAgZXZhbEFuZExvZygib2JqZWN0U3RvcmUuYWRkKCdzb21l VmFsdWU0JywgJ3NvbWVLZXk0Jykub25lcnJvciA9IHVuZXhwZWN0ZWRFcnJvckNhbGxiYWNrIik7 CisKK30KKworZnVuY3Rpb24gb3BlbkJhc2ljQ3Vyc29yKCkKK3sKKyAgICBkZWJ1Zygib3BlbkJh c2ljQ3Vyc29yKCkiKTsKKyAgICBldmFsQW5kTG9nKCJ0cmFucyA9IGRiLnRyYW5zYWN0aW9uKFtd LCB3ZWJraXRJREJUcmFuc2FjdGlvbi5SRUFEX1dSSVRFKSIpOworICAgIHRyYW5zLm9uYWJvcnQg PSB1bmV4cGVjdGVkQWJvcnRDYWxsYmFjazsKKyAgICB0cmFucy5vbmNvbXBsZXRlID0gdHJhbnNh Y3Rpb25Db21wbGV0ZTsKKworICAgIGtleVJhbmdlID0gd2Via2l0SURCS2V5UmFuZ2UubG93ZXJC b3VuZCgic29tZUtleTEiKTsKKyAgICB3aW5kb3cub2JqZWN0U3RvcmUgPSBldmFsQW5kTG9nKCJ0 cmFucy5vYmplY3RTdG9yZSgnYmFzaWNTdG9yZScpIik7CisgICAgcmVxdWVzdCA9IGV2YWxBbmRM b2coIm9iamVjdFN0b3JlLm9wZW5DdXJzb3Ioa2V5UmFuZ2UpIik7CisgICAgcmVxdWVzdC5vbnN1 Y2Nlc3MgPSBjaGVja0N1cnNvcjsKKyAgICByZXF1ZXN0Lm9uZXJyb3IgPSB1bmV4cGVjdGVkRXJy b3JDYWxsYmFjazsKKyAgICBjb3VudGVyID0gMTsKK30KKworc3RvcmVkQ3Vyc29yID0gbnVsbDsK K2Z1bmN0aW9uIGNoZWNrQ3Vyc29yKCkKK3sKKyAgICBkZWJ1ZygiIikKKyAgICBkZWJ1ZygiY2hl Y2tDdXJzb3IoKSIpOworICAgIGlmIChldmVudC50YXJnZXQucmVzdWx0ID09IG51bGwpIHsKKyAg ICAgICAgc2hvdWxkQmUoImNvdW50ZXIiLCAiNSIpOworICAgICAgICByZXR1cm47CisgICAgfQor ICAgIGlmIChzdG9yZWRDdXJzb3IgPT0gbnVsbCkKKyAgICAgIHN0b3JlZEN1cnNvciA9IGV2YWxB bmRMb2coInN0b3JlZEN1cnNvciA9IGV2ZW50LnRhcmdldC5yZXN1bHQiKTsKKworICAgIHNob3Vs ZEJlRXF1YWxUb1N0cmluZygic3RvcmVkQ3Vyc29yLmtleSIsICJzb21lS2V5IiArIGNvdW50ZXIp OworICAgIHNob3VsZEJlRXF1YWxUb1N0cmluZygiZXZlbnQudGFyZ2V0LnJlc3VsdC5rZXkiLCAi c29tZUtleSIgKyBjb3VudGVyKTsKKyAgICBzaG91bGRCZUVxdWFsVG9TdHJpbmcoInN0b3JlZEN1 cnNvci52YWx1ZSIsICJzb21lVmFsdWUiICsgY291bnRlcik7CisgICAgc2hvdWxkQmVFcXVhbFRv U3RyaW5nKCJldmVudC50YXJnZXQucmVzdWx0LnZhbHVlIiwgInNvbWVWYWx1ZSIgKyBjb3VudGVy KyspOworICAgIGV2YWxBbmRMb2coImV2ZW50LnRhcmdldC5yZXN1bHQuY29udGludWUoKSIpOwor fQorCitmdW5jdGlvbiB0cmFuc2FjdGlvbkNvbXBsZXRlKCkKK3sKKyAgICBkZWJ1ZygidHJhbnNh Y3Rpb25Db21wbGV0ZSgpIik7CisgICAgZG9uZSgpOworfQorCit2YXIgc3VjY2Vzc2Z1bGx5UGFy c2VkID0gdHJ1ZTsKKworPC9zY3JpcHQ+Cis8L2JvZHk+Cis8L2h0bWw+Cg== 109100 2011-09-28 17:21:12 -0700 2011-09-29 09:41:56 -0700 Patch bug-69012-20110928172111.patch text/plain 6761 dgrogan U3VidmVyc2lvbiBSZXZpc2lvbjogOTYyMDEKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5n ZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCAzMmIzN2Y4NmVlZDlhMDkzZTNkYzdm MmFkNWVkMDQ1ZTNiMTkzN2Y5Li5jNmZmYTBlN2YyM2MyNjNhNjZkMGU4ODM3ZWY0YmIwZjkyYzc0 MTkxIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMv Q2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAKKzIwMTEtMDktMjggIERhdmlkIEdyb2dhbiAgPGRn cm9nYW5AY2hyb21pdW0ub3JnPgorCisgICAgICAgIExheW91dCB0ZXN0IGRlbW9uc3RyYXRpbmcg SURCQ3Vyc29yIGluY29uc2lzdGVuY3kgYnVnLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NjkwMTIKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICAqIHN0b3JhZ2UvaW5kZXhlZGRiL2N1cnNvci1pbmNvbnNpc3Rl bmN5LWV4cGVjdGVkLnR4dDogQWRkZWQuCisgICAgICAgICogc3RvcmFnZS9pbmRleGVkZGIvY3Vy c29yLWluY29uc2lzdGVuY3kuaHRtbDogQWRkZWQuCisKIDIwMTEtMDktMjggIFNoaW5pY2hpcm8g SGFtYWppICA8aGFtYWppQGNocm9taXVtLm9yZz4KIAogICAgICAgICBbQ2hyb21pdW1dIExheW91 dCBUZXN0IGZhc3QvY2FudmFzL2NhbnZhcy1jb21wb3NpdGUtdHJhbnNmb3JtY2xpcC5odG1sIGlz IGZhaWxpbmcKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL3N0b3JhZ2UvaW5kZXhlZGRiL2N1cnNv ci1pbmNvbnNpc3RlbmN5LWV4cGVjdGVkLnR4dCBiL0xheW91dFRlc3RzL3N0b3JhZ2UvaW5kZXhl ZGRiL2N1cnNvci1pbmNvbnNpc3RlbmN5LWV4cGVjdGVkLnR4dApuZXcgZmlsZSBtb2RlIDEwMDY0 NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi40ODY3NWRk ZGJiYTlkNWJlNjMwODFhYzdhZmE2MDc0NTkzYmQzNGVhCi0tLSAvZGV2L251bGwKKysrIGIvTGF5 b3V0VGVzdHMvc3RvcmFnZS9pbmRleGVkZGIvY3Vyc29yLWluY29uc2lzdGVuY3ktZXhwZWN0ZWQu dHh0CkBAIC0wLDAgKzEsNjIgQEAKK1Rlc3QgY29uc2lzdGVuY3kgb2YgSW5kZXhlZERCJ3MgY3Vy c29yIG9iamVjdHMuCisKK09uIHN1Y2Nlc3MsIHlvdSB3aWxsIHNlZSBhIHNlcmllcyBvZiAiUEFT UyIgbWVzc2FnZXMsIGZvbGxvd2VkIGJ5ICJURVNUIENPTVBMRVRFIi4KKworCit3ZWJraXRJbmRl eGVkREIub3BlbignY3Vyc29yLWluY29uc2lzdGVuY3knKQorZGIgPSBldmVudC50YXJnZXQucmVz dWx0CitkYi5zZXRWZXJzaW9uKCduZXcgdmVyc2lvbicpCitzZXRWZXJzaW9uU3VjY2VzcygpOgor dHJhbnMgPSBldmVudC50YXJnZXQucmVzdWx0CitQQVNTIHRyYW5zICE9PSBudWxsIGlzIHRydWUK K0RlbGV0ZWQgYWxsIG9iamVjdCBzdG9yZXMuCitvYmplY3RTdG9yZSA9IGRiLmNyZWF0ZU9iamVj dFN0b3JlKCdiYXNpY1N0b3JlJykKK29iamVjdFN0b3JlLmFkZCgnc29tZVZhbHVlMScsICdzb21l S2V5MScpLm9uZXJyb3IgPSB1bmV4cGVjdGVkRXJyb3JDYWxsYmFjaworb2JqZWN0U3RvcmUuYWRk KCdzb21lVmFsdWUyJywgJ3NvbWVLZXkyJykub25lcnJvciA9IHVuZXhwZWN0ZWRFcnJvckNhbGxi YWNrCitvYmplY3RTdG9yZS5hZGQoJ3NvbWVWYWx1ZTMnLCAnc29tZUtleTMnKS5vbmVycm9yID0g dW5leHBlY3RlZEVycm9yQ2FsbGJhY2sKK29iamVjdFN0b3JlLmFkZCgnc29tZVZhbHVlNCcsICdz b21lS2V5NCcpLm9uZXJyb3IgPSB1bmV4cGVjdGVkRXJyb3JDYWxsYmFjaworb3BlbkJhc2ljQ3Vy c29yKCkKK3RyYW5zID0gZGIudHJhbnNhY3Rpb24oW10sIHdlYmtpdElEQlRyYW5zYWN0aW9uLlJF QURfV1JJVEUpCit0cmFucy5vYmplY3RTdG9yZSgnYmFzaWNTdG9yZScpCitvYmplY3RTdG9yZS5v cGVuQ3Vyc29yKGtleVJhbmdlKQorCitjaGVja0N1cnNvcigpCitzdG9yZWRDdXJzb3IgPSBldmVu dC50YXJnZXQucmVzdWx0CitQQVNTIHN0b3JlZEN1cnNvciA9PT0gZXZlbnQudGFyZ2V0LnJlc3Vs dCBpcyB0cnVlCitQQVNTIHN0b3JlZEN1cnNvci5rZXkgaXMgInNvbWVLZXkxIgorUEFTUyBldmVu dC50YXJnZXQucmVzdWx0LmtleSBpcyAic29tZUtleTEiCitQQVNTIHN0b3JlZEN1cnNvci52YWx1 ZSBpcyAic29tZVZhbHVlMSIKK1BBU1MgZXZlbnQudGFyZ2V0LnJlc3VsdC52YWx1ZSBpcyAic29t ZVZhbHVlMSIKK2V2ZW50LnRhcmdldC5yZXN1bHQuY29udGludWUoKQorCitjaGVja0N1cnNvcigp CitGQUlMIHN0b3JlZEN1cnNvciA9PT0gZXZlbnQudGFyZ2V0LnJlc3VsdCBzaG91bGQgYmUgdHJ1 ZS4gV2FzIGZhbHNlLgorUEFTUyBzdG9yZWRDdXJzb3Iua2V5IGlzICJzb21lS2V5MiIKK1BBU1Mg ZXZlbnQudGFyZ2V0LnJlc3VsdC5rZXkgaXMgInNvbWVLZXkyIgorRkFJTCBzdG9yZWRDdXJzb3Iu dmFsdWUgc2hvdWxkIGJlIHNvbWVWYWx1ZTIuIFdhcyBzb21lVmFsdWUxLgorUEFTUyBldmVudC50 YXJnZXQucmVzdWx0LnZhbHVlIGlzICJzb21lVmFsdWUyIgorZXZlbnQudGFyZ2V0LnJlc3VsdC5j b250aW51ZSgpCisKK2NoZWNrQ3Vyc29yKCkKK0ZBSUwgc3RvcmVkQ3Vyc29yID09PSBldmVudC50 YXJnZXQucmVzdWx0IHNob3VsZCBiZSB0cnVlLiBXYXMgZmFsc2UuCitQQVNTIHN0b3JlZEN1cnNv ci5rZXkgaXMgInNvbWVLZXkzIgorUEFTUyBldmVudC50YXJnZXQucmVzdWx0LmtleSBpcyAic29t ZUtleTMiCitGQUlMIHN0b3JlZEN1cnNvci52YWx1ZSBzaG91bGQgYmUgc29tZVZhbHVlMy4gV2Fz IHNvbWVWYWx1ZTEuCitQQVNTIGV2ZW50LnRhcmdldC5yZXN1bHQudmFsdWUgaXMgInNvbWVWYWx1 ZTMiCitldmVudC50YXJnZXQucmVzdWx0LmNvbnRpbnVlKCkKKworY2hlY2tDdXJzb3IoKQorRkFJ TCBzdG9yZWRDdXJzb3IgPT09IGV2ZW50LnRhcmdldC5yZXN1bHQgc2hvdWxkIGJlIHRydWUuIFdh cyBmYWxzZS4KK1BBU1Mgc3RvcmVkQ3Vyc29yLmtleSBpcyAic29tZUtleTQiCitQQVNTIGV2ZW50 LnRhcmdldC5yZXN1bHQua2V5IGlzICJzb21lS2V5NCIKK0ZBSUwgc3RvcmVkQ3Vyc29yLnZhbHVl IHNob3VsZCBiZSBzb21lVmFsdWU0LiBXYXMgc29tZVZhbHVlMS4KK1BBU1MgZXZlbnQudGFyZ2V0 LnJlc3VsdC52YWx1ZSBpcyAic29tZVZhbHVlNCIKK2V2ZW50LnRhcmdldC5yZXN1bHQuY29udGlu dWUoKQorCitjaGVja0N1cnNvcigpCitQQVNTIGNvdW50ZXIgaXMgNQordHJhbnNhY3Rpb25Db21w bGV0ZSgpCitQQVNTIHN1Y2Nlc3NmdWxseVBhcnNlZCBpcyB0cnVlCisKK1RFU1QgQ09NUExFVEUK KwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvc3RvcmFnZS9pbmRleGVkZGIvY3Vyc29yLWluY29u c2lzdGVuY3kuaHRtbCBiL0xheW91dFRlc3RzL3N0b3JhZ2UvaW5kZXhlZGRiL2N1cnNvci1pbmNv bnNpc3RlbmN5Lmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uYjljY2I1OGIyZGM5OWEwNDEyNjEwZjI4Yjk1OTEz MzZhZjRmNmNkZgotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL3N0b3JhZ2UvaW5kZXhl ZGRiL2N1cnNvci1pbmNvbnNpc3RlbmN5Lmh0bWwKQEAgLTAsMCArMSw5OSBAQAorPGh0bWw+Cis8 aGVhZD4KKzxsaW5rIHJlbD0ic3R5bGVzaGVldCIgaHJlZj0iLi4vLi4vZmFzdC9qcy9yZXNvdXJj ZXMvanMtdGVzdC1zdHlsZS5jc3MiPgorPHNjcmlwdCBzcmM9Ii4uLy4uL2Zhc3QvanMvcmVzb3Vy Y2VzL2pzLXRlc3QtcHJlLmpzIj48L3NjcmlwdD4KKzxzY3JpcHQgc3JjPSIuLi8uLi9mYXN0L2pz L3Jlc291cmNlcy9qcy10ZXN0LXBvc3QtZnVuY3Rpb24uanMiPjwvc2NyaXB0PgorPHNjcmlwdCBz cmM9InJlc291cmNlcy9zaGFyZWQuanMiPjwvc2NyaXB0PgorPC9oZWFkPgorPGJvZHk+Cis8cCBp ZD0iZGVzY3JpcHRpb24iPjwvcD4KKzxkaXYgaWQ9ImNvbnNvbGUiPjwvZGl2PgorPHNjcmlwdD4K KworZGVzY3JpcHRpb24oIlRlc3QgY29uc2lzdGVuY3kgb2YgSW5kZXhlZERCJ3MgY3Vyc29yIG9i amVjdHMuIik7CitpZiAod2luZG93LmxheW91dFRlc3RDb250cm9sbGVyKQorICAgIGxheW91dFRl c3RDb250cm9sbGVyLndhaXRVbnRpbERvbmUoKTsKKwordGVzdCgpOworCitmdW5jdGlvbiB0ZXN0 KCkKK3sKKyAgICByZXF1ZXN0ID0gZXZhbEFuZExvZygid2Via2l0SW5kZXhlZERCLm9wZW4oJ2N1 cnNvci1pbmNvbnNpc3RlbmN5JykiKTsKKyAgICByZXF1ZXN0Lm9uc3VjY2VzcyA9IG9wZW5TdWNj ZXNzOworICAgIHJlcXVlc3Qub25lcnJvciA9IHVuZXhwZWN0ZWRFcnJvckNhbGxiYWNrOworfQor CitmdW5jdGlvbiBvcGVuU3VjY2VzcygpCit7CisgICAgdmFyIGRiID0gZXZhbEFuZExvZygiZGIg PSBldmVudC50YXJnZXQucmVzdWx0Iik7CisKKyAgICByZXF1ZXN0ID0gZXZhbEFuZExvZygiZGIu c2V0VmVyc2lvbignbmV3IHZlcnNpb24nKSIpOworICAgIHJlcXVlc3Qub25zdWNjZXNzID0gc2V0 VmVyc2lvblN1Y2Nlc3M7CisgICAgcmVxdWVzdC5vbmVycm9yID0gdW5leHBlY3RlZEVycm9yQ2Fs bGJhY2s7Cit9CisKK2Z1bmN0aW9uIHNldFZlcnNpb25TdWNjZXNzKCkKK3sKKyAgICBkZWJ1Zygi c2V0VmVyc2lvblN1Y2Nlc3MoKToiKTsKKyAgICB3aW5kb3cudHJhbnMgPSBldmFsQW5kTG9nKCJ0 cmFucyA9IGV2ZW50LnRhcmdldC5yZXN1bHQiKTsKKyAgICBzaG91bGRCZVRydWUoInRyYW5zICE9 PSBudWxsIik7CisgICAgdHJhbnMub25hYm9ydCA9IHVuZXhwZWN0ZWRBYm9ydENhbGxiYWNrOwor ICAgIHRyYW5zLm9uY29tcGxldGUgPSBvcGVuQmFzaWNDdXJzb3I7CisKKyAgICBkZWxldGVBbGxP YmplY3RTdG9yZXMoZGIpOworCisgICAgdmFyIG9iamVjdFN0b3JlID0gZXZhbEFuZExvZygib2Jq ZWN0U3RvcmUgPSBkYi5jcmVhdGVPYmplY3RTdG9yZSgnYmFzaWNTdG9yZScpIik7CisgICAgZXZh bEFuZExvZygib2JqZWN0U3RvcmUuYWRkKCdzb21lVmFsdWUxJywgJ3NvbWVLZXkxJykub25lcnJv ciA9IHVuZXhwZWN0ZWRFcnJvckNhbGxiYWNrIik7CisgICAgZXZhbEFuZExvZygib2JqZWN0U3Rv cmUuYWRkKCdzb21lVmFsdWUyJywgJ3NvbWVLZXkyJykub25lcnJvciA9IHVuZXhwZWN0ZWRFcnJv ckNhbGxiYWNrIik7CisgICAgZXZhbEFuZExvZygib2JqZWN0U3RvcmUuYWRkKCdzb21lVmFsdWUz JywgJ3NvbWVLZXkzJykub25lcnJvciA9IHVuZXhwZWN0ZWRFcnJvckNhbGxiYWNrIik7CisgICAg ZXZhbEFuZExvZygib2JqZWN0U3RvcmUuYWRkKCdzb21lVmFsdWU0JywgJ3NvbWVLZXk0Jykub25l cnJvciA9IHVuZXhwZWN0ZWRFcnJvckNhbGxiYWNrIik7CisKK30KKworZnVuY3Rpb24gb3BlbkJh c2ljQ3Vyc29yKCkKK3sKKyAgICBkZWJ1Zygib3BlbkJhc2ljQ3Vyc29yKCkiKTsKKyAgICBldmFs QW5kTG9nKCJ0cmFucyA9IGRiLnRyYW5zYWN0aW9uKFtdLCB3ZWJraXRJREJUcmFuc2FjdGlvbi5S RUFEX1dSSVRFKSIpOworICAgIHRyYW5zLm9uYWJvcnQgPSB1bmV4cGVjdGVkQWJvcnRDYWxsYmFj azsKKyAgICB0cmFucy5vbmNvbXBsZXRlID0gdHJhbnNhY3Rpb25Db21wbGV0ZTsKKworICAgIGtl eVJhbmdlID0gd2Via2l0SURCS2V5UmFuZ2UubG93ZXJCb3VuZCgic29tZUtleTEiKTsKKyAgICB3 aW5kb3cub2JqZWN0U3RvcmUgPSBldmFsQW5kTG9nKCJ0cmFucy5vYmplY3RTdG9yZSgnYmFzaWNT dG9yZScpIik7CisgICAgcmVxdWVzdCA9IGV2YWxBbmRMb2coIm9iamVjdFN0b3JlLm9wZW5DdXJz b3Ioa2V5UmFuZ2UpIik7CisgICAgcmVxdWVzdC5vbnN1Y2Nlc3MgPSBjaGVja0N1cnNvcjsKKyAg ICByZXF1ZXN0Lm9uZXJyb3IgPSB1bmV4cGVjdGVkRXJyb3JDYWxsYmFjazsKKyAgICBjb3VudGVy ID0gMTsKK30KKworc3RvcmVkQ3Vyc29yID0gbnVsbDsKK2Z1bmN0aW9uIGNoZWNrQ3Vyc29yKCkK K3sKKyAgICBkZWJ1ZygiIikKKyAgICBkZWJ1ZygiY2hlY2tDdXJzb3IoKSIpOworICAgIGlmIChl dmVudC50YXJnZXQucmVzdWx0ID09IG51bGwpIHsKKyAgICAgICAgc2hvdWxkQmUoImNvdW50ZXIi LCAiNSIpOworICAgICAgICByZXR1cm47CisgICAgfQorICAgIGlmIChzdG9yZWRDdXJzb3IgPT0g bnVsbCkKKyAgICAgIHN0b3JlZEN1cnNvciA9IGV2YWxBbmRMb2coInN0b3JlZEN1cnNvciA9IGV2 ZW50LnRhcmdldC5yZXN1bHQiKTsKKworICAgIHNob3VsZEJlVHJ1ZSgic3RvcmVkQ3Vyc29yID09 PSBldmVudC50YXJnZXQucmVzdWx0Iik7CisgICAgc2hvdWxkQmVFcXVhbFRvU3RyaW5nKCJzdG9y ZWRDdXJzb3Iua2V5IiwgInNvbWVLZXkiICsgY291bnRlcik7CisgICAgc2hvdWxkQmVFcXVhbFRv U3RyaW5nKCJldmVudC50YXJnZXQucmVzdWx0LmtleSIsICJzb21lS2V5IiArIGNvdW50ZXIpOwor ICAgIHNob3VsZEJlRXF1YWxUb1N0cmluZygic3RvcmVkQ3Vyc29yLnZhbHVlIiwgInNvbWVWYWx1 ZSIgKyBjb3VudGVyKTsKKyAgICBzaG91bGRCZUVxdWFsVG9TdHJpbmcoImV2ZW50LnRhcmdldC5y ZXN1bHQudmFsdWUiLCAic29tZVZhbHVlIiArIGNvdW50ZXIpOworICAgIGNvdW50ZXIrKzsKKyAg ICBldmFsQW5kTG9nKCJldmVudC50YXJnZXQucmVzdWx0LmNvbnRpbnVlKCkiKTsKK30KKworZnVu Y3Rpb24gdHJhbnNhY3Rpb25Db21wbGV0ZSgpCit7CisgICAgZGVidWcoInRyYW5zYWN0aW9uQ29t cGxldGUoKSIpOworICAgIGRvbmUoKTsKK30KKwordmFyIHN1Y2Nlc3NmdWxseVBhcnNlZCA9IHRy dWU7CisKKzwvc2NyaXB0PgorPC9ib2R5PgorPC9odG1sPgo=