39896 2010-05-28 12:30:34 -0700 [V8] DB V8 bindings should not pass empty handles to V8 code 2010-06-05 13:40:00 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 dumi dumi abarth ericu eric webkit.review.bot oldest_to_newest 231871 0 dumi 2010-05-28 12:30:34 -0700 Currently, none of the DB V8 bindings check if any of the arguments passed to invokeCallback() is empty. According to Mats Ager, toV8() can sometimes return empty handles, and passing them to invokeCallback() would cause v8 to crash. We should fix that. 231910 1 57370 dumi 2010-05-28 13:36:59 -0700 Created attachment 57370 patch 231927 2 57370 abarth 2010-05-28 14:05:07 -0700 Comment on attachment 57370 patch Test? 234464 3 57937 dumi 2010-06-04 18:42:15 -0700 Created attachment 57937 patch 234466 4 57937 abarth 2010-06-04 18:43:53 -0700 Comment on attachment 57937 patch Hum... We should add a lot more information to the ChangeLog about why we're doing this in case someone is curious about this rather strange patch. 234476 5 57946 dumi 2010-06-04 19:16:13 -0700 Created attachment 57946 patch 234477 6 57946 abarth 2010-06-04 19:17:27 -0700 Comment on attachment 57946 patch ok, hopefully this will help you gather more useful information 234630 7 dumi 2010-06-05 13:19:41 -0700 Landed as r60754. 234633 8 dumi 2010-06-05 13:36:26 -0700 r60755 fixed a typo that caused a build failure. 234634 9 webkit.review.bot 2010-06-05 13:40:00 -0700 http://trac.webkit.org/changeset/60754 might have broken Chromium Mac Release 57370 2010-05-28 13:36:59 -0700 2010-06-04 18:42:15 -0700 patch patch text/plain 4333 dumi SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA2MDM3NCkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTcgQEAKKzIwMTAtMDUtMjggIER1bWl0cnUgRGFuaWxpdWMgIDxkdW1pQGNocm9t aXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICBEbyBub3QgcGFzcyBlbXB0eSBoYW5kbGVzIHRvIHY4LgorICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9Mzk4OTYKKworICAgICAgICAqIGJpbmRpbmdzL3Nj cmlwdHMvQ29kZUdlbmVyYXRvclY4LnBtOgorICAgICAgICAqIGJpbmRpbmdzL3NjcmlwdHMvdGVz dC9WOC9WOFRlc3RDYWxsYmFjay5jcHA6CisgICAgICAgIChXZWJDb3JlOjpWOFRlc3RDYWxsYmFj azo6Y2FsbGJhY2tXaXRoQ2xhc3MxUGFyYW0pOgorICAgICAgICAoV2ViQ29yZTo6VjhUZXN0Q2Fs bGJhY2s6OmNhbGxiYWNrV2l0aENsYXNzMlBhcmFtKToKKyAgICAgICAgKiBiaW5kaW5ncy92OC9j dXN0b20vVjhDdXN0b21TUUxTdGF0ZW1lbnRFcnJvckNhbGxiYWNrLmNwcDoKKyAgICAgICAgKFdl YkNvcmU6OlY4U1FMU3RhdGVtZW50RXJyb3JDYWxsYmFjazo6aGFuZGxlRXZlbnQpOgorCiAyMDEw LTA1LTI4ICBCZW4gTXVyZG9jaCAgPGJlbm1AZ29vZ2xlLmNvbT4KIAogICAgICAgICBSZXZpZXdl ZCBieSBEYXJpbiBBZGxlci4KSW5kZXg6IFdlYkNvcmUvYmluZGluZ3Mvc2NyaXB0cy9Db2RlR2Vu ZXJhdG9yVjgucG0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9iaW5kaW5ncy9zY3JpcHRzL0NvZGVH ZW5lcmF0b3JWOC5wbQkocmV2aXNpb24gNjAzNzMpCisrKyBXZWJDb3JlL2JpbmRpbmdzL3Njcmlw dHMvQ29kZUdlbmVyYXRvclY4LnBtCSh3b3JraW5nIGNvcHkpCkBAIC0yMjYwLDE1ICsyMjYwLDE4 IEBAIEVORAogICAgICAgICAgICAgcHVzaChAaW1wbENvbnRlbnQsICIgICAgaWYgKHY4Q29udGV4 dC5Jc0VtcHR5KCkpXG4iKTsKICAgICAgICAgICAgIHB1c2goQGltcGxDb250ZW50LCAiICAgICAg ICByZXR1cm4gdHJ1ZTtcblxuIik7CiAgICAgICAgICAgICBwdXNoKEBpbXBsQ29udGVudCwgIiAg ICB2ODo6Q29udGV4dDo6U2NvcGUgc2NvcGUodjhDb250ZXh0KTtcblxuIik7Ci0gICAgICAgICAg ICBwdXNoKEBpbXBsQ29udGVudCwgIiAgICB2ODo6SGFuZGxlPHY4OjpWYWx1ZT4gYXJndltdID0g e1xuIik7CiAKICAgICAgICAgICAgIG15IEBhcmd2cyA9ICgpOwogICAgICAgICAgICAgZm9yZWFj aCBteSAkcGFyYW0gKEBwYXJhbXMpIHsKICAgICAgICAgICAgICAgICBteSAkcGFyYW1OYW1lID0g JHBhcmFtLT5uYW1lOwotICAgICAgICAgICAgICAgIHB1c2goQGFyZ3ZzLCAiICAgICAgICB0b1Y4 KCR7cGFyYW1OYW1lfSkiKTsKKyAgICAgICAgICAgICAgICBwdXNoKEBpbXBsQ29udGVudCwgIiAg ICB2ODo6SGFuZGxlPHY4OjpWYWx1ZT4gJHtwYXJhbU5hbWV9SGFuZGxlID0gdG9WOCgke3BhcmFt TmFtZX0pO1xuIik7CisgICAgICAgICAgICAgICAgcHVzaChAaW1wbENvbnRlbnQsICIgICAgaWYg KCR7cGFyYW1OYW1lfUhhbmRsZS5Jc0VtcHR5KCkpXG4iKTsKKyAgICAgICAgICAgICAgICBwdXNo KEBpbXBsQ29udGVudCwgIiAgICAgICAgcmV0dXJuIHRydWU7XG4iKTsKKyAgICAgICAgICAgICAg ICBwdXNoKEBhcmd2cywgIiAgICAgICAgJHtwYXJhbU5hbWV9SGFuZGxlIik7CiAgICAgICAgICAg ICB9Ci0gICAgICAgICAgICBwdXNoKEBpbXBsQ29udGVudCwgam9pbigiLFxuIiwgQGFyZ3ZzKSk7 CiAKKyAgICAgICAgICAgIHB1c2goQGltcGxDb250ZW50LCAiICAgIHY4OjpIYW5kbGU8djg6OlZh bHVlPiBhcmd2W10gPSB7XG4iKTsKKyAgICAgICAgICAgIHB1c2goQGltcGxDb250ZW50LCBqb2lu KCIsXG4iLCBAYXJndnMpKTsKICAgICAgICAgICAgIHB1c2goQGltcGxDb250ZW50LCAiXG4gICAg fTtcblxuIik7CiAgICAgICAgICAgICBwdXNoKEBpbXBsQ29udGVudCwgIiAgICBib29sIGNhbGxi YWNrUmV0dXJuVmFsdWUgPSBmYWxzZTtcbiIpOwogICAgICAgICAgICAgcHVzaChAaW1wbENvbnRl bnQsICIgICAgcmV0dXJuICFpbnZva2VDYWxsYmFjayhtX2NhbGxiYWNrLCAiIC4gc2NhbGFyKEBw YXJhbXMpIC4gIiwgYXJndiwgY2FsbGJhY2tSZXR1cm5WYWx1ZSwgY29udGV4dCk7XG4iKTsKSW5k ZXg6IFdlYkNvcmUvYmluZGluZ3Mvc2NyaXB0cy90ZXN0L1Y4L1Y4VGVzdENhbGxiYWNrLmNwcAo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBXZWJDb3JlL2JpbmRpbmdzL3NjcmlwdHMvdGVzdC9WOC9WOFRlc3RDYWxs YmFjay5jcHAJKHJldmlzaW9uIDYwMzczKQorKysgV2ViQ29yZS9iaW5kaW5ncy9zY3JpcHRzL3Rl c3QvVjgvVjhUZXN0Q2FsbGJhY2suY3BwCSh3b3JraW5nIGNvcHkpCkBAIC01NCw4ICs1NCwxMSBA QCBib29sIFY4VGVzdENhbGxiYWNrOjpjYWxsYmFja1dpdGhDbGFzczFQCiAKICAgICB2ODo6Q29u dGV4dDo6U2NvcGUgc2NvcGUodjhDb250ZXh0KTsKIAorICAgIHY4OjpIYW5kbGU8djg6OlZhbHVl PiBjbGFzczFQYXJhbUhhbmRsZSA9IHRvVjgoY2xhc3MxUGFyYW0pOworICAgIGlmIChjbGFzczFQ YXJhbUhhbmRsZS5Jc0VtcHR5KCkpCisgICAgICAgIHJldHVybiB0cnVlOwogICAgIHY4OjpIYW5k bGU8djg6OlZhbHVlPiBhcmd2W10gPSB7Ci0gICAgICAgIHRvVjgoY2xhc3MxUGFyYW0pCisgICAg ICAgIGNsYXNzMVBhcmFtSGFuZGxlCiAgICAgfTsKIAogICAgIGJvb2wgY2FsbGJhY2tSZXR1cm5W YWx1ZSA9IGZhbHNlOwpAQCAtNzIsOSArNzUsMTUgQEAgYm9vbCBWOFRlc3RDYWxsYmFjazo6Y2Fs bGJhY2tXaXRoQ2xhc3MyUAogCiAgICAgdjg6OkNvbnRleHQ6OlNjb3BlIHNjb3BlKHY4Q29udGV4 dCk7CiAKKyAgICB2ODo6SGFuZGxlPHY4OjpWYWx1ZT4gY2xhc3MyUGFyYW1IYW5kbGUgPSB0b1Y4 KGNsYXNzMlBhcmFtKTsKKyAgICBpZiAoY2xhc3MyUGFyYW1IYW5kbGUuSXNFbXB0eSgpKQorICAg ICAgICByZXR1cm4gdHJ1ZTsKKyAgICB2ODo6SGFuZGxlPHY4OjpWYWx1ZT4gc3RyQXJnSGFuZGxl ID0gdG9WOChzdHJBcmcpOworICAgIGlmIChzdHJBcmdIYW5kbGUuSXNFbXB0eSgpKQorICAgICAg ICByZXR1cm4gdHJ1ZTsKICAgICB2ODo6SGFuZGxlPHY4OjpWYWx1ZT4gYXJndltdID0gewotICAg ICAgICB0b1Y4KGNsYXNzMlBhcmFtKSwKLSAgICAgICAgdG9WOChzdHJBcmcpCisgICAgICAgIGNs YXNzMlBhcmFtSGFuZGxlLAorICAgICAgICBzdHJBcmdIYW5kbGUKICAgICB9OwogCiAgICAgYm9v bCBjYWxsYmFja1JldHVyblZhbHVlID0gZmFsc2U7CkluZGV4OiBXZWJDb3JlL2JpbmRpbmdzL3Y4 L2N1c3RvbS9WOEN1c3RvbVNRTFN0YXRlbWVudEVycm9yQ2FsbGJhY2suY3BwCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFdlYkNvcmUvYmluZGluZ3MvdjgvY3VzdG9tL1Y4Q3VzdG9tU1FMU3RhdGVtZW50RXJyb3JD YWxsYmFjay5jcHAJKHJldmlzaW9uIDYwMzczKQorKysgV2ViQ29yZS9iaW5kaW5ncy92OC9jdXN0 b20vVjhDdXN0b21TUUxTdGF0ZW1lbnRFcnJvckNhbGxiYWNrLmNwcAkod29ya2luZyBjb3B5KQpA QCAtNTIsOSArNTIsMTQgQEAgYm9vbCBWOFNRTFN0YXRlbWVudEVycm9yQ2FsbGJhY2s6OmhhbmRs ZQogCiAgICAgdjg6OkNvbnRleHQ6OlNjb3BlIHNjb3BlKHY4Q29udGV4dCk7CiAKKyAgICB2ODo6 SGFuZGxlPHY4OjpWYWx1ZT4gdHJhbnNhY3Rpb25IYW5kbGUgPSB0b1Y4KHRyYW5zYWN0aW9uKTsK KyAgICB2ODo6SGFuZGxlPHY4OjpWYWx1ZT4gZXJyb3JIYW5kbGUgPSB0b1Y4KGVycm9yKTsKKyAg ICBpZiAodHJhbnNhY3Rpb25IYW5kbGUuSXNFbXB0eSgpIHx8IGVycm9ySGFuZGxlLmlzRW1wdHko KSkKKyAgICAgICAgcmV0dXJuIHRydWU7CisKICAgICB2ODo6SGFuZGxlPHY4OjpWYWx1ZT4gYXJn dltdID0gewotICAgICAgICB0b1Y4KHRyYW5zYWN0aW9uKSwKLSAgICAgICAgdG9WOChlcnJvcikK KyAgICAgICAgdHJhbnNhY3Rpb25IYW5kbGUsCisgICAgICAgIGVycm9ySGFuZGxlCiAgICAgfTsK IAogICAgIC8vIFByb3RlY3QgdGhlIGNvbnRleHQgdW50aWwgdGhlIGNhbGxiYWNrIHJldHVybnMu Cg== 57937 2010-06-04 18:42:15 -0700 2010-06-04 19:16:13 -0700 patch patch text/plain 5285 dumi SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA2MDcyNikKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTcgQEAKKzIwMTAtMDUtMjggIER1bWl0cnUgRGFuaWxpdWMgIDxkdW1pQGNocm9t aXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICBEbyBub3QgcGFzcyBlbXB0eSBoYW5kbGVzIHRvIHY4LgorICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9Mzk4OTYKKworICAgICAgICAqIGJpbmRpbmdzL3Nj cmlwdHMvQ29kZUdlbmVyYXRvclY4LnBtOgorICAgICAgICAqIGJpbmRpbmdzL3NjcmlwdHMvdGVz dC9WOC9WOFRlc3RDYWxsYmFjay5jcHA6CisgICAgICAgIChXZWJDb3JlOjpWOFRlc3RDYWxsYmFj azo6Y2FsbGJhY2tXaXRoQ2xhc3MxUGFyYW0pOgorICAgICAgICAoV2ViQ29yZTo6VjhUZXN0Q2Fs bGJhY2s6OmNhbGxiYWNrV2l0aENsYXNzMlBhcmFtKToKKyAgICAgICAgKiBiaW5kaW5ncy92OC9j dXN0b20vVjhDdXN0b21TUUxTdGF0ZW1lbnRFcnJvckNhbGxiYWNrLmNwcDoKKyAgICAgICAgKFdl YkNvcmU6OlY4U1FMU3RhdGVtZW50RXJyb3JDYWxsYmFjazo6aGFuZGxlRXZlbnQpOgorCiAyMDEw LTA2LTA0ICBBbmRyZWFzIEtsaW5nICA8YW5kcmVhcy5rbGluZ0Bub2tpYS5jb20+CiAKICAgICAg ICAgUmV2aWV3ZWQgYnkgVG9yIEFybmUgVmVzdGLDuC4KSW5kZXg6IFdlYkNvcmUvYmluZGluZ3Mv c2NyaXB0cy9Db2RlR2VuZXJhdG9yVjgucG0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9iaW5kaW5n cy9zY3JpcHRzL0NvZGVHZW5lcmF0b3JWOC5wbQkocmV2aXNpb24gNjA3MjYpCisrKyBXZWJDb3Jl L2JpbmRpbmdzL3NjcmlwdHMvQ29kZUdlbmVyYXRvclY4LnBtCSh3b3JraW5nIGNvcHkpCkBAIC0y MjM2LDYgKzIyMzYsNyBAQCBzdWIgR2VuZXJhdGVDYWxsYmFja0ltcGxlbWVudGF0aW9uCiAgICAg JGltcGxJbmNsdWRlc3siU2NyaXB0RXhlY3V0aW9uQ29udGV4dC5oIn0gPSAxOwogICAgICRpbXBs SW5jbHVkZXN7IlY4Q3VzdG9tVm9pZENhbGxiYWNrLmgifSA9IDE7CiAKKyAgICBwdXNoKEBpbXBs Q29udGVudCwgIiNpbmNsdWRlIDx3dGYvQXNzZXJ0aW9ucy5oPlxuXG4iKTsKICAgICBwdXNoKEBp bXBsQ29udGVudCwgIm5hbWVzcGFjZSBXZWJDb3JlIHtcblxuIik7CiAgICAgcHVzaChAaW1wbENv bnRlbnQsIDw8RU5EKTsKICR7Y2xhc3NOYW1lfTo6JHtjbGFzc05hbWV9KHY4OjpMb2NhbDx2ODo6 T2JqZWN0PiBjYWxsYmFjaykKQEAgLTIyNzcsMTUgKzIyNzgsMjAgQEAgRU5ECiAgICAgICAgICAg ICBwdXNoKEBpbXBsQ29udGVudCwgIiAgICBpZiAodjhDb250ZXh0LklzRW1wdHkoKSlcbiIpOwog ICAgICAgICAgICAgcHVzaChAaW1wbENvbnRlbnQsICIgICAgICAgIHJldHVybiB0cnVlO1xuXG4i KTsKICAgICAgICAgICAgIHB1c2goQGltcGxDb250ZW50LCAiICAgIHY4OjpDb250ZXh0OjpTY29w ZSBzY29wZSh2OENvbnRleHQpO1xuXG4iKTsKLSAgICAgICAgICAgIHB1c2goQGltcGxDb250ZW50 LCAiICAgIHY4OjpIYW5kbGU8djg6OlZhbHVlPiBhcmd2W10gPSB7XG4iKTsKIAogICAgICAgICAg ICAgbXkgQGFyZ3ZzID0gKCk7CiAgICAgICAgICAgICBmb3JlYWNoIG15ICRwYXJhbSAoQHBhcmFt cykgewogICAgICAgICAgICAgICAgIG15ICRwYXJhbU5hbWUgPSAkcGFyYW0tPm5hbWU7Ci0gICAg ICAgICAgICAgICAgcHVzaChAYXJndnMsICIgICAgICAgIHRvVjgoJHtwYXJhbU5hbWV9KSIpOwor ICAgICAgICAgICAgICAgIHB1c2goQGltcGxDb250ZW50LCAiICAgIHY4OjpIYW5kbGU8djg6OlZh bHVlPiAke3BhcmFtTmFtZX1IYW5kbGUgPSB0b1Y4KCR7cGFyYW1OYW1lfSk7XG4iKTsKKyAgICAg ICAgICAgICAgICBwdXNoKEBpbXBsQ29udGVudCwgIiAgICBpZiAoJHtwYXJhbU5hbWV9SGFuZGxl LklzRW1wdHkoKSkge1xuIik7CisgICAgICAgICAgICAgICAgcHVzaChAaW1wbENvbnRlbnQsICIg ICAgICAgIENSQVNIKCk7XG4iKTsKKyAgICAgICAgICAgICAgICBwdXNoKEBpbXBsQ29udGVudCwg IiAgICAgICAgcmV0dXJuIHRydWU7XG4iKTsKKyAgICAgICAgICAgICAgICBwdXNoKEBpbXBsQ29u dGVudCwgIiAgICB9XG4iKTsKKyAgICAgICAgICAgICAgICBwdXNoKEBhcmd2cywgIiAgICAgICAg JHtwYXJhbU5hbWV9SGFuZGxlIik7CiAgICAgICAgICAgICB9Ci0gICAgICAgICAgICBwdXNoKEBp bXBsQ29udGVudCwgam9pbigiLFxuIiwgQGFyZ3ZzKSk7CiAKKyAgICAgICAgICAgIHB1c2goQGlt cGxDb250ZW50LCAiXG4gICAgdjg6OkhhbmRsZTx2ODo6VmFsdWU+IGFyZ3ZbXSA9IHtcbiIpOwor ICAgICAgICAgICAgcHVzaChAaW1wbENvbnRlbnQsIGpvaW4oIixcbiIsIEBhcmd2cykpOwogICAg ICAgICAgICAgcHVzaChAaW1wbENvbnRlbnQsICJcbiAgICB9O1xuXG4iKTsKICAgICAgICAgICAg IHB1c2goQGltcGxDb250ZW50LCAiICAgIGJvb2wgY2FsbGJhY2tSZXR1cm5WYWx1ZSA9IGZhbHNl O1xuIik7CiAgICAgICAgICAgICBwdXNoKEBpbXBsQ29udGVudCwgIiAgICByZXR1cm4gIWludm9r ZUNhbGxiYWNrKG1fY2FsbGJhY2ssICIgLiBzY2FsYXIoQHBhcmFtcykgLiAiLCBhcmd2LCBjYWxs YmFja1JldHVyblZhbHVlLCBjb250ZXh0KTtcbiIpOwpJbmRleDogV2ViQ29yZS9iaW5kaW5ncy9z Y3JpcHRzL3Rlc3QvVjgvVjhUZXN0Q2FsbGJhY2suY3BwCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUv YmluZGluZ3Mvc2NyaXB0cy90ZXN0L1Y4L1Y4VGVzdENhbGxiYWNrLmNwcAkocmV2aXNpb24gNjA3 MjYpCisrKyBXZWJDb3JlL2JpbmRpbmdzL3NjcmlwdHMvdGVzdC9WOC9WOFRlc3RDYWxsYmFjay5j cHAJKHdvcmtpbmcgY29weSkKQEAgLTI5LDYgKzI5LDggQEAKICNpbmNsdWRlICJWOEN1c3RvbVZv aWRDYWxsYmFjay5oIgogI2luY2x1ZGUgIlY4RE9NU3RyaW5nLmgiCiAKKyNpbmNsdWRlIDx3dGYv QXNzZXJ0aW9ucy5oPgorCiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKIFY4VGVzdENhbGxiYWNrOjpW OFRlc3RDYWxsYmFjayh2ODo6TG9jYWw8djg6Ok9iamVjdD4gY2FsbGJhY2spCkBAIC01NCw4ICs1 NiwxNCBAQCBib29sIFY4VGVzdENhbGxiYWNrOjpjYWxsYmFja1dpdGhDbGFzczFQCiAKICAgICB2 ODo6Q29udGV4dDo6U2NvcGUgc2NvcGUodjhDb250ZXh0KTsKIAorICAgIHY4OjpIYW5kbGU8djg6 OlZhbHVlPiBjbGFzczFQYXJhbUhhbmRsZSA9IHRvVjgoY2xhc3MxUGFyYW0pOworICAgIGlmIChj bGFzczFQYXJhbUhhbmRsZS5Jc0VtcHR5KCkpIHsKKyAgICAgICAgQ1JBU0goKTsKKyAgICAgICAg cmV0dXJuIHRydWU7CisgICAgfQorCiAgICAgdjg6OkhhbmRsZTx2ODo6VmFsdWU+IGFyZ3ZbXSA9 IHsKLSAgICAgICAgdG9WOChjbGFzczFQYXJhbSkKKyAgICAgICAgY2xhc3MxUGFyYW1IYW5kbGUK ICAgICB9OwogCiAgICAgYm9vbCBjYWxsYmFja1JldHVyblZhbHVlID0gZmFsc2U7CkBAIC03Miw5 ICs4MCwyMCBAQCBib29sIFY4VGVzdENhbGxiYWNrOjpjYWxsYmFja1dpdGhDbGFzczJQCiAKICAg ICB2ODo6Q29udGV4dDo6U2NvcGUgc2NvcGUodjhDb250ZXh0KTsKIAorICAgIHY4OjpIYW5kbGU8 djg6OlZhbHVlPiBjbGFzczJQYXJhbUhhbmRsZSA9IHRvVjgoY2xhc3MyUGFyYW0pOworICAgIGlm IChjbGFzczJQYXJhbUhhbmRsZS5Jc0VtcHR5KCkpIHsKKyAgICAgICAgQ1JBU0goKTsKKyAgICAg ICAgcmV0dXJuIHRydWU7CisgICAgfQorICAgIHY4OjpIYW5kbGU8djg6OlZhbHVlPiBzdHJBcmdI YW5kbGUgPSB0b1Y4KHN0ckFyZyk7CisgICAgaWYgKHN0ckFyZ0hhbmRsZS5Jc0VtcHR5KCkpIHsK KyAgICAgICAgQ1JBU0goKTsKKyAgICAgICAgcmV0dXJuIHRydWU7CisgICAgfQorCiAgICAgdjg6 OkhhbmRsZTx2ODo6VmFsdWU+IGFyZ3ZbXSA9IHsKLSAgICAgICAgdG9WOChjbGFzczJQYXJhbSks Ci0gICAgICAgIHRvVjgoc3RyQXJnKQorICAgICAgICBjbGFzczJQYXJhbUhhbmRsZSwKKyAgICAg ICAgc3RyQXJnSGFuZGxlCiAgICAgfTsKIAogICAgIGJvb2wgY2FsbGJhY2tSZXR1cm5WYWx1ZSA9 IGZhbHNlOwpJbmRleDogV2ViQ29yZS9iaW5kaW5ncy92OC9jdXN0b20vVjhDdXN0b21TUUxTdGF0 ZW1lbnRFcnJvckNhbGxiYWNrLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL2JpbmRpbmdzL3Y4 L2N1c3RvbS9WOEN1c3RvbVNRTFN0YXRlbWVudEVycm9yQ2FsbGJhY2suY3BwCShyZXZpc2lvbiA2 MDcyNikKKysrIFdlYkNvcmUvYmluZGluZ3MvdjgvY3VzdG9tL1Y4Q3VzdG9tU1FMU3RhdGVtZW50 RXJyb3JDYWxsYmFjay5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTM5LDYgKzM5LDcgQEAKICNpbmNs dWRlICJWOFByb3h5LmgiCiAjaW5jbHVkZSAiVjhTUUxFcnJvci5oIgogI2luY2x1ZGUgIlY4U1FM VHJhbnNhY3Rpb24uaCIKKyNpbmNsdWRlIDx3dGYvQXNzZXJ0aW9ucy5oPgogCiBuYW1lc3BhY2Ug V2ViQ29yZSB7CiAKQEAgLTUyLDkgKzUzLDE2IEBAIGJvb2wgVjhTUUxTdGF0ZW1lbnRFcnJvckNh bGxiYWNrOjpoYW5kbGUKIAogICAgIHY4OjpDb250ZXh0OjpTY29wZSBzY29wZSh2OENvbnRleHQp OwogCisgICAgdjg6OkhhbmRsZTx2ODo6VmFsdWU+IHRyYW5zYWN0aW9uSGFuZGxlID0gdG9WOCh0 cmFuc2FjdGlvbik7CisgICAgdjg6OkhhbmRsZTx2ODo6VmFsdWU+IGVycm9ySGFuZGxlID0gdG9W OChlcnJvcik7CisgICAgaWYgKHRyYW5zYWN0aW9uSGFuZGxlLklzRW1wdHkoKSB8fCBlcnJvckhh bmRsZS5pc0VtcHR5KCkpIHsKKyAgICAgICAgQ1JBU0goKTsKKyAgICAgICAgcmV0dXJuIHRydWU7 CisgICAgfQorCiAgICAgdjg6OkhhbmRsZTx2ODo6VmFsdWU+IGFyZ3ZbXSA9IHsKLSAgICAgICAg dG9WOCh0cmFuc2FjdGlvbiksCi0gICAgICAgIHRvVjgoZXJyb3IpCisgICAgICAgIHRyYW5zYWN0 aW9uSGFuZGxlLAorICAgICAgICBlcnJvckhhbmRsZQogICAgIH07CiAKICAgICAvLyBQcm90ZWN0 IHRoZSBjb250ZXh0IHVudGlsIHRoZSBjYWxsYmFjayByZXR1cm5zLgo= 57946 2010-06-04 19:16:13 -0700 2010-06-04 19:17:26 -0700 patch patch text/plain 5622 dumi SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA2MDcyNikKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMjMgQEAKKzIwMTAtMDUtMjggIER1bWl0cnUgRGFuaWxpdWMgIDxkdW1pQGNocm9t aXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICBEbyBub3QgcGFzcyBlbXB0eSBoYW5kbGVzIHRvIHY4LgorICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9Mzk4OTYKKworICAgICAgICBQYXNzaW5nIGFuIGVt cHR5IGhhbmRsZSB0byB2OCByZXN1bHRzIGluIGEgY3Jhc2ggd2l0aCBhIHN0YWNrCisgICAgICAg IHRyYWNlIHRoYXQgZG9lc24ndCBnaXZlIHVzIG11Y2ggaW5mb3JtYXRpb24gYWJvdXQgdGhlIGNh dXNlIG9mIHRoZQorICAgICAgICBjcmFzaC4gSW5zdGVhZCwgaWYgd2UgY2hlY2sgdGhlIGhhbmRs ZXMgd2UgcGFzcyB0byB2OCBhbmQgY3Jhc2gKKyAgICAgICAgd2hlbiB0aGV5IGFyZSBlbXB0eSwg d2UgZG8gbm90IG1ha2UgdGhpbmdzIHdvcnNlLCBhbmQgc2hvdWxkIGdldCBhCisgICAgICAgIG1v cmUgaW5mb3JtYXRpdmUgc3RhY2sgdHJhY2UuCisKKyAgICAgICAgKiBiaW5kaW5ncy9zY3JpcHRz L0NvZGVHZW5lcmF0b3JWOC5wbToKKyAgICAgICAgKiBiaW5kaW5ncy9zY3JpcHRzL3Rlc3QvVjgv VjhUZXN0Q2FsbGJhY2suY3BwOgorICAgICAgICAoV2ViQ29yZTo6VjhUZXN0Q2FsbGJhY2s6OmNh bGxiYWNrV2l0aENsYXNzMVBhcmFtKToKKyAgICAgICAgKFdlYkNvcmU6OlY4VGVzdENhbGxiYWNr OjpjYWxsYmFja1dpdGhDbGFzczJQYXJhbSk6CisgICAgICAgICogYmluZGluZ3MvdjgvY3VzdG9t L1Y4Q3VzdG9tU1FMU3RhdGVtZW50RXJyb3JDYWxsYmFjay5jcHA6CisgICAgICAgIChXZWJDb3Jl OjpWOFNRTFN0YXRlbWVudEVycm9yQ2FsbGJhY2s6OmhhbmRsZUV2ZW50KToKKwogMjAxMC0wNi0w NCAgQW5kcmVhcyBLbGluZyAgPGFuZHJlYXMua2xpbmdAbm9raWEuY29tPgogCiAgICAgICAgIFJl dmlld2VkIGJ5IFRvciBBcm5lIFZlc3Riw7guCkluZGV4OiBXZWJDb3JlL2JpbmRpbmdzL3Njcmlw dHMvQ29kZUdlbmVyYXRvclY4LnBtCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvYmluZGluZ3Mvc2Ny aXB0cy9Db2RlR2VuZXJhdG9yVjgucG0JKHJldmlzaW9uIDYwNzI2KQorKysgV2ViQ29yZS9iaW5k aW5ncy9zY3JpcHRzL0NvZGVHZW5lcmF0b3JWOC5wbQkod29ya2luZyBjb3B5KQpAQCAtMjIzNiw2 ICsyMjM2LDcgQEAgc3ViIEdlbmVyYXRlQ2FsbGJhY2tJbXBsZW1lbnRhdGlvbgogICAgICRpbXBs SW5jbHVkZXN7IlNjcmlwdEV4ZWN1dGlvbkNvbnRleHQuaCJ9ID0gMTsKICAgICAkaW1wbEluY2x1 ZGVzeyJWOEN1c3RvbVZvaWRDYWxsYmFjay5oIn0gPSAxOwogCisgICAgcHVzaChAaW1wbENvbnRl bnQsICIjaW5jbHVkZSA8d3RmL0Fzc2VydGlvbnMuaD5cblxuIik7CiAgICAgcHVzaChAaW1wbENv bnRlbnQsICJuYW1lc3BhY2UgV2ViQ29yZSB7XG5cbiIpOwogICAgIHB1c2goQGltcGxDb250ZW50 LCA8PEVORCk7CiAke2NsYXNzTmFtZX06OiR7Y2xhc3NOYW1lfSh2ODo6TG9jYWw8djg6Ok9iamVj dD4gY2FsbGJhY2spCkBAIC0yMjc3LDE1ICsyMjc4LDIwIEBAIEVORAogICAgICAgICAgICAgcHVz aChAaW1wbENvbnRlbnQsICIgICAgaWYgKHY4Q29udGV4dC5Jc0VtcHR5KCkpXG4iKTsKICAgICAg ICAgICAgIHB1c2goQGltcGxDb250ZW50LCAiICAgICAgICByZXR1cm4gdHJ1ZTtcblxuIik7CiAg ICAgICAgICAgICBwdXNoKEBpbXBsQ29udGVudCwgIiAgICB2ODo6Q29udGV4dDo6U2NvcGUgc2Nv cGUodjhDb250ZXh0KTtcblxuIik7Ci0gICAgICAgICAgICBwdXNoKEBpbXBsQ29udGVudCwgIiAg ICB2ODo6SGFuZGxlPHY4OjpWYWx1ZT4gYXJndltdID0ge1xuIik7CiAKICAgICAgICAgICAgIG15 IEBhcmd2cyA9ICgpOwogICAgICAgICAgICAgZm9yZWFjaCBteSAkcGFyYW0gKEBwYXJhbXMpIHsK ICAgICAgICAgICAgICAgICBteSAkcGFyYW1OYW1lID0gJHBhcmFtLT5uYW1lOwotICAgICAgICAg ICAgICAgIHB1c2goQGFyZ3ZzLCAiICAgICAgICB0b1Y4KCR7cGFyYW1OYW1lfSkiKTsKKyAgICAg ICAgICAgICAgICBwdXNoKEBpbXBsQ29udGVudCwgIiAgICB2ODo6SGFuZGxlPHY4OjpWYWx1ZT4g JHtwYXJhbU5hbWV9SGFuZGxlID0gdG9WOCgke3BhcmFtTmFtZX0pO1xuIik7CisgICAgICAgICAg ICAgICAgcHVzaChAaW1wbENvbnRlbnQsICIgICAgaWYgKCR7cGFyYW1OYW1lfUhhbmRsZS5Jc0Vt cHR5KCkpIHtcbiIpOworICAgICAgICAgICAgICAgIHB1c2goQGltcGxDb250ZW50LCAiICAgICAg ICBDUkFTSCgpO1xuIik7CisgICAgICAgICAgICAgICAgcHVzaChAaW1wbENvbnRlbnQsICIgICAg ICAgIHJldHVybiB0cnVlO1xuIik7CisgICAgICAgICAgICAgICAgcHVzaChAaW1wbENvbnRlbnQs ICIgICAgfVxuIik7CisgICAgICAgICAgICAgICAgcHVzaChAYXJndnMsICIgICAgICAgICR7cGFy YW1OYW1lfUhhbmRsZSIpOwogICAgICAgICAgICAgfQotICAgICAgICAgICAgcHVzaChAaW1wbENv bnRlbnQsIGpvaW4oIixcbiIsIEBhcmd2cykpOwogCisgICAgICAgICAgICBwdXNoKEBpbXBsQ29u dGVudCwgIlxuICAgIHY4OjpIYW5kbGU8djg6OlZhbHVlPiBhcmd2W10gPSB7XG4iKTsKKyAgICAg ICAgICAgIHB1c2goQGltcGxDb250ZW50LCBqb2luKCIsXG4iLCBAYXJndnMpKTsKICAgICAgICAg ICAgIHB1c2goQGltcGxDb250ZW50LCAiXG4gICAgfTtcblxuIik7CiAgICAgICAgICAgICBwdXNo KEBpbXBsQ29udGVudCwgIiAgICBib29sIGNhbGxiYWNrUmV0dXJuVmFsdWUgPSBmYWxzZTtcbiIp OwogICAgICAgICAgICAgcHVzaChAaW1wbENvbnRlbnQsICIgICAgcmV0dXJuICFpbnZva2VDYWxs YmFjayhtX2NhbGxiYWNrLCAiIC4gc2NhbGFyKEBwYXJhbXMpIC4gIiwgYXJndiwgY2FsbGJhY2tS ZXR1cm5WYWx1ZSwgY29udGV4dCk7XG4iKTsKSW5kZXg6IFdlYkNvcmUvYmluZGluZ3Mvc2NyaXB0 cy90ZXN0L1Y4L1Y4VGVzdENhbGxiYWNrLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL2JpbmRp bmdzL3NjcmlwdHMvdGVzdC9WOC9WOFRlc3RDYWxsYmFjay5jcHAJKHJldmlzaW9uIDYwNzI2KQor KysgV2ViQ29yZS9iaW5kaW5ncy9zY3JpcHRzL3Rlc3QvVjgvVjhUZXN0Q2FsbGJhY2suY3BwCSh3 b3JraW5nIGNvcHkpCkBAIC0yOSw2ICsyOSw4IEBACiAjaW5jbHVkZSAiVjhDdXN0b21Wb2lkQ2Fs bGJhY2suaCIKICNpbmNsdWRlICJWOERPTVN0cmluZy5oIgogCisjaW5jbHVkZSA8d3RmL0Fzc2Vy dGlvbnMuaD4KKwogbmFtZXNwYWNlIFdlYkNvcmUgewogCiBWOFRlc3RDYWxsYmFjazo6VjhUZXN0 Q2FsbGJhY2sodjg6OkxvY2FsPHY4OjpPYmplY3Q+IGNhbGxiYWNrKQpAQCAtNTQsOCArNTYsMTQg QEAgYm9vbCBWOFRlc3RDYWxsYmFjazo6Y2FsbGJhY2tXaXRoQ2xhc3MxUAogCiAgICAgdjg6OkNv bnRleHQ6OlNjb3BlIHNjb3BlKHY4Q29udGV4dCk7CiAKKyAgICB2ODo6SGFuZGxlPHY4OjpWYWx1 ZT4gY2xhc3MxUGFyYW1IYW5kbGUgPSB0b1Y4KGNsYXNzMVBhcmFtKTsKKyAgICBpZiAoY2xhc3Mx UGFyYW1IYW5kbGUuSXNFbXB0eSgpKSB7CisgICAgICAgIENSQVNIKCk7CisgICAgICAgIHJldHVy biB0cnVlOworICAgIH0KKwogICAgIHY4OjpIYW5kbGU8djg6OlZhbHVlPiBhcmd2W10gPSB7Ci0g ICAgICAgIHRvVjgoY2xhc3MxUGFyYW0pCisgICAgICAgIGNsYXNzMVBhcmFtSGFuZGxlCiAgICAg fTsKIAogICAgIGJvb2wgY2FsbGJhY2tSZXR1cm5WYWx1ZSA9IGZhbHNlOwpAQCAtNzIsOSArODAs MjAgQEAgYm9vbCBWOFRlc3RDYWxsYmFjazo6Y2FsbGJhY2tXaXRoQ2xhc3MyUAogCiAgICAgdjg6 OkNvbnRleHQ6OlNjb3BlIHNjb3BlKHY4Q29udGV4dCk7CiAKKyAgICB2ODo6SGFuZGxlPHY4OjpW YWx1ZT4gY2xhc3MyUGFyYW1IYW5kbGUgPSB0b1Y4KGNsYXNzMlBhcmFtKTsKKyAgICBpZiAoY2xh c3MyUGFyYW1IYW5kbGUuSXNFbXB0eSgpKSB7CisgICAgICAgIENSQVNIKCk7CisgICAgICAgIHJl dHVybiB0cnVlOworICAgIH0KKyAgICB2ODo6SGFuZGxlPHY4OjpWYWx1ZT4gc3RyQXJnSGFuZGxl ID0gdG9WOChzdHJBcmcpOworICAgIGlmIChzdHJBcmdIYW5kbGUuSXNFbXB0eSgpKSB7CisgICAg ICAgIENSQVNIKCk7CisgICAgICAgIHJldHVybiB0cnVlOworICAgIH0KKwogICAgIHY4OjpIYW5k bGU8djg6OlZhbHVlPiBhcmd2W10gPSB7Ci0gICAgICAgIHRvVjgoY2xhc3MyUGFyYW0pLAotICAg ICAgICB0b1Y4KHN0ckFyZykKKyAgICAgICAgY2xhc3MyUGFyYW1IYW5kbGUsCisgICAgICAgIHN0 ckFyZ0hhbmRsZQogICAgIH07CiAKICAgICBib29sIGNhbGxiYWNrUmV0dXJuVmFsdWUgPSBmYWxz ZTsKSW5kZXg6IFdlYkNvcmUvYmluZGluZ3MvdjgvY3VzdG9tL1Y4Q3VzdG9tU1FMU3RhdGVtZW50 RXJyb3JDYWxsYmFjay5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9iaW5kaW5ncy92OC9jdXN0 b20vVjhDdXN0b21TUUxTdGF0ZW1lbnRFcnJvckNhbGxiYWNrLmNwcAkocmV2aXNpb24gNjA3MjYp CisrKyBXZWJDb3JlL2JpbmRpbmdzL3Y4L2N1c3RvbS9WOEN1c3RvbVNRTFN0YXRlbWVudEVycm9y Q2FsbGJhY2suY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0zOSw2ICszOSw3IEBACiAjaW5jbHVkZSAi VjhQcm94eS5oIgogI2luY2x1ZGUgIlY4U1FMRXJyb3IuaCIKICNpbmNsdWRlICJWOFNRTFRyYW5z YWN0aW9uLmgiCisjaW5jbHVkZSA8d3RmL0Fzc2VydGlvbnMuaD4KIAogbmFtZXNwYWNlIFdlYkNv cmUgewogCkBAIC01Miw5ICs1MywxNiBAQCBib29sIFY4U1FMU3RhdGVtZW50RXJyb3JDYWxsYmFj azo6aGFuZGxlCiAKICAgICB2ODo6Q29udGV4dDo6U2NvcGUgc2NvcGUodjhDb250ZXh0KTsKIAor ICAgIHY4OjpIYW5kbGU8djg6OlZhbHVlPiB0cmFuc2FjdGlvbkhhbmRsZSA9IHRvVjgodHJhbnNh Y3Rpb24pOworICAgIHY4OjpIYW5kbGU8djg6OlZhbHVlPiBlcnJvckhhbmRsZSA9IHRvVjgoZXJy b3IpOworICAgIGlmICh0cmFuc2FjdGlvbkhhbmRsZS5Jc0VtcHR5KCkgfHwgZXJyb3JIYW5kbGUu aXNFbXB0eSgpKSB7CisgICAgICAgIENSQVNIKCk7CisgICAgICAgIHJldHVybiB0cnVlOworICAg IH0KKwogICAgIHY4OjpIYW5kbGU8djg6OlZhbHVlPiBhcmd2W10gPSB7Ci0gICAgICAgIHRvVjgo dHJhbnNhY3Rpb24pLAotICAgICAgICB0b1Y4KGVycm9yKQorICAgICAgICB0cmFuc2FjdGlvbkhh bmRsZSwKKyAgICAgICAgZXJyb3JIYW5kbGUKICAgICB9OwogCiAgICAgLy8gUHJvdGVjdCB0aGUg Y29udGV4dCB1bnRpbCB0aGUgY2FsbGJhY2sgcmV0dXJucy4K