46893 2010-09-30 06:17:41 -0700 The parenthetical assertion checking isn't working in some cases with YARR Interpreter 2010-10-15 00:59:40 -0700 1 1 1 Unclassified WebKit JavaScriptCore 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 46719 1 pvarga pvarga abecsi barraclough commit-queue msaboff webkit.review.bot zherczeg zoltan oldest_to_newest 287512 0 pvarga 2010-09-30 06:17:41 -0700 If a minimum matching size (minimumSize) of parenthetical assertion is equal to the following terms width in the pattern then the matching of the assertion fails. The calculation of the number of potentially matching characters (countToCheck) should be changed in case of parenthetical assertions. Eg.: "abad".match(/a(?=d)./); result: null expected: ad 287514 1 69330 pvarga 2010-09-30 06:22:27 -0700 Created attachment 69330 proposed patch 287574 2 webkit.review.bot 2010-09-30 09:06:06 -0700 Attachment 69330 did not build on win: Build output: http://queues.webkit.org/results/4193030 287597 3 69330 abecsi 2010-09-30 09:41:44 -0700 Comment on attachment 69330 proposed patch View in context: https://bugs.webkit.org/attachment.cgi?id=69330&action=review > JavaScriptCore/yarr/RegexInterpreter.cpp:1588 > + emitDisjunction(term.parentheses.disjunction, currentCountAlreadyChecked, -delegateEndInputOffset, true); emitDisjunction avaits an unsigned value in the third parameter, MSVC warns because of the unary minus operator, and warnings are treated as errors. 287630 4 69345 pvarga 2010-09-30 10:31:54 -0700 Created attachment 69345 proposed patch Windows build fixed. 289892 5 69345 barraclough 2010-10-05 14:32:14 -0700 Comment on attachment 69345 proposed patch View in context: https://bugs.webkit.org/attachment.cgi?id=69345&action=review I know it's only a small thing, but I'll r-, since I don't like the unnecessary *-1. Otherwise, looks great! > JavaScriptCore/yarr/RegexInterpreter.cpp:1599 > + int positiveInputOffset = -1 * (term.inputPosition - currentCountAlreadyChecked); I think this could be a little more clear as: + ASSERT(currentCountAlreadyChecked > term.inputPosition); + int positiveInputOffset = currentCountAlreadyChecked - term.inputPosition; 290163 6 69910 pvarga 2010-10-06 02:45:44 -0700 Created attachment 69910 proposed patch v3 294187 7 69910 barraclough 2010-10-14 10:38:53 -0700 Comment on attachment 69910 proposed patch v3 Looks great, thank you! 294193 8 69910 commit-queue 2010-10-14 10:46:57 -0700 Comment on attachment 69910 proposed patch v3 Rejecting patch 69910 from commit-queue. Failed to run "['./WebKitTools/Scripts/webkit-patch', '--status-host=queues.webkit.org', 'build', '--no-clean', '--no-update', '--build-style=both', '--quiet']" exit_code: 2 Building WebKit Failed to run "['WebKitTools/Scripts/build-webkit', '--debug']" exit_code: 1 Full output: http://queues.webkit.org/results/4470019 294607 9 69910 zoltan 2010-10-14 23:53:36 -0700 Comment on attachment 69910 proposed patch v3 Little bot, try it again! 294608 10 69910 commit-queue 2010-10-14 23:57:28 -0700 Comment on attachment 69910 proposed patch v3 Rejecting patch 69910 from commit-queue. Failed to run "['./WebKitTools/Scripts/webkit-patch', '--status-host=queues.webkit.org', 'build', '--no-clean', '--no-update', '--build-style=both', '--quiet']" exit_code: 2 Building WebKit Failed to run "['WebKitTools/Scripts/build-webkit', '--debug']" exit_code: 1 Full output: http://queues.webkit.org/results/4460029 294622 11 zoltan 2010-10-15 00:59:40 -0700 Committed revision 69842. 69330 2010-09-30 06:22:27 -0700 2010-09-30 10:31:54 -0700 proposed patch 0001-fix-parenthetical.patch text/plain 4023 pvarga RnJvbSA1MDA5ODY2ZWI1NmNkMjgyNDllYWE1ZDI0MDA0NDg5NWExZGQ4ODg1IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBQZXRlciBWYXJnYSA8cHZhcmdhQGluZi51LXN6ZWdlZC5odT4K RGF0ZTogVGh1LCAzMCBTZXAgMjAxMCAwNjoyMToyNiAtMDcwMApTdWJqZWN0OiBbUEFUQ0hdIGZp eCBwYXJlbnRoZXRpY2FsCgotLS0KIEphdmFTY3JpcHRDb3JlL0NoYW5nZUxvZyAgICAgICAgICAg ICAgICAgfCAgIDE3ICsrKysrKysrKysrKysrKysrCiBKYXZhU2NyaXB0Q29yZS95YXJyL1JlZ2V4 SW50ZXJwcmV0ZXIuY3BwIHwgICAxOSArKysrKysrKysrKysrLS0tLS0tCiAyIGZpbGVzIGNoYW5n ZWQsIDMwIGluc2VydGlvbnMoKyksIDYgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvSmF2YVNj cmlwdENvcmUvQ2hhbmdlTG9nIGIvSmF2YVNjcmlwdENvcmUvQ2hhbmdlTG9nCmluZGV4IGZkMjdl ZDQuLjgzODAxYWYgMTAwNjQ0Ci0tLSBhL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZworKysgYi9K YXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyMCBAQAorMjAxMC0wOS0zMCAgUGV0 ZXIgVmFyZ2EgIDxwdmFyZ2FAaW5mLnUtc3plZ2VkLmh1PgorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRoZSBwYXJlbnRoZXRpY2FsIGFzc2VydGlvbiBj aGVja2luZyBpc24ndCB3b3JraW5nIGluIHNvbWUgY2FzZXMgd2l0aCBZQVJSCisgICAgICAgIElu dGVycHJldGVyCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD00Njg5MworCisgICAgICAgIENhbGN1bGF0ZSB0aGUgY291bnRUb0NoZWNrIHZhbHVlIG9mIGEg VHlwZVBhcmVudGhldGljYWxBc3NlcnRpb24gYnkKKyAgICAgICAgc3VidHJhY3RpbmcgdGhlIG51 bWJlciBvZiBjaGFyYWN0ZXJzIHdoaWNoIGZvbGxvd3MKKyAgICAgICAgYSBUeXBlUGFyZW50aGV0 aWNhbEFzc2VydGlvbiB0ZXJtIHdpdGggdGhlIG51bWJlciBvZiBjaGFyYWN0ZXJzIHdoaWNoIHNo b3VsZAorICAgICAgICBiZSBtYXRjaGVkIGJ5IHRlcm1zIHdoaWNoIGFyZSBjb250YWluZWQKKyAg ICAgICAgaW4gdGhlIFR5cGVQYXJlbnRoZXRpY2FsQXNzZXJ0aW9uIHRlcm0gKG1pbmltdW1TaXpl KS4KKworICAgICAgICAqIHlhcnIvUmVnZXhJbnRlcnByZXRlci5jcHA6CisgICAgICAgIChKU0M6 OllhcnI6OkJ5dGVDb21waWxlcjo6ZW1pdERpc2p1bmN0aW9uKToKKwogMjAxMC0wOS0zMCAgR2Fi b3IgTG9raSAgPGxva2lAd2Via2l0Lm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBieSBDc2FiYSBP c3p0cm9nb27DoWMuCmRpZmYgLS1naXQgYS9KYXZhU2NyaXB0Q29yZS95YXJyL1JlZ2V4SW50ZXJw cmV0ZXIuY3BwIGIvSmF2YVNjcmlwdENvcmUveWFyci9SZWdleEludGVycHJldGVyLmNwcAppbmRl eCAxN2ZmZDhmLi5jNzM2YWM0IDEwMDY0NAotLS0gYS9KYXZhU2NyaXB0Q29yZS95YXJyL1JlZ2V4 SW50ZXJwcmV0ZXIuY3BwCisrKyBiL0phdmFTY3JpcHRDb3JlL3lhcnIvUmVnZXhJbnRlcnByZXRl ci5jcHAKQEAgLTE0OTcsNyArMTQ5Nyw3IEBAIHB1YmxpYzoKICAgICAgICAgbV9jdXJyZW50QWx0 ZXJuYXRpdmVJbmRleCA9IG5ld0FsdGVybmF0aXZlSW5kZXg7CiAgICAgfQogCi0gICAgdm9pZCBl bWl0RGlzanVuY3Rpb24oUGF0dGVybkRpc2p1bmN0aW9uKiBkaXNqdW5jdGlvbiwgdW5zaWduZWQg aW5wdXRDb3VudEFscmVhZHlDaGVja2VkID0gMCwgdW5zaWduZWQgcGFyZW50aGVzZXNJbnB1dENv dW50QWxyZWFkeUNoZWNrZWQgPSAwKQorICAgIHZvaWQgZW1pdERpc2p1bmN0aW9uKFBhdHRlcm5E aXNqdW5jdGlvbiogZGlzanVuY3Rpb24sIHVuc2lnbmVkIGlucHV0Q291bnRBbHJlYWR5Q2hlY2tl ZCA9IDAsIHVuc2lnbmVkIHBhcmVudGhlc2VzSW5wdXRDb3VudEFscmVhZHlDaGVja2VkID0gMCwg Ym9vbCBpc1BhcmVudGhldGljYWxBc3NlcnRpb24gPSBmYWxzZSkKICAgICB7CiAgICAgICAgIGZv ciAodW5zaWduZWQgYWx0ID0gMDsgYWx0IDwgZGlzanVuY3Rpb24tPm1fYWx0ZXJuYXRpdmVzLnNp emUoKTsgKythbHQpIHsKICAgICAgICAgICAgIHVuc2lnbmVkIGN1cnJlbnRDb3VudEFscmVhZHlD aGVja2VkID0gaW5wdXRDb3VudEFscmVhZHlDaGVja2VkOwpAQCAtMTUxMiwxMiArMTUxMiwxOCBA QCBwdWJsaWM6CiAgICAgICAgICAgICB9CiAKICAgICAgICAgICAgIHVuc2lnbmVkIG1pbmltdW1T aXplID0gYWx0ZXJuYXRpdmUtPm1fbWluaW11bVNpemU7CisgICAgICAgICAgICBpbnQgY291bnRU b0NoZWNrOwogCi0gICAgICAgICAgICBBU1NFUlQobWluaW11bVNpemUgPj0gcGFyZW50aGVzZXNJ bnB1dENvdW50QWxyZWFkeUNoZWNrZWQpOwotICAgICAgICAgICAgdW5zaWduZWQgY291bnRUb0No ZWNrID0gbWluaW11bVNpemUgLSBwYXJlbnRoZXNlc0lucHV0Q291bnRBbHJlYWR5Q2hlY2tlZDsK LSAgICAgICAgICAgIGlmIChjb3VudFRvQ2hlY2spCisgICAgICAgICAgICBpZiAoaXNQYXJlbnRo ZXRpY2FsQXNzZXJ0aW9uICYmIHBhcmVudGhlc2VzSW5wdXRDb3VudEFscmVhZHlDaGVja2VkID4g bWluaW11bVNpemUpCisgICAgICAgICAgICAgICAgY291bnRUb0NoZWNrID0gMDsKKyAgICAgICAg ICAgIGVsc2UKKyAgICAgICAgICAgICAgICBjb3VudFRvQ2hlY2sgPSBtaW5pbXVtU2l6ZSAtIHBh cmVudGhlc2VzSW5wdXRDb3VudEFscmVhZHlDaGVja2VkOworCisgICAgICAgICAgICBBU1NFUlQo Y291bnRUb0NoZWNrID49IDApOworICAgICAgICAgICAgaWYgKGNvdW50VG9DaGVjaykgewogICAg ICAgICAgICAgICAgIGNoZWNrSW5wdXQoY291bnRUb0NoZWNrKTsKLSAgICAgICAgICAgIGN1cnJl bnRDb3VudEFscmVhZHlDaGVja2VkICs9IGNvdW50VG9DaGVjazsKKyAgICAgICAgICAgICAgICBj dXJyZW50Q291bnRBbHJlYWR5Q2hlY2tlZCArPSBjb3VudFRvQ2hlY2s7CisgICAgICAgICAgICB9 CiAKICAgICAgICAgICAgIGZvciAodW5zaWduZWQgaSA9IDA7IGkgPCBhbHRlcm5hdGl2ZS0+bV90 ZXJtcy5zaXplKCk7ICsraSkgewogICAgICAgICAgICAgICAgIFBhdHRlcm5UZXJtJiB0ZXJtID0g YWx0ZXJuYXRpdmUtPm1fdGVybXNbaV07CkBAIC0xNTc2LDkgKzE1ODIsMTAgQEAgcHVibGljOgog CiAgICAgICAgICAgICAgICAgY2FzZSBQYXR0ZXJuVGVybTo6VHlwZVBhcmVudGhldGljYWxBc3Nl cnRpb246IHsKICAgICAgICAgICAgICAgICAgICAgdW5zaWduZWQgYWx0ZXJuYXRpdmVGcmFtZUxv Y2F0aW9uID0gdGVybS5mcmFtZUxvY2F0aW9uICsgUmVnZXhTdGFja1NwYWNlRm9yQmFja1RyYWNr SW5mb1BhcmVudGhldGljYWxBc3NlcnRpb247CisgICAgICAgICAgICAgICAgICAgIHVuc2lnbmVk IGRlbGVnYXRlRW5kSW5wdXRPZmZzZXQgPSB0ZXJtLmlucHV0UG9zaXRpb24gLSBjdXJyZW50Q291 bnRBbHJlYWR5Q2hlY2tlZDsKIAogICAgICAgICAgICAgICAgICAgICBhdG9tUGFyZW50aGV0aWNh bEFzc2VydGlvbkJlZ2luKHRlcm0ucGFyZW50aGVzZXMuc3VicGF0dGVybklkLCB0ZXJtLmludmVy dE9yQ2FwdHVyZSwgdGVybS5mcmFtZUxvY2F0aW9uLCBhbHRlcm5hdGl2ZUZyYW1lTG9jYXRpb24p OwotICAgICAgICAgICAgICAgICAgICBlbWl0RGlzanVuY3Rpb24odGVybS5wYXJlbnRoZXNlcy5k aXNqdW5jdGlvbiwgY3VycmVudENvdW50QWxyZWFkeUNoZWNrZWQsIDApOworICAgICAgICAgICAg ICAgICAgICBlbWl0RGlzanVuY3Rpb24odGVybS5wYXJlbnRoZXNlcy5kaXNqdW5jdGlvbiwgY3Vy cmVudENvdW50QWxyZWFkeUNoZWNrZWQsIC1kZWxlZ2F0ZUVuZElucHV0T2Zmc2V0LCB0cnVlKTsK ICAgICAgICAgICAgICAgICAgICAgYXRvbVBhcmVudGhlc2VzRW5kKHRydWUsIHRlcm0ucGFyZW50 aGVzZXMubGFzdFN1YnBhdHRlcm5JZCwgMCwgdGVybS5mcmFtZUxvY2F0aW9uLCB0ZXJtLnF1YW50 aXR5Q291bnQsIHRlcm0ucXVhbnRpdHlUeXBlKTsKICAgICAgICAgICAgICAgICAgICAgYnJlYWs7 CiAgICAgICAgICAgICAgICAgfQotLSAKMS43LjIuMgoK 69345 2010-09-30 10:31:54 -0700 2010-10-06 02:45:44 -0700 proposed patch 0001-fix-parenthetical-v2.patch text/plain 4168 pvarga RnJvbSA2OTU2NmEzNThlNzRkN2Y1ZTFjMDU4ZDE1MzI3MjMzYWM4ZGZiZDFhIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBQZXRlciBWYXJnYSA8cHZhcmdhQGluZi51LXN6ZWdlZC5odT4K RGF0ZTogVGh1LCAzMCBTZXAgMjAxMCAxMDoyNDozOSAtMDcwMApTdWJqZWN0OiBbUEFUQ0hdIGZp eCBwYXJlbnRoZXRpY2FsIHYyCgotLS0KIEphdmFTY3JpcHRDb3JlL0NoYW5nZUxvZyAgICAgICAg ICAgICAgICAgfCAgIDE3ICsrKysrKysrKysrKysrKysrCiBKYXZhU2NyaXB0Q29yZS95YXJyL1Jl Z2V4SW50ZXJwcmV0ZXIuY3BwIHwgICAyMSArKysrKysrKysrKysrKystLS0tLS0KIDIgZmlsZXMg Y2hhbmdlZCwgMzIgaW5zZXJ0aW9ucygrKSwgNiBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9K YXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cgYi9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKaW5kZXgg ZTc5Mzk1NS4uZDU4OTQ3YSAxMDA2NDQKLS0tIGEvSmF2YVNjcmlwdENvcmUvQ2hhbmdlTG9nCisr KyBiL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDIyIEBACiAyMDEwLTA5LTMw ICBQZXRlciBWYXJnYSAgPHB2YXJnYUBpbmYudS1zemVnZWQuaHU+CiAKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhlIHBhcmVudGhldGljYWwgYXNzZXJ0 aW9uIGNoZWNraW5nIGlzbid0IHdvcmtpbmcgaW4gc29tZSBjYXNlcyB3aXRoIFlBUlIKKyAgICAg ICAgSW50ZXJwcmV0ZXIKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTQ2ODkzCisKKyAgICAgICAgQ2FsY3VsYXRlIHRoZSBjb3VudFRvQ2hlY2sgdmFsdWUg b2YgYSBUeXBlUGFyZW50aGV0aWNhbEFzc2VydGlvbiBieQorICAgICAgICBzdWJ0cmFjdGluZyB0 aGUgbnVtYmVyIG9mIGNoYXJhY3RlcnMgd2hpY2ggZm9sbG93cworICAgICAgICBhIFR5cGVQYXJl bnRoZXRpY2FsQXNzZXJ0aW9uIHRlcm0gd2l0aCB0aGUgbnVtYmVyIG9mIGNoYXJhY3RlcnMgd2hp Y2ggc2hvdWxkCisgICAgICAgIGJlIG1hdGNoZWQgYnkgdGVybXMgd2hpY2ggYXJlIGNvbnRhaW5l ZAorICAgICAgICBpbiB0aGUgVHlwZVBhcmVudGhldGljYWxBc3NlcnRpb24gdGVybSAobWluaW11 bVNpemUpLgorCisgICAgICAgICogeWFyci9SZWdleEludGVycHJldGVyLmNwcDoKKyAgICAgICAg KEpTQzo6WWFycjo6Qnl0ZUNvbXBpbGVyOjplbWl0RGlzanVuY3Rpb24pOgorCisyMDEwLTA5LTMw ICBQZXRlciBWYXJnYSAgPHB2YXJnYUBpbmYudS1zemVnZWQuaHU+CisKICAgICAgICAgUmV2aWV3 ZWQgYnkgR2F2aW4gQmFycmFjbG91Z2guCiAKICAgICAgICAgVGhlIGNhc2UtaW5zZW5zaXRpdml0 eSBiYWNrcmVmZXJlbmNlIGNoZWNraW5nIGlzbid0IHdvcmtpbmcgd2l0aCBZQVJSCmRpZmYgLS1n aXQgYS9KYXZhU2NyaXB0Q29yZS95YXJyL1JlZ2V4SW50ZXJwcmV0ZXIuY3BwIGIvSmF2YVNjcmlw dENvcmUveWFyci9SZWdleEludGVycHJldGVyLmNwcAppbmRleCAxYjNmNjIwLi5mYzMzNDFhIDEw MDY0NAotLS0gYS9KYXZhU2NyaXB0Q29yZS95YXJyL1JlZ2V4SW50ZXJwcmV0ZXIuY3BwCisrKyBi L0phdmFTY3JpcHRDb3JlL3lhcnIvUmVnZXhJbnRlcnByZXRlci5jcHAKQEAgLTE1MTEsNyArMTUx MSw3IEBAIHB1YmxpYzoKICAgICAgICAgbV9jdXJyZW50QWx0ZXJuYXRpdmVJbmRleCA9IG5ld0Fs dGVybmF0aXZlSW5kZXg7CiAgICAgfQogCi0gICAgdm9pZCBlbWl0RGlzanVuY3Rpb24oUGF0dGVy bkRpc2p1bmN0aW9uKiBkaXNqdW5jdGlvbiwgdW5zaWduZWQgaW5wdXRDb3VudEFscmVhZHlDaGVj a2VkID0gMCwgdW5zaWduZWQgcGFyZW50aGVzZXNJbnB1dENvdW50QWxyZWFkeUNoZWNrZWQgPSAw KQorICAgIHZvaWQgZW1pdERpc2p1bmN0aW9uKFBhdHRlcm5EaXNqdW5jdGlvbiogZGlzanVuY3Rp b24sIHVuc2lnbmVkIGlucHV0Q291bnRBbHJlYWR5Q2hlY2tlZCA9IDAsIHVuc2lnbmVkIHBhcmVu dGhlc2VzSW5wdXRDb3VudEFscmVhZHlDaGVja2VkID0gMCwgYm9vbCBpc1BhcmVudGhldGljYWxB c3NlcnRpb24gPSBmYWxzZSkKICAgICB7CiAgICAgICAgIGZvciAodW5zaWduZWQgYWx0ID0gMDsg YWx0IDwgZGlzanVuY3Rpb24tPm1fYWx0ZXJuYXRpdmVzLnNpemUoKTsgKythbHQpIHsKICAgICAg ICAgICAgIHVuc2lnbmVkIGN1cnJlbnRDb3VudEFscmVhZHlDaGVja2VkID0gaW5wdXRDb3VudEFs cmVhZHlDaGVja2VkOwpAQCAtMTUyNiwxMiArMTUyNiwxOCBAQCBwdWJsaWM6CiAgICAgICAgICAg ICB9CiAKICAgICAgICAgICAgIHVuc2lnbmVkIG1pbmltdW1TaXplID0gYWx0ZXJuYXRpdmUtPm1f bWluaW11bVNpemU7CisgICAgICAgICAgICBpbnQgY291bnRUb0NoZWNrOwogCi0gICAgICAgICAg ICBBU1NFUlQobWluaW11bVNpemUgPj0gcGFyZW50aGVzZXNJbnB1dENvdW50QWxyZWFkeUNoZWNr ZWQpOwotICAgICAgICAgICAgdW5zaWduZWQgY291bnRUb0NoZWNrID0gbWluaW11bVNpemUgLSBw YXJlbnRoZXNlc0lucHV0Q291bnRBbHJlYWR5Q2hlY2tlZDsKLSAgICAgICAgICAgIGlmIChjb3Vu dFRvQ2hlY2spCisgICAgICAgICAgICBpZiAoaXNQYXJlbnRoZXRpY2FsQXNzZXJ0aW9uICYmIHBh cmVudGhlc2VzSW5wdXRDb3VudEFscmVhZHlDaGVja2VkID4gbWluaW11bVNpemUpCisgICAgICAg ICAgICAgICAgY291bnRUb0NoZWNrID0gMDsKKyAgICAgICAgICAgIGVsc2UKKyAgICAgICAgICAg ICAgICBjb3VudFRvQ2hlY2sgPSBtaW5pbXVtU2l6ZSAtIHBhcmVudGhlc2VzSW5wdXRDb3VudEFs cmVhZHlDaGVja2VkOworCisgICAgICAgICAgICBBU1NFUlQoY291bnRUb0NoZWNrID49IDApOwor ICAgICAgICAgICAgaWYgKGNvdW50VG9DaGVjaykgewogICAgICAgICAgICAgICAgIGNoZWNrSW5w dXQoY291bnRUb0NoZWNrKTsKLSAgICAgICAgICAgIGN1cnJlbnRDb3VudEFscmVhZHlDaGVja2Vk ICs9IGNvdW50VG9DaGVjazsKKyAgICAgICAgICAgICAgICBjdXJyZW50Q291bnRBbHJlYWR5Q2hl Y2tlZCArPSBjb3VudFRvQ2hlY2s7CisgICAgICAgICAgICB9CiAKICAgICAgICAgICAgIGZvciAo dW5zaWduZWQgaSA9IDA7IGkgPCBhbHRlcm5hdGl2ZS0+bV90ZXJtcy5zaXplKCk7ICsraSkgewog ICAgICAgICAgICAgICAgIFBhdHRlcm5UZXJtJiB0ZXJtID0gYWx0ZXJuYXRpdmUtPm1fdGVybXNb aV07CkBAIC0xNTkwLDkgKzE1OTYsMTIgQEAgcHVibGljOgogCiAgICAgICAgICAgICAgICAgY2Fz ZSBQYXR0ZXJuVGVybTo6VHlwZVBhcmVudGhldGljYWxBc3NlcnRpb246IHsKICAgICAgICAgICAg ICAgICAgICAgdW5zaWduZWQgYWx0ZXJuYXRpdmVGcmFtZUxvY2F0aW9uID0gdGVybS5mcmFtZUxv Y2F0aW9uICsgUmVnZXhTdGFja1NwYWNlRm9yQmFja1RyYWNrSW5mb1BhcmVudGhldGljYWxBc3Nl cnRpb247CisgICAgICAgICAgICAgICAgICAgIGludCBwb3NpdGl2ZUlucHV0T2Zmc2V0ID0gLTEg KiAodGVybS5pbnB1dFBvc2l0aW9uIC0gY3VycmVudENvdW50QWxyZWFkeUNoZWNrZWQpOworCisg ICAgICAgICAgICAgICAgICAgIEFTU0VSVChwb3NpdGl2ZUlucHV0T2Zmc2V0ID49IDApOwogCiAg ICAgICAgICAgICAgICAgICAgIGF0b21QYXJlbnRoZXRpY2FsQXNzZXJ0aW9uQmVnaW4odGVybS5w YXJlbnRoZXNlcy5zdWJwYXR0ZXJuSWQsIHRlcm0uaW52ZXJ0T3JDYXB0dXJlLCB0ZXJtLmZyYW1l TG9jYXRpb24sIGFsdGVybmF0aXZlRnJhbWVMb2NhdGlvbik7Ci0gICAgICAgICAgICAgICAgICAg IGVtaXREaXNqdW5jdGlvbih0ZXJtLnBhcmVudGhlc2VzLmRpc2p1bmN0aW9uLCBjdXJyZW50Q291 bnRBbHJlYWR5Q2hlY2tlZCwgMCk7CisgICAgICAgICAgICAgICAgICAgIGVtaXREaXNqdW5jdGlv bih0ZXJtLnBhcmVudGhlc2VzLmRpc2p1bmN0aW9uLCBjdXJyZW50Q291bnRBbHJlYWR5Q2hlY2tl ZCwgcG9zaXRpdmVJbnB1dE9mZnNldCwgdHJ1ZSk7CiAgICAgICAgICAgICAgICAgICAgIGF0b21Q YXJlbnRoZXNlc0VuZCh0cnVlLCB0ZXJtLnBhcmVudGhlc2VzLmxhc3RTdWJwYXR0ZXJuSWQsIDAs IHRlcm0uZnJhbWVMb2NhdGlvbiwgdGVybS5xdWFudGl0eUNvdW50LCB0ZXJtLnF1YW50aXR5VHlw ZSk7CiAgICAgICAgICAgICAgICAgICAgIGJyZWFrOwogICAgICAgICAgICAgICAgIH0KLS0gCjEu Ny4yLjIKCg== 69910 2010-10-06 02:45:44 -0700 2010-10-14 23:57:28 -0700 proposed patch v3 0001-fix-parenthetical-v3.patch text/plain 4101 pvarga RnJvbSAyNGFiODJlZWEzMDJjYTA0MzNhMWRiMmQ0MDRlMWZhMzdjZmZjMDg0IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBQZXRlciBWYXJnYSA8cHZhcmdhQGluZi51LXN6ZWdlZC5odT4K RGF0ZTogV2VkLCA2IE9jdCAyMDEwIDAyOjQ1OjI3IC0wNzAwClN1YmplY3Q6IFtQQVRDSF0gZml4 IHBhcmVudGhldGljYWwgdjMKCi0tLQogSmF2YVNjcmlwdENvcmUvQ2hhbmdlTG9nICAgICAgICAg ICAgICAgICB8ICAgMTcgKysrKysrKysrKysrKysrKysKIEphdmFTY3JpcHRDb3JlL3lhcnIvUmVn ZXhJbnRlcnByZXRlci5jcHAgfCAgIDIxICsrKysrKysrKysrKysrKy0tLS0tLQogMiBmaWxlcyBj aGFuZ2VkLCAzMiBpbnNlcnRpb25zKCspLCA2IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL0ph dmFTY3JpcHRDb3JlL0NoYW5nZUxvZyBiL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCA2 ODhjN2NlLi4yZjJiMTdhIDEwMDY0NAotLS0gYS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKKysr IGIvSmF2YVNjcmlwdENvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjAgQEAKKzIwMTAtMTAtMDYg IFBldGVyIFZhcmdhICA8cHZhcmdhQGluZi51LXN6ZWdlZC5odT4KKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGUgcGFyZW50aGV0aWNhbCBhc3NlcnRp b24gY2hlY2tpbmcgaXNuJ3Qgd29ya2luZyBpbiBzb21lIGNhc2VzIHdpdGggWUFSUgorICAgICAg ICBJbnRlcnByZXRlcgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9NDY4OTMKKworICAgICAgICBDYWxjdWxhdGUgdGhlIGNvdW50VG9DaGVjayB2YWx1ZSBv ZiBhIFR5cGVQYXJlbnRoZXRpY2FsQXNzZXJ0aW9uIGJ5CisgICAgICAgIHN1YnRyYWN0aW5nIHRo ZSBudW1iZXIgb2YgY2hhcmFjdGVycyB3aGljaCBmb2xsb3dzCisgICAgICAgIGEgVHlwZVBhcmVu dGhldGljYWxBc3NlcnRpb24gdGVybSB3aXRoIHRoZSBudW1iZXIgb2YgY2hhcmFjdGVycyB3aGlj aCBzaG91bGQKKyAgICAgICAgYmUgbWF0Y2hlZCBieSB0ZXJtcyB3aGljaCBhcmUgY29udGFpbmVk CisgICAgICAgIGluIHRoZSBUeXBlUGFyZW50aGV0aWNhbEFzc2VydGlvbiB0ZXJtIChtaW5pbXVt U2l6ZSkuCisKKyAgICAgICAgKiB5YXJyL1JlZ2V4SW50ZXJwcmV0ZXIuY3BwOgorICAgICAgICAo SlNDOjpZYXJyOjpCeXRlQ29tcGlsZXI6OmVtaXREaXNqdW5jdGlvbik6CisKIDIwMTAtMTAtMDUg IEt3YW5nIFl1bCBTZW8gIDxza3l1bEBjb21wYW55MTAwLm5ldD4KIAogICAgICAgICBSZXZpZXdl ZCBieSBHYXZpbiBCYXJyYWNsb3VnaC4KZGlmZiAtLWdpdCBhL0phdmFTY3JpcHRDb3JlL3lhcnIv UmVnZXhJbnRlcnByZXRlci5jcHAgYi9KYXZhU2NyaXB0Q29yZS95YXJyL1JlZ2V4SW50ZXJwcmV0 ZXIuY3BwCmluZGV4IDFiM2Y2MjAuLjk3NzI3MDIgMTAwNjQ0Ci0tLSBhL0phdmFTY3JpcHRDb3Jl L3lhcnIvUmVnZXhJbnRlcnByZXRlci5jcHAKKysrIGIvSmF2YVNjcmlwdENvcmUveWFyci9SZWdl eEludGVycHJldGVyLmNwcApAQCAtMTUxMSw3ICsxNTExLDcgQEAgcHVibGljOgogICAgICAgICBt X2N1cnJlbnRBbHRlcm5hdGl2ZUluZGV4ID0gbmV3QWx0ZXJuYXRpdmVJbmRleDsKICAgICB9CiAK LSAgICB2b2lkIGVtaXREaXNqdW5jdGlvbihQYXR0ZXJuRGlzanVuY3Rpb24qIGRpc2p1bmN0aW9u LCB1bnNpZ25lZCBpbnB1dENvdW50QWxyZWFkeUNoZWNrZWQgPSAwLCB1bnNpZ25lZCBwYXJlbnRo ZXNlc0lucHV0Q291bnRBbHJlYWR5Q2hlY2tlZCA9IDApCisgICAgdm9pZCBlbWl0RGlzanVuY3Rp b24oUGF0dGVybkRpc2p1bmN0aW9uKiBkaXNqdW5jdGlvbiwgdW5zaWduZWQgaW5wdXRDb3VudEFs cmVhZHlDaGVja2VkID0gMCwgdW5zaWduZWQgcGFyZW50aGVzZXNJbnB1dENvdW50QWxyZWFkeUNo ZWNrZWQgPSAwLCBib29sIGlzUGFyZW50aGV0aWNhbEFzc2VydGlvbiA9IGZhbHNlKQogICAgIHsK ICAgICAgICAgZm9yICh1bnNpZ25lZCBhbHQgPSAwOyBhbHQgPCBkaXNqdW5jdGlvbi0+bV9hbHRl cm5hdGl2ZXMuc2l6ZSgpOyArK2FsdCkgewogICAgICAgICAgICAgdW5zaWduZWQgY3VycmVudENv dW50QWxyZWFkeUNoZWNrZWQgPSBpbnB1dENvdW50QWxyZWFkeUNoZWNrZWQ7CkBAIC0xNTI2LDEy ICsxNTI2LDE4IEBAIHB1YmxpYzoKICAgICAgICAgICAgIH0KIAogICAgICAgICAgICAgdW5zaWdu ZWQgbWluaW11bVNpemUgPSBhbHRlcm5hdGl2ZS0+bV9taW5pbXVtU2l6ZTsKKyAgICAgICAgICAg IGludCBjb3VudFRvQ2hlY2s7CiAKLSAgICAgICAgICAgIEFTU0VSVChtaW5pbXVtU2l6ZSA+PSBw YXJlbnRoZXNlc0lucHV0Q291bnRBbHJlYWR5Q2hlY2tlZCk7Ci0gICAgICAgICAgICB1bnNpZ25l ZCBjb3VudFRvQ2hlY2sgPSBtaW5pbXVtU2l6ZSAtIHBhcmVudGhlc2VzSW5wdXRDb3VudEFscmVh ZHlDaGVja2VkOwotICAgICAgICAgICAgaWYgKGNvdW50VG9DaGVjaykKKyAgICAgICAgICAgIGlm IChpc1BhcmVudGhldGljYWxBc3NlcnRpb24gJiYgcGFyZW50aGVzZXNJbnB1dENvdW50QWxyZWFk eUNoZWNrZWQgPiBtaW5pbXVtU2l6ZSkKKyAgICAgICAgICAgICAgICBjb3VudFRvQ2hlY2sgPSAw OworICAgICAgICAgICAgZWxzZQorICAgICAgICAgICAgICAgIGNvdW50VG9DaGVjayA9IG1pbmlt dW1TaXplIC0gcGFyZW50aGVzZXNJbnB1dENvdW50QWxyZWFkeUNoZWNrZWQ7CisKKyAgICAgICAg ICAgIEFTU0VSVChjb3VudFRvQ2hlY2sgPj0gMCk7CisgICAgICAgICAgICBpZiAoY291bnRUb0No ZWNrKSB7CiAgICAgICAgICAgICAgICAgY2hlY2tJbnB1dChjb3VudFRvQ2hlY2spOwotICAgICAg ICAgICAgY3VycmVudENvdW50QWxyZWFkeUNoZWNrZWQgKz0gY291bnRUb0NoZWNrOworICAgICAg ICAgICAgICAgIGN1cnJlbnRDb3VudEFscmVhZHlDaGVja2VkICs9IGNvdW50VG9DaGVjazsKKyAg ICAgICAgICAgIH0KIAogICAgICAgICAgICAgZm9yICh1bnNpZ25lZCBpID0gMDsgaSA8IGFsdGVy bmF0aXZlLT5tX3Rlcm1zLnNpemUoKTsgKytpKSB7CiAgICAgICAgICAgICAgICAgUGF0dGVyblRl cm0mIHRlcm0gPSBhbHRlcm5hdGl2ZS0+bV90ZXJtc1tpXTsKQEAgLTE1OTEsOCArMTU5NywxMSBA QCBwdWJsaWM6CiAgICAgICAgICAgICAgICAgY2FzZSBQYXR0ZXJuVGVybTo6VHlwZVBhcmVudGhl dGljYWxBc3NlcnRpb246IHsKICAgICAgICAgICAgICAgICAgICAgdW5zaWduZWQgYWx0ZXJuYXRp dmVGcmFtZUxvY2F0aW9uID0gdGVybS5mcmFtZUxvY2F0aW9uICsgUmVnZXhTdGFja1NwYWNlRm9y QmFja1RyYWNrSW5mb1BhcmVudGhldGljYWxBc3NlcnRpb247CiAKKyAgICAgICAgICAgICAgICAg ICAgQVNTRVJUKGN1cnJlbnRDb3VudEFscmVhZHlDaGVja2VkID49IHRlcm0uaW5wdXRQb3NpdGlv bik7CisgICAgICAgICAgICAgICAgICAgIGludCBwb3NpdGl2ZUlucHV0T2Zmc2V0ID0gY3VycmVu dENvdW50QWxyZWFkeUNoZWNrZWQgLSB0ZXJtLmlucHV0UG9zaXRpb247CisKICAgICAgICAgICAg ICAgICAgICAgYXRvbVBhcmVudGhldGljYWxBc3NlcnRpb25CZWdpbih0ZXJtLnBhcmVudGhlc2Vz LnN1YnBhdHRlcm5JZCwgdGVybS5pbnZlcnRPckNhcHR1cmUsIHRlcm0uZnJhbWVMb2NhdGlvbiwg YWx0ZXJuYXRpdmVGcmFtZUxvY2F0aW9uKTsKLSAgICAgICAgICAgICAgICAgICAgZW1pdERpc2p1 bmN0aW9uKHRlcm0ucGFyZW50aGVzZXMuZGlzanVuY3Rpb24sIGN1cnJlbnRDb3VudEFscmVhZHlD aGVja2VkLCAwKTsKKyAgICAgICAgICAgICAgICAgICAgZW1pdERpc2p1bmN0aW9uKHRlcm0ucGFy ZW50aGVzZXMuZGlzanVuY3Rpb24sIGN1cnJlbnRDb3VudEFscmVhZHlDaGVja2VkLCBwb3NpdGl2 ZUlucHV0T2Zmc2V0LCB0cnVlKTsKICAgICAgICAgICAgICAgICAgICAgYXRvbVBhcmVudGhlc2Vz RW5kKHRydWUsIHRlcm0ucGFyZW50aGVzZXMubGFzdFN1YnBhdHRlcm5JZCwgMCwgdGVybS5mcmFt ZUxvY2F0aW9uLCB0ZXJtLnF1YW50aXR5Q291bnQsIHRlcm0ucXVhbnRpdHlUeXBlKTsKICAgICAg ICAgICAgICAgICAgICAgYnJlYWs7CiAgICAgICAgICAgICAgICAgfQotLSAKMS43LjIuMgoK