64981 2011-07-21 15:04:17 -0700 export JSContextGetBacktrace as SPI in JSContextRefPrivate.h 2011-12-21 15:19:34 -0800 1 1 1 Unclassified WebKit JavaScriptCore 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Enhancement --- 0 panage webkit-unassigned barraclough eric ggaren oliver webkit.review.bot oldest_to_newest 440658 0 panage 2011-07-21 15:04:17 -0700 UIAutomation for iOS would like to support a Javascript backtrace in our error logs. Currently, the C API does not provide the tools to do this. However, the private API does expose the necessary functionality to get a backtrace (via Interpreter::retrieveLastCaller). We recognize this information may result in failure in the cases of programs run by 'veal', stack frames beneath host function call frames, and in programs run from other programs. Thus, we propose exporting our JSContextGetBacktrace in JSContextRefPrivate.h. This will provide us with the tools we need while not advertising an API that isn't really ready for full use. 440659 1 panage 2011-07-21 15:04:43 -0700 The patch will be added to this bug report shortly. 440665 2 101648 panage 2011-07-21 15:15:28 -0700 Created attachment 101648 path to export JSContextGetBacktrace functionality as private SPI 440667 3 panage 2011-07-21 15:15:45 -0700 Patch attached. 441009 4 ap 2011-07-22 10:53:09 -0700 This patch is not marked for review. Did you want it to be reviewed? Please see <http://www.webkit.org/coding/contributing.html> for information about contributing code to WebKit. 441017 5 101648 oliver 2011-07-22 10:57:13 -0700 Comment on attachment 101648 path to export JSContextGetBacktrace functionality as private SPI We're working on a better mechanism for getting a stacktrace. Once that's in place any API of this kind will be able to use that. 441032 6 panage 2011-07-22 11:11:00 -0700 Yes, I apologize as, we do want the patch reviewed. We recognize that there is work underway to get a stack trace into the API. Of course, once that's in place, we would be able to utilize it for our purposes. However, at this point, it is our understanding that this work is in progress and may not be available for some time. As we very much need a solution now, we were hoping to get this in place as, at least, a temporary fix until better methods are made available. 441137 7 101648 oliver 2011-07-22 13:47:44 -0700 Comment on attachment 101648 path to export JSContextGetBacktrace functionality as private SPI We'll migrate to the better implementation in future 441140 8 101648 webkit.review.bot 2011-07-22 13:50:29 -0700 Comment on attachment 101648 path to export JSContextGetBacktrace functionality as private SPI Rejecting attachment 101648 from commit-queue. Failed to run "['./Tools/Scripts/webkit-patch', '--status-host=queues.webkit.org', '--bot-id=ec2-cq-02', '--port..." exit_code: 2 Last 500 characters of output: Parsed 4 diffs from patch file(s). patching file Source/JavaScriptCore/ChangeLog-PEP Hunk #1 FAILED at 1. 1 out of 1 hunk FAILED -- saving rejects to file Source/JavaScriptCore/ChangeLog-PEP.rej patching file Source/JavaScriptCore/JavaScriptCore.exp patching file Source/JavaScriptCore/API/JSContextRef.cpp patching file Source/JavaScriptCore/API/JSContextRefPrivate.h Failed to run "[u'/mnt/git/webkit-commit-queue/Tools/Scripts/svn-apply', u'--reviewer', u'Oliver Hunt', u'--force']" exit_code: 1 Full output: http://queues.webkit.org/results/9232141 441141 9 101648 ggaren 2011-07-22 13:52:39 -0700 Comment on attachment 101648 path to export JSContextGetBacktrace functionality as private SPI r- because this patch doesn't apply cleanly. > +++ Source/JavaScriptCore/ChangeLog-PEP (working copy) To apply cleanly, you need to patch JavaScriptCore/ChangeLog. (There is no ChangeLog-PEP.) > failure in the cases of programs run by 'veal' veal! ;) 441144 10 ggaren 2011-07-22 13:56:50 -0700 One more comment: > JSContextGetBacktrace Since this function allocates a string the the caller must release, it should be called "JSContextCreateBacktrace", not "JSContextGetBacktrace". (Same naming conventions as CF.) 441201 11 101773 panage 2011-07-22 15:09:12 -0700 Created attachment 101773 same backtrace patch with changes suggested by Geoffrey Garen integrated 441204 12 101773 webkit.review.bot 2011-07-22 15:09:53 -0700 Comment on attachment 101773 same backtrace patch with changes suggested by Geoffrey Garen integrated Rejecting attachment 101773 from review queue. panage@apple.com does not have reviewer permissions according to http://trac.webkit.org/browser/trunk/Tools/Scripts/webkitpy/common/config/committers.py. - If you do not have reviewer rights please read http://webkit.org/coding/contributing.html for instructions on how to use bugzilla flags. - If you have reviewer rights please correct the error in Tools/Scripts/webkitpy/common/config/committers.py by adding yourself to the file (no review needed). The commit-queue restarts itself every 2 hours. After restart the commit-queue will correctly respect your reviewer rights. 441216 13 101773 webkit.review.bot 2011-07-22 15:26:02 -0700 Comment on attachment 101773 same backtrace patch with changes suggested by Geoffrey Garen integrated Rejecting attachment 101773 from commit-queue. Failed to run "['./Tools/Scripts/webkit-patch', '--status-host=queues.webkit.org', '--bot-id=ec2-cq-02', '--port..." exit_code: 2 Last 500 characters of output: 47ac38bc1954a95bbb76e9cf2258dfa2fd0f625d r91611 = 788227ec3d4f823dac8b3804ad12ab188a0f557e Done rebuilding .git/svn/refs/remotes/origin/master/.rev_map.268f45cc-cd09-0410-ab3c-d52691b4dbfc First, rewinding head to replay your work on top of it... Fast-forwarded master to refs/remotes/origin/master. Updating chromium port dependencies using gclient... ________ running '/usr/bin/python gyp_webkit' in '/mnt/git/webkit-commit-queue/Source/WebKit/chromium' Updating webkit projects from gyp files... Full output: http://queues.webkit.org/results/9230224 441224 14 101780 panage 2011-07-22 15:35:03 -0700 Created attachment 101780 same backtrace patch with tabs removed from ChangeLog Some tabs seem to have snuck into the change log. Trying again. 441267 15 101780 gyuyoung.kim 2011-07-22 16:44:27 -0700 Comment on attachment 101780 same backtrace patch with tabs removed from ChangeLog Attachment 101780 did not pass efl-ews (efl): Output: http://queues.webkit.org/results/9233218 441274 16 101780 oliver 2011-07-22 16:46:52 -0700 Comment on attachment 101780 same backtrace patch with tabs removed from ChangeLog View in context: https://bugs.webkit.org/attachment.cgi?id=101780&action=review > Source/JavaScriptCore/API/JSContextRef.cpp:211 > + char levelStr[6]; > + sprintf(levelStr, "#%d ", count); should be snprintf if anything i guess, but... > Source/JavaScriptCore/API/JSContextRef.cpp:226 > + builder.append(levelStr); Can you not just use UString::number() here instead? 441282 17 panage 2011-07-22 16:58:33 -0700 I most certainly can use UString::number() -- submitting the change. 441284 18 101796 panage 2011-07-22 17:00:48 -0700 Created attachment 101796 Same patch, getting rid of sprintf for cleaner UString::number() use instead 441294 19 101796 webkit.review.bot 2011-07-22 17:19:20 -0700 Comment on attachment 101796 Same patch, getting rid of sprintf for cleaner UString::number() use instead Clearing flags on attachment: 101796 Committed r91627: <http://trac.webkit.org/changeset/91627> 525701 20 eric 2011-12-21 15:19:34 -0800 Looks landed. If that's incorrect, please open a new bug per additional patch you'd like to land. 101648 2011-07-21 15:15:28 -0700 2011-07-22 13:52:39 -0700 path to export JSContextGetBacktrace functionality as private SPI backtrace.patch text/plain 5103 panage SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2ctUEVQCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2ctUEVQCShyZXZpc2lvbiAxMDUzNzI3KQor KysgU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZy1QRVAJKHdvcmtpbmcgY29weSkKQEAg LTEsMyArMSwyMyBAQAorMjAxMS0wNy0yMSAgU29tbWVyIFBhbmFnZSAgPHBhbmFnZUBhcHBsZS5j b20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKwkJZXhwb3J0IEpT Q29udGV4dEdldEJhY2t0cmFjZSBhcyBTUEkgaW4gSlNDb250ZXh0UmVmUHJpdmF0ZS5oCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD02NDk4MQorCisJCVVJ QXV0b21hdGlvbiBmb3IgaU9TIHdvdWxkIGxpa2UgdG8gc3VwcG9ydCBhIEphdmFzY3JpcHQgYmFj a3RyYWNlIGluIG91ciBlcnJvciBsb2dzLgorCQlDdXJyZW50bHksIHRoZSBDIEFQSSBkb2VzIG5v dCBwcm92aWRlIHRoZSB0b29scyB0byBkbyB0aGlzLiBIb3dldmVyLCB0aGUgcHJpdmF0ZSBBUEkK KwkJZG9lcyBleHBvc2UgdGhlIG5lY2Vzc2FyeSBmdW5jdGlvbmFsaXR5IHRvIGdldCBhIGJhY2t0 cmFjZQorCQkodmlhIEludGVycHJldGVyOjpyZXRyaWV2ZUxhc3RDYWxsZXIpLiBXZSByZWNvZ25p emUgdGhpcyBpbmZvcm1hdGlvbiBtYXkgcmVzdWx0IGluCisJCWZhaWx1cmUgaW4gdGhlIGNhc2Vz IG9mIHByb2dyYW1zIHJ1biBieSAndmVhbCcsIHN0YWNrIGZyYW1lcyBiZW5lYXRoIGhvc3QgZnVu Y3Rpb24KKwkJY2FsbCBmcmFtZXMsIGFuZCBpbiBwcm9ncmFtcyBydW4gZnJvbSBvdGhlciBwcm9n cmFtcy4gVGh1cywgd2UgcHJvcG9zZSBleHBvcnRpbmcgb3VyCisJCUpTQ29udGV4dEdldEJhY2t0 cmFjZSBpbiBKU0NvbnRleHRSZWZQcml2YXRlLmguIFRoaXMgd2lsbCBwcm92aWRlIHVzIHdpdGgg dGhlIHRvb2xzCisJCXdlIG5lZWQgd2hpbGUgbm90IGFkdmVydGlzaW5nIGFuIEFQSSB0aGF0IGlz bid0IHJlYWxseSByZWFkeSBmb3IgZnVsbCB1c2UuCisKKyAgICAgICAgKiBBUEkvSlNDb250ZXh0 UmVmLmNwcDoKKyAgICAgICAgKiBBUEkvSlNDb250ZXh0UmVmUHJpdmF0ZS5oOgorICAgICAgICAq IEphdmFTY3JpcHRDb3JlLmV4cDoKKwogMjAxMS0wNy0xOSAgT2xpdmVyIEh1bnQgIDxvbGl2ZXJA YXBwbGUuY29tPgogCiAgICAgICAgIDxyZGFyOi8vcHJvYmxlbS85ODA0MDk0PiBBUEkgR0MgdGhy b3dzIGF3YXkgY29tcGlsZWQgY29kZTsgY2FuIGNhdXNlIHBhdGhvbG9naWNhbCBjb21waWxhdGlv biBjaHVybgpJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL0phdmFTY3JpcHRDb3JlLmV4cAo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvSmF2YVNjcmlwdENvcmUuZXhwCShy ZXZpc2lvbiAxMDQ4MDQ5KQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL0phdmFTY3JpcHRDb3Jl LmV4cAkod29ya2luZyBjb3B5KQpAQCAtOCw2ICs4LDcgQEAgX0pTQ29udGV4dEdldEdyb3VwCiBf SlNDb250ZXh0R3JvdXBDcmVhdGUKIF9KU0NvbnRleHRHcm91cFJlbGVhc2UKIF9KU0NvbnRleHRH cm91cFJldGFpbgorX0pTQ29udGV4dEdldEJhY2t0cmFjZQogX0pTRW5kUHJvZmlsaW5nCiBfSlNF dmFsdWF0ZVNjcmlwdAogX0pTR2FyYmFnZUNvbGxlY3QKSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0 Q29yZS9BUEkvSlNDb250ZXh0UmVmLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlw dENvcmUvQVBJL0pTQ29udGV4dFJlZi5jcHAJKHJldmlzaW9uIDEwNDgwNDkpCisrKyBTb3VyY2Uv SmF2YVNjcmlwdENvcmUvQVBJL0pTQ29udGV4dFJlZi5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTI5 LDEyICsyOSwxNiBAQAogCiAjaW5jbHVkZSAiQVBJQ2FzdC5oIgogI2luY2x1ZGUgIkluaXRpYWxp emVUaHJlYWRpbmcuaCIKKyNpbmNsdWRlIDxpbnRlcnByZXRlci9DYWxsRnJhbWUuaD4KKyNpbmNs dWRlIDxpbnRlcnByZXRlci9JbnRlcnByZXRlci5oPgogI2luY2x1ZGUgIkpTQ2FsbGJhY2tPYmpl Y3QuaCIKICNpbmNsdWRlICJKU0NsYXNzUmVmLmgiCiAjaW5jbHVkZSAiSlNHbG9iYWxPYmplY3Qu aCIKICNpbmNsdWRlICJKU09iamVjdC5oIgorI2luY2x1ZGUgIlVTdHJpbmdCdWlsZGVyLmgiCiAj aW5jbHVkZSA8d3RmL3RleHQvU3RyaW5nSGFzaC5oPgogCisKICNpZiBPUyhEQVJXSU4pCiAjaW5j bHVkZSA8bWFjaC1vL2R5bGQuaD4KIApAQCAtMTc3LDMgKzE4MSw1OSBAQCBKU0dsb2JhbENvbnRl eHRSZWYgSlNDb250ZXh0R2V0R2xvYmFsQ29uCiAKICAgICByZXR1cm4gdG9HbG9iYWxSZWYoZXhl Yy0+bGV4aWNhbEdsb2JhbE9iamVjdCgpLT5nbG9iYWxFeGVjKCkpOwogfQorICAgIAorSlNTdHJp bmdSZWYgSlNDb250ZXh0R2V0QmFja3RyYWNlKEpTQ29udGV4dFJlZiBjdHgsIHVuc2lnbmVkIG1h eFN0YWNrU2l6ZSkKK3sKKyAgICBFeGVjU3RhdGUqIGV4ZWMgPSB0b0pTKGN0eCk7CisgICAgSlNM b2NrIGxvY2soZXhlYyk7CisKKyAgICB1bnNpZ25lZCBjb3VudCA9IDA7CisgICAgVVN0cmluZ0J1 aWxkZXIgYnVpbGRlcjsKKyAgICBDYWxsRnJhbWUqIGNhbGxGcmFtZSA9IGV4ZWM7CisgICAgVVN0 cmluZyBmdW5jdGlvbk5hbWU7CisgICAgaWYgKGV4ZWMtPmNhbGxlZSgpKSB7CisgICAgICAgIGlm IChhc09iamVjdChleGVjLT5jYWxsZWUoKSktPmluaGVyaXRzKCZJbnRlcm5hbEZ1bmN0aW9uOjpz X2luZm8pKSB7CisgICAgICAgICAgICBmdW5jdGlvbk5hbWUgPSBhc0ludGVybmFsRnVuY3Rpb24o ZXhlYy0+Y2FsbGVlKCkpLT5uYW1lKGV4ZWMpOworICAgICAgICAgICAgYnVpbGRlci5hcHBlbmQo IiMwICIpOworICAgICAgICAgICAgYnVpbGRlci5hcHBlbmQoZnVuY3Rpb25OYW1lKTsKKyAgICAg ICAgICAgIGJ1aWxkZXIuYXBwZW5kKCIoKSAiKTsKKyAgICAgICAgICAgIGNvdW50Kys7CisgICAg ICAgIH0KKyAgICB9CisgICAgd2hpbGUgKHRydWUpIHsKKyAgICAgICAgQVNTRVJUKGNhbGxGcmFt ZSk7CisgICAgICAgIGludCBzaWduZWRMaW5lTnVtYmVyOworICAgICAgICBpbnRwdHJfdCBzb3Vy Y2VJRDsKKyAgICAgICAgVVN0cmluZyB1cmxTdHJpbmc7CisgICAgICAgIEpTVmFsdWUgZnVuY3Rp b247CisgICAgICAgIAorICAgICAgICBjaGFyIGxldmVsU3RyWzZdOworICAgICAgICBzcHJpbnRm KGxldmVsU3RyLCAiIyVkICIsIGNvdW50KTsKKworICAgICAgICBleGVjLT5pbnRlcnByZXRlcigp LT5yZXRyaWV2ZUxhc3RDYWxsZXIoY2FsbEZyYW1lLCBzaWduZWRMaW5lTnVtYmVyLCBzb3VyY2VJ RCwgdXJsU3RyaW5nLCBmdW5jdGlvbik7CisKKyAgICAgICAgaWYgKGZ1bmN0aW9uKQorICAgICAg ICAgICAgZnVuY3Rpb25OYW1lID0gYXNGdW5jdGlvbihmdW5jdGlvbiktPm5hbWUoZXhlYyk7Cisg ICAgICAgIGVsc2UgeworICAgICAgICAgICAgLy8gQ2FsbGVyIGlzIHVua25vd24sIGJ1dCBpZiBm cmFtZSBpcyBlbXB0eSB3ZSBzaG91bGQgc3RpbGwgYWRkIHRoZSBmcmFtZSwgYmVjYXVzZQorICAg ICAgICAgICAgLy8gc29tZXRoaW5nIGNhbGxlZCB1cywgYW5kIGdhdmUgdXMgYXJndW1lbnRzLgor ICAgICAgICAgICAgaWYgKGNvdW50KQorICAgICAgICAgICAgICAgIGJyZWFrOworICAgICAgICB9 CisgICAgICAgIHVuc2lnbmVkIGxpbmVOdW1iZXIgPSBzaWduZWRMaW5lTnVtYmVyID49IDAgPyBz aWduZWRMaW5lTnVtYmVyIDogMDsKKyAgICAgICAgaWYgKCFidWlsZGVyLmlzRW1wdHkoKSkKKyAg ICAgICAgICAgIGJ1aWxkZXIuYXBwZW5kKCJcbiIpOworICAgICAgICBidWlsZGVyLmFwcGVuZChs ZXZlbFN0cik7CisgICAgICAgIGJ1aWxkZXIuYXBwZW5kKGZ1bmN0aW9uTmFtZSk7CisgICAgICAg IGJ1aWxkZXIuYXBwZW5kKCIoKSBhdCAiKTsKKyAgICAgICAgYnVpbGRlci5hcHBlbmQodXJsU3Ry aW5nKTsKKyAgICAgICAgYnVpbGRlci5hcHBlbmQoIjoiKTsKKyAgICAgICAgYnVpbGRlci5hcHBl bmQoVVN0cmluZzo6bnVtYmVyKGxpbmVOdW1iZXIpKTsKKyAgICAgICAgaWYgKCFmdW5jdGlvbiB8 fCArK2NvdW50ID09IG1heFN0YWNrU2l6ZSkKKyAgICAgICAgICAgIGJyZWFrOworICAgICAgICBj YWxsRnJhbWUgPSBjYWxsRnJhbWUtPmNhbGxlckZyYW1lKCk7CisgICAgfQorICAgIHJldHVybiBP cGFxdWVKU1N0cmluZzo6Y3JlYXRlKGJ1aWxkZXIudG9VU3RyaW5nKCkpLmxlYWtSZWYoKTsKK30K KworCkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvQVBJL0pTQ29udGV4dFJlZlByaXZhdGUu aAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvQVBJL0pTQ29udGV4dFJlZlBy aXZhdGUuaAkocmV2aXNpb24gMTA0ODA0OSkKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9BUEkv SlNDb250ZXh0UmVmUHJpdmF0ZS5oCSh3b3JraW5nIGNvcHkpCkBAIC00Niw2ICs0NiwxNSBAQCBl eHRlcm4gIkMiIHsKICovCiBKU19FWFBPUlQgSlNHbG9iYWxDb250ZXh0UmVmIEpTQ29udGV4dEdl dEdsb2JhbENvbnRleHQoSlNDb250ZXh0UmVmIGN0eCk7CiAKKyAgICAKKy8qIQorQGZ1bmN0aW9u CitAYWJzdHJhY3QgR2V0cyBhIEJhY2t0cmFjZSBmb3IgdGhlIGV4aXN0aW5nIGNvbnRleHQKK0Bw YXJhbSBjdHggVGhlIEpTQ29udGV4dCB3aG9zZSBiYWNrdHJhY2UgeW91IHdhbnQgdG8gZ2V0CitA cmVzdWx0IEEgc3RyaW5nIGNvbnRhaW5pbmcgdGhlIGJhY2t0cmFjZQorKi8KK0pTX0VYUE9SVCBK U1N0cmluZ1JlZiBKU0NvbnRleHRHZXRCYWNrdHJhY2UoSlNDb250ZXh0UmVmIGN0eCwgdW5zaWdu ZWQgbWF4U3RhY2tTaXplKSBBVkFJTEFCTEVfSU5fV0VCS0lUX1ZFUlNJT05fNF8wOworICAgIAog I2lmZGVmIF9fY3BsdXNwbHVzCiB9CiAjZW5kaWYK 101773 2011-07-22 15:09:12 -0700 2011-07-22 15:26:02 -0700 same backtrace patch with changes suggested by Geoffrey Garen integrated backtrace.patch text/plain 5024 panage SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMTA0ODA0OSkKKysrIFNvdXJj ZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwyNCBA QAorMjAxMS0wNy0yMSAgU29tbWVyIFBhbmFnZSAgPHBhbmFnZUBhcHBsZS5jb20+CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKwkJZXhwb3J0IEpTQ29udGV4dEdldEJh Y2t0cmFjZSBhcyBTUEkgaW4gSlNDb250ZXh0UmVmUHJpdmF0ZS5oCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD02NDk4MQorCisJCVVJQXV0b21hdGlvbiBm b3IgaU9TIHdvdWxkIGxpa2UgdG8gc3VwcG9ydCBhIEphdmFzY3JpcHQgYmFja3RyYWNlIGluIG91 ciBlcnJvciBsb2dzLgorCQlDdXJyZW50bHksIHRoZSBDIEFQSSBkb2VzIG5vdCBwcm92aWRlIHRo ZSB0b29scyB0byBkbyB0aGlzLiBIb3dldmVyLCB0aGUgcHJpdmF0ZSBBUEkKKwkJZG9lcyBleHBv c2UgdGhlIG5lY2Vzc2FyeSBmdW5jdGlvbmFsaXR5IHRvIGdldCBhIGJhY2t0cmFjZQorCQkodmlh IEludGVycHJldGVyOjpyZXRyaWV2ZUxhc3RDYWxsZXIpLiBXZSByZWNvZ25pemUgdGhpcyBpbmZv cm1hdGlvbiBtYXkgcmVzdWx0IGluCisJCWZhaWx1cmUgaW4gdGhlIGNhc2VzIG9mIHByb2dyYW1z IHJ1biBieSAnZXZhbCcsIHN0YWNrIGZyYW1lcyBiZW5lYXRoIGhvc3QgZnVuY3Rpb24KKwkJY2Fs bCBmcmFtZXMsIGFuZCBpbiBwcm9ncmFtcyBydW4gZnJvbSBvdGhlciBwcm9ncmFtcy4gVGh1cywg d2UgcHJvcG9zZSBleHBvcnRpbmcgb3VyCisJCUpTQ29udGV4dEdldEJhY2t0cmFjZSBpbiBKU0Nv bnRleHRSZWZQcml2YXRlLmguIFRoaXMgd2lsbCBwcm92aWRlIHVzIHdpdGggdGhlIHRvb2xzCisJ CXdlIG5lZWQgd2hpbGUgbm90IGFkdmVydGlzaW5nIGFuIEFQSSB0aGF0IGlzbid0IHJlYWxseSBy ZWFkeSBmb3IgZnVsbCB1c2UuCisKKyAgICAgICAgKiBBUEkvSlNDb250ZXh0UmVmLmNwcDoKKyAg ICAgICAgKiBBUEkvSlNDb250ZXh0UmVmUHJpdmF0ZS5oOgorICAgICAgICAqIEphdmFTY3JpcHRD b3JlLmV4cDoKKworCiAyMDExLTA1LTE3ICBTYW0gV2VpbmlnICA8c2FtQHdlYmtpdC5vcmc+CiAK ICAgICAgICAgUmV2aWV3ZWQgYnkgT2xpdmVyIEh1bnQuCkluZGV4OiBTb3VyY2UvSmF2YVNjcmlw dENvcmUvSmF2YVNjcmlwdENvcmUuZXhwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0 Q29yZS9KYXZhU2NyaXB0Q29yZS5leHAJKHJldmlzaW9uIDEwNDgwNDkpCisrKyBTb3VyY2UvSmF2 YVNjcmlwdENvcmUvSmF2YVNjcmlwdENvcmUuZXhwCSh3b3JraW5nIGNvcHkpCkBAIC04LDYgKzgs NyBAQCBfSlNDb250ZXh0R2V0R3JvdXAKIF9KU0NvbnRleHRHcm91cENyZWF0ZQogX0pTQ29udGV4 dEdyb3VwUmVsZWFzZQogX0pTQ29udGV4dEdyb3VwUmV0YWluCitfSlNDb250ZXh0Q3JlYXRlQmFj a3RyYWNlCiBfSlNFbmRQcm9maWxpbmcKIF9KU0V2YWx1YXRlU2NyaXB0CiBfSlNHYXJiYWdlQ29s bGVjdApJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL0FQSS9KU0NvbnRleHRSZWYuY3BwCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9BUEkvSlNDb250ZXh0UmVmLmNwcAko cmV2aXNpb24gMTA0ODA0OSkKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9BUEkvSlNDb250ZXh0 UmVmLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMjksMTIgKzI5LDE2IEBACiAKICNpbmNsdWRlICJB UElDYXN0LmgiCiAjaW5jbHVkZSAiSW5pdGlhbGl6ZVRocmVhZGluZy5oIgorI2luY2x1ZGUgPGlu dGVycHJldGVyL0NhbGxGcmFtZS5oPgorI2luY2x1ZGUgPGludGVycHJldGVyL0ludGVycHJldGVy Lmg+CiAjaW5jbHVkZSAiSlNDYWxsYmFja09iamVjdC5oIgogI2luY2x1ZGUgIkpTQ2xhc3NSZWYu aCIKICNpbmNsdWRlICJKU0dsb2JhbE9iamVjdC5oIgogI2luY2x1ZGUgIkpTT2JqZWN0LmgiCisj aW5jbHVkZSAiVVN0cmluZ0J1aWxkZXIuaCIKICNpbmNsdWRlIDx3dGYvdGV4dC9TdHJpbmdIYXNo Lmg+CiAKKwogI2lmIE9TKERBUldJTikKICNpbmNsdWRlIDxtYWNoLW8vZHlsZC5oPgogCkBAIC0x NzcsMyArMTgxLDU5IEBAIEpTR2xvYmFsQ29udGV4dFJlZiBKU0NvbnRleHRHZXRHbG9iYWxDb24K IAogICAgIHJldHVybiB0b0dsb2JhbFJlZihleGVjLT5sZXhpY2FsR2xvYmFsT2JqZWN0KCktPmds b2JhbEV4ZWMoKSk7CiB9CisgICAgCitKU1N0cmluZ1JlZiBKU0NvbnRleHRDcmVhdGVCYWNrdHJh Y2UoSlNDb250ZXh0UmVmIGN0eCwgdW5zaWduZWQgbWF4U3RhY2tTaXplKQoreworICAgIEV4ZWNT dGF0ZSogZXhlYyA9IHRvSlMoY3R4KTsKKyAgICBKU0xvY2sgbG9jayhleGVjKTsKKworICAgIHVu c2lnbmVkIGNvdW50ID0gMDsKKyAgICBVU3RyaW5nQnVpbGRlciBidWlsZGVyOworICAgIENhbGxG cmFtZSogY2FsbEZyYW1lID0gZXhlYzsKKyAgICBVU3RyaW5nIGZ1bmN0aW9uTmFtZTsKKyAgICBp ZiAoZXhlYy0+Y2FsbGVlKCkpIHsKKyAgICAgICAgaWYgKGFzT2JqZWN0KGV4ZWMtPmNhbGxlZSgp KS0+aW5oZXJpdHMoJkludGVybmFsRnVuY3Rpb246OnNfaW5mbykpIHsKKyAgICAgICAgICAgIGZ1 bmN0aW9uTmFtZSA9IGFzSW50ZXJuYWxGdW5jdGlvbihleGVjLT5jYWxsZWUoKSktPm5hbWUoZXhl Yyk7CisgICAgICAgICAgICBidWlsZGVyLmFwcGVuZCgiIzAgIik7CisgICAgICAgICAgICBidWls ZGVyLmFwcGVuZChmdW5jdGlvbk5hbWUpOworICAgICAgICAgICAgYnVpbGRlci5hcHBlbmQoIigp ICIpOworICAgICAgICAgICAgY291bnQrKzsKKyAgICAgICAgfQorICAgIH0KKyAgICB3aGlsZSAo dHJ1ZSkgeworICAgICAgICBBU1NFUlQoY2FsbEZyYW1lKTsKKyAgICAgICAgaW50IHNpZ25lZExp bmVOdW1iZXI7CisgICAgICAgIGludHB0cl90IHNvdXJjZUlEOworICAgICAgICBVU3RyaW5nIHVy bFN0cmluZzsKKyAgICAgICAgSlNWYWx1ZSBmdW5jdGlvbjsKKyAgICAgICAgCisgICAgICAgIGNo YXIgbGV2ZWxTdHJbNl07CisgICAgICAgIHNwcmludGYobGV2ZWxTdHIsICIjJWQgIiwgY291bnQp OworCisgICAgICAgIGV4ZWMtPmludGVycHJldGVyKCktPnJldHJpZXZlTGFzdENhbGxlcihjYWxs RnJhbWUsIHNpZ25lZExpbmVOdW1iZXIsIHNvdXJjZUlELCB1cmxTdHJpbmcsIGZ1bmN0aW9uKTsK KworICAgICAgICBpZiAoZnVuY3Rpb24pCisgICAgICAgICAgICBmdW5jdGlvbk5hbWUgPSBhc0Z1 bmN0aW9uKGZ1bmN0aW9uKS0+bmFtZShleGVjKTsKKyAgICAgICAgZWxzZSB7CisgICAgICAgICAg ICAvLyBDYWxsZXIgaXMgdW5rbm93biwgYnV0IGlmIGZyYW1lIGlzIGVtcHR5IHdlIHNob3VsZCBz dGlsbCBhZGQgdGhlIGZyYW1lLCBiZWNhdXNlCisgICAgICAgICAgICAvLyBzb21ldGhpbmcgY2Fs bGVkIHVzLCBhbmQgZ2F2ZSB1cyBhcmd1bWVudHMuCisgICAgICAgICAgICBpZiAoY291bnQpCisg ICAgICAgICAgICAgICAgYnJlYWs7CisgICAgICAgIH0KKyAgICAgICAgdW5zaWduZWQgbGluZU51 bWJlciA9IHNpZ25lZExpbmVOdW1iZXIgPj0gMCA/IHNpZ25lZExpbmVOdW1iZXIgOiAwOworICAg ICAgICBpZiAoIWJ1aWxkZXIuaXNFbXB0eSgpKQorICAgICAgICAgICAgYnVpbGRlci5hcHBlbmQo IlxuIik7CisgICAgICAgIGJ1aWxkZXIuYXBwZW5kKGxldmVsU3RyKTsKKyAgICAgICAgYnVpbGRl ci5hcHBlbmQoZnVuY3Rpb25OYW1lKTsKKyAgICAgICAgYnVpbGRlci5hcHBlbmQoIigpIGF0ICIp OworICAgICAgICBidWlsZGVyLmFwcGVuZCh1cmxTdHJpbmcpOworICAgICAgICBidWlsZGVyLmFw cGVuZCgiOiIpOworICAgICAgICBidWlsZGVyLmFwcGVuZChVU3RyaW5nOjpudW1iZXIobGluZU51 bWJlcikpOworICAgICAgICBpZiAoIWZ1bmN0aW9uIHx8ICsrY291bnQgPT0gbWF4U3RhY2tTaXpl KQorICAgICAgICAgICAgYnJlYWs7CisgICAgICAgIGNhbGxGcmFtZSA9IGNhbGxGcmFtZS0+Y2Fs bGVyRnJhbWUoKTsKKyAgICB9CisgICAgcmV0dXJuIE9wYXF1ZUpTU3RyaW5nOjpjcmVhdGUoYnVp bGRlci50b1VTdHJpbmcoKSkubGVha1JlZigpOworfQorCisKSW5kZXg6IFNvdXJjZS9KYXZhU2Ny aXB0Q29yZS9BUEkvSlNDb250ZXh0UmVmUHJpdmF0ZS5oCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9K YXZhU2NyaXB0Q29yZS9BUEkvSlNDb250ZXh0UmVmUHJpdmF0ZS5oCShyZXZpc2lvbiAxMDQ4MDQ5 KQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL0FQSS9KU0NvbnRleHRSZWZQcml2YXRlLmgJKHdv cmtpbmcgY29weSkKQEAgLTQ2LDYgKzQ2LDE1IEBAIGV4dGVybiAiQyIgewogKi8KIEpTX0VYUE9S VCBKU0dsb2JhbENvbnRleHRSZWYgSlNDb250ZXh0R2V0R2xvYmFsQ29udGV4dChKU0NvbnRleHRS ZWYgY3R4KTsKIAorICAgIAorLyohCitAZnVuY3Rpb24KK0BhYnN0cmFjdCBHZXRzIGEgQmFja3Ry YWNlIGZvciB0aGUgZXhpc3RpbmcgY29udGV4dAorQHBhcmFtIGN0eCBUaGUgSlNDb250ZXh0IHdo b3NlIGJhY2t0cmFjZSB5b3Ugd2FudCB0byBnZXQKK0ByZXN1bHQgQSBzdHJpbmcgY29udGFpbmlu ZyB0aGUgYmFja3RyYWNlCisqLworSlNfRVhQT1JUIEpTU3RyaW5nUmVmIEpTQ29udGV4dENyZWF0 ZUJhY2t0cmFjZShKU0NvbnRleHRSZWYgY3R4LCB1bnNpZ25lZCBtYXhTdGFja1NpemUpIEFWQUlM QUJMRV9JTl9XRUJLSVRfVkVSU0lPTl80XzA7CisgICAgCiAjaWZkZWYgX19jcGx1c3BsdXMKIH0K ICNlbmRpZgo= 101780 2011-07-22 15:35:03 -0700 2011-07-22 16:46:52 -0700 same backtrace patch with tabs removed from ChangeLog backtrace.patch text/plain 5078 panage SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMTA0ODA0OSkKKysrIFNvdXJj ZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwyNCBA QAorMjAxMS0wNy0yMSAgU29tbWVyIFBhbmFnZSAgPHBhbmFnZUBhcHBsZS5jb20+CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgZXhwb3J0IEpTQ29udGV4 dEdldEJhY2t0cmFjZSBhcyBTUEkgaW4gSlNDb250ZXh0UmVmUHJpdmF0ZS5oCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD02NDk4MQorCisgICAgICAgIFVJ QXV0b21hdGlvbiBmb3IgaU9TIHdvdWxkIGxpa2UgdG8gc3VwcG9ydCBhIEphdmFzY3JpcHQgYmFj a3RyYWNlIGluIG91ciBlcnJvciBsb2dzLgorICAgICAgICBDdXJyZW50bHksIHRoZSBDIEFQSSBk b2VzIG5vdCBwcm92aWRlIHRoZSB0b29scyB0byBkbyB0aGlzLiBIb3dldmVyLCB0aGUgcHJpdmF0 ZSBBUEkKKyAgICAgICAgZG9lcyBleHBvc2UgdGhlIG5lY2Vzc2FyeSBmdW5jdGlvbmFsaXR5IHRv IGdldCBhIGJhY2t0cmFjZQorICAgICAgICAodmlhIEludGVycHJldGVyOjpyZXRyaWV2ZUxhc3RD YWxsZXIpLiBXZSByZWNvZ25pemUgdGhpcyBpbmZvcm1hdGlvbiBtYXkgcmVzdWx0IGluCisgICAg ICAgIGZhaWx1cmUgaW4gdGhlIGNhc2VzIG9mIHByb2dyYW1zIHJ1biBieSAnZXZhbCcsIHN0YWNr IGZyYW1lcyBiZW5lYXRoIGhvc3QgZnVuY3Rpb24KKyAgICAgICAgY2FsbCBmcmFtZXMsIGFuZCBp biBwcm9ncmFtcyBydW4gZnJvbSBvdGhlciBwcm9ncmFtcy4gVGh1cywgd2UgcHJvcG9zZSBleHBv cnRpbmcgb3VyCisgICAgICAgIEpTQ29udGV4dEdldEJhY2t0cmFjZSBpbiBKU0NvbnRleHRSZWZQ cml2YXRlLmguIFRoaXMgd2lsbCBwcm92aWRlIHVzIHdpdGggdGhlIHRvb2xzCisgICAgICAgIHdl IG5lZWQgd2hpbGUgbm90IGFkdmVydGlzaW5nIGFuIEFQSSB0aGF0IGlzbid0IHJlYWxseSByZWFk eSBmb3IgZnVsbCB1c2UuCisKKyAgICAgICAgKiBBUEkvSlNDb250ZXh0UmVmLmNwcDoKKyAgICAg ICAgKiBBUEkvSlNDb250ZXh0UmVmUHJpdmF0ZS5oOgorICAgICAgICAqIEphdmFTY3JpcHRDb3Jl LmV4cDoKKworCiAyMDExLTA1LTE3ICBTYW0gV2VpbmlnICA8c2FtQHdlYmtpdC5vcmc+CiAKICAg ICAgICAgUmV2aWV3ZWQgYnkgT2xpdmVyIEh1bnQuCkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENv cmUvSmF2YVNjcmlwdENvcmUuZXhwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29y ZS9KYXZhU2NyaXB0Q29yZS5leHAJKHJldmlzaW9uIDEwNDgwNDkpCisrKyBTb3VyY2UvSmF2YVNj cmlwdENvcmUvSmF2YVNjcmlwdENvcmUuZXhwCSh3b3JraW5nIGNvcHkpCkBAIC04LDYgKzgsNyBA QCBfSlNDb250ZXh0R2V0R3JvdXAKIF9KU0NvbnRleHRHcm91cENyZWF0ZQogX0pTQ29udGV4dEdy b3VwUmVsZWFzZQogX0pTQ29udGV4dEdyb3VwUmV0YWluCitfSlNDb250ZXh0Q3JlYXRlQmFja3Ry YWNlCiBfSlNFbmRQcm9maWxpbmcKIF9KU0V2YWx1YXRlU2NyaXB0CiBfSlNHYXJiYWdlQ29sbGVj dApJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL0FQSS9KU0NvbnRleHRSZWYuY3BwCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9BUEkvSlNDb250ZXh0UmVmLmNwcAkocmV2 aXNpb24gMTA0ODA0OSkKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9BUEkvSlNDb250ZXh0UmVm LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMjksMTIgKzI5LDE2IEBACiAKICNpbmNsdWRlICJBUElD YXN0LmgiCiAjaW5jbHVkZSAiSW5pdGlhbGl6ZVRocmVhZGluZy5oIgorI2luY2x1ZGUgPGludGVy cHJldGVyL0NhbGxGcmFtZS5oPgorI2luY2x1ZGUgPGludGVycHJldGVyL0ludGVycHJldGVyLmg+ CiAjaW5jbHVkZSAiSlNDYWxsYmFja09iamVjdC5oIgogI2luY2x1ZGUgIkpTQ2xhc3NSZWYuaCIK ICNpbmNsdWRlICJKU0dsb2JhbE9iamVjdC5oIgogI2luY2x1ZGUgIkpTT2JqZWN0LmgiCisjaW5j bHVkZSAiVVN0cmluZ0J1aWxkZXIuaCIKICNpbmNsdWRlIDx3dGYvdGV4dC9TdHJpbmdIYXNoLmg+ CiAKKwogI2lmIE9TKERBUldJTikKICNpbmNsdWRlIDxtYWNoLW8vZHlsZC5oPgogCkBAIC0xNzcs MyArMTgxLDU5IEBAIEpTR2xvYmFsQ29udGV4dFJlZiBKU0NvbnRleHRHZXRHbG9iYWxDb24KIAog ICAgIHJldHVybiB0b0dsb2JhbFJlZihleGVjLT5sZXhpY2FsR2xvYmFsT2JqZWN0KCktPmdsb2Jh bEV4ZWMoKSk7CiB9CisgICAgCitKU1N0cmluZ1JlZiBKU0NvbnRleHRDcmVhdGVCYWNrdHJhY2Uo SlNDb250ZXh0UmVmIGN0eCwgdW5zaWduZWQgbWF4U3RhY2tTaXplKQoreworICAgIEV4ZWNTdGF0 ZSogZXhlYyA9IHRvSlMoY3R4KTsKKyAgICBKU0xvY2sgbG9jayhleGVjKTsKKworICAgIHVuc2ln bmVkIGNvdW50ID0gMDsKKyAgICBVU3RyaW5nQnVpbGRlciBidWlsZGVyOworICAgIENhbGxGcmFt ZSogY2FsbEZyYW1lID0gZXhlYzsKKyAgICBVU3RyaW5nIGZ1bmN0aW9uTmFtZTsKKyAgICBpZiAo ZXhlYy0+Y2FsbGVlKCkpIHsKKyAgICAgICAgaWYgKGFzT2JqZWN0KGV4ZWMtPmNhbGxlZSgpKS0+ aW5oZXJpdHMoJkludGVybmFsRnVuY3Rpb246OnNfaW5mbykpIHsKKyAgICAgICAgICAgIGZ1bmN0 aW9uTmFtZSA9IGFzSW50ZXJuYWxGdW5jdGlvbihleGVjLT5jYWxsZWUoKSktPm5hbWUoZXhlYyk7 CisgICAgICAgICAgICBidWlsZGVyLmFwcGVuZCgiIzAgIik7CisgICAgICAgICAgICBidWlsZGVy LmFwcGVuZChmdW5jdGlvbk5hbWUpOworICAgICAgICAgICAgYnVpbGRlci5hcHBlbmQoIigpICIp OworICAgICAgICAgICAgY291bnQrKzsKKyAgICAgICAgfQorICAgIH0KKyAgICB3aGlsZSAodHJ1 ZSkgeworICAgICAgICBBU1NFUlQoY2FsbEZyYW1lKTsKKyAgICAgICAgaW50IHNpZ25lZExpbmVO dW1iZXI7CisgICAgICAgIGludHB0cl90IHNvdXJjZUlEOworICAgICAgICBVU3RyaW5nIHVybFN0 cmluZzsKKyAgICAgICAgSlNWYWx1ZSBmdW5jdGlvbjsKKyAgICAgICAgCisgICAgICAgIGNoYXIg bGV2ZWxTdHJbNl07CisgICAgICAgIHNwcmludGYobGV2ZWxTdHIsICIjJWQgIiwgY291bnQpOwor CisgICAgICAgIGV4ZWMtPmludGVycHJldGVyKCktPnJldHJpZXZlTGFzdENhbGxlcihjYWxsRnJh bWUsIHNpZ25lZExpbmVOdW1iZXIsIHNvdXJjZUlELCB1cmxTdHJpbmcsIGZ1bmN0aW9uKTsKKwor ICAgICAgICBpZiAoZnVuY3Rpb24pCisgICAgICAgICAgICBmdW5jdGlvbk5hbWUgPSBhc0Z1bmN0 aW9uKGZ1bmN0aW9uKS0+bmFtZShleGVjKTsKKyAgICAgICAgZWxzZSB7CisgICAgICAgICAgICAv LyBDYWxsZXIgaXMgdW5rbm93biwgYnV0IGlmIGZyYW1lIGlzIGVtcHR5IHdlIHNob3VsZCBzdGls bCBhZGQgdGhlIGZyYW1lLCBiZWNhdXNlCisgICAgICAgICAgICAvLyBzb21ldGhpbmcgY2FsbGVk IHVzLCBhbmQgZ2F2ZSB1cyBhcmd1bWVudHMuCisgICAgICAgICAgICBpZiAoY291bnQpCisgICAg ICAgICAgICAgICAgYnJlYWs7CisgICAgICAgIH0KKyAgICAgICAgdW5zaWduZWQgbGluZU51bWJl ciA9IHNpZ25lZExpbmVOdW1iZXIgPj0gMCA/IHNpZ25lZExpbmVOdW1iZXIgOiAwOworICAgICAg ICBpZiAoIWJ1aWxkZXIuaXNFbXB0eSgpKQorICAgICAgICAgICAgYnVpbGRlci5hcHBlbmQoIlxu Iik7CisgICAgICAgIGJ1aWxkZXIuYXBwZW5kKGxldmVsU3RyKTsKKyAgICAgICAgYnVpbGRlci5h cHBlbmQoZnVuY3Rpb25OYW1lKTsKKyAgICAgICAgYnVpbGRlci5hcHBlbmQoIigpIGF0ICIpOwor ICAgICAgICBidWlsZGVyLmFwcGVuZCh1cmxTdHJpbmcpOworICAgICAgICBidWlsZGVyLmFwcGVu ZCgiOiIpOworICAgICAgICBidWlsZGVyLmFwcGVuZChVU3RyaW5nOjpudW1iZXIobGluZU51bWJl cikpOworICAgICAgICBpZiAoIWZ1bmN0aW9uIHx8ICsrY291bnQgPT0gbWF4U3RhY2tTaXplKQor ICAgICAgICAgICAgYnJlYWs7CisgICAgICAgIGNhbGxGcmFtZSA9IGNhbGxGcmFtZS0+Y2FsbGVy RnJhbWUoKTsKKyAgICB9CisgICAgcmV0dXJuIE9wYXF1ZUpTU3RyaW5nOjpjcmVhdGUoYnVpbGRl ci50b1VTdHJpbmcoKSkubGVha1JlZigpOworfQorCisKSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0 Q29yZS9BUEkvSlNDb250ZXh0UmVmUHJpdmF0ZS5oCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZh U2NyaXB0Q29yZS9BUEkvSlNDb250ZXh0UmVmUHJpdmF0ZS5oCShyZXZpc2lvbiAxMDQ4MDQ5KQor KysgU291cmNlL0phdmFTY3JpcHRDb3JlL0FQSS9KU0NvbnRleHRSZWZQcml2YXRlLmgJKHdvcmtp bmcgY29weSkKQEAgLTQ2LDYgKzQ2LDE1IEBAIGV4dGVybiAiQyIgewogKi8KIEpTX0VYUE9SVCBK U0dsb2JhbENvbnRleHRSZWYgSlNDb250ZXh0R2V0R2xvYmFsQ29udGV4dChKU0NvbnRleHRSZWYg Y3R4KTsKIAorICAgIAorLyohCitAZnVuY3Rpb24KK0BhYnN0cmFjdCBHZXRzIGEgQmFja3RyYWNl IGZvciB0aGUgZXhpc3RpbmcgY29udGV4dAorQHBhcmFtIGN0eCBUaGUgSlNDb250ZXh0IHdob3Nl IGJhY2t0cmFjZSB5b3Ugd2FudCB0byBnZXQKK0ByZXN1bHQgQSBzdHJpbmcgY29udGFpbmluZyB0 aGUgYmFja3RyYWNlCisqLworSlNfRVhQT1JUIEpTU3RyaW5nUmVmIEpTQ29udGV4dENyZWF0ZUJh Y2t0cmFjZShKU0NvbnRleHRSZWYgY3R4LCB1bnNpZ25lZCBtYXhTdGFja1NpemUpIEFWQUlMQUJM RV9JTl9XRUJLSVRfVkVSU0lPTl80XzA7CisgICAgCiAjaWZkZWYgX19jcGx1c3BsdXMKIH0KICNl bmRpZgo= 101796 2011-07-22 17:00:48 -0700 2011-07-22 17:19:20 -0700 Same patch, getting rid of sprintf for cleaner UString::number() use instead backtrace.patch text/plain 5134 panage SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMTA0ODA0OSkKKysrIFNvdXJj ZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwyNCBA QAorMjAxMS0wNy0yMSAgU29tbWVyIFBhbmFnZSAgPHBhbmFnZUBhcHBsZS5jb20+CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgZXhwb3J0IEpTQ29udGV4 dENyZWF0ZUJhY2t0cmFjZSBhcyBTUEkgaW4gSlNDb250ZXh0UmVmUHJpdmF0ZS5oCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD02NDk4MQorCisgICAgICAg IFVJQXV0b21hdGlvbiBmb3IgaU9TIHdvdWxkIGxpa2UgdG8gc3VwcG9ydCBhIEphdmFzY3JpcHQg YmFja3RyYWNlIGluIG91ciBlcnJvciBsb2dzLgorICAgICAgICBDdXJyZW50bHksIHRoZSBDIEFQ SSBkb2VzIG5vdCBwcm92aWRlIHRoZSB0b29scyB0byBkbyB0aGlzLiBIb3dldmVyLCB0aGUgcHJp dmF0ZSBBUEkKKyAgICAgICAgZG9lcyBleHBvc2UgdGhlIG5lY2Vzc2FyeSBmdW5jdGlvbmFsaXR5 IHRvIGdldCBhIGJhY2t0cmFjZQorICAgICAgICAodmlhIEludGVycHJldGVyOjpyZXRyaWV2ZUxh c3RDYWxsZXIpLiBXZSByZWNvZ25pemUgdGhpcyBpbmZvcm1hdGlvbiBtYXkgcmVzdWx0IGluCisg ICAgICAgIGZhaWx1cmUgaW4gdGhlIGNhc2VzIG9mIHByb2dyYW1zIHJ1biBieSAnZXZhbCcsIHN0 YWNrIGZyYW1lcyBiZW5lYXRoIGhvc3QgZnVuY3Rpb24KKyAgICAgICAgY2FsbCBmcmFtZXMsIGFu ZCBpbiBwcm9ncmFtcyBydW4gZnJvbSBvdGhlciBwcm9ncmFtcy4gVGh1cywgd2UgcHJvcG9zZSBl eHBvcnRpbmcgb3VyCisgICAgICAgIEpTQ29udGV4dENyZWF0ZUJhY2t0cmFjZSBpbiBKU0NvbnRl eHRSZWZQcml2YXRlLmguIFRoaXMgd2lsbCBwcm92aWRlIHVzIHdpdGggdGhlIHRvb2xzCisgICAg ICAgIHdlIG5lZWQgd2hpbGUgbm90IGFkdmVydGlzaW5nIGFuIEFQSSB0aGF0IGlzbid0IHJlYWxs eSByZWFkeSBmb3IgZnVsbCB1c2UuCisKKyAgICAgICAgKiBBUEkvSlNDb250ZXh0UmVmLmNwcDoK KyAgICAgICAgKiBBUEkvSlNDb250ZXh0UmVmUHJpdmF0ZS5oOgorICAgICAgICAqIEphdmFTY3Jp cHRDb3JlLmV4cDoKKworCiAyMDExLTA1LTE3ICBTYW0gV2VpbmlnICA8c2FtQHdlYmtpdC5vcmc+ CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgT2xpdmVyIEh1bnQuCkluZGV4OiBTb3VyY2UvSmF2YVNj cmlwdENvcmUvSmF2YVNjcmlwdENvcmUuZXhwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2Ny aXB0Q29yZS9KYXZhU2NyaXB0Q29yZS5leHAJKHJldmlzaW9uIDEwNDgwNDkpCisrKyBTb3VyY2Uv SmF2YVNjcmlwdENvcmUvSmF2YVNjcmlwdENvcmUuZXhwCSh3b3JraW5nIGNvcHkpCkBAIC04LDYg KzgsNyBAQCBfSlNDb250ZXh0R2V0R3JvdXAKIF9KU0NvbnRleHRHcm91cENyZWF0ZQogX0pTQ29u dGV4dEdyb3VwUmVsZWFzZQogX0pTQ29udGV4dEdyb3VwUmV0YWluCitfSlNDb250ZXh0Q3JlYXRl QmFja3RyYWNlCiBfSlNFbmRQcm9maWxpbmcKIF9KU0V2YWx1YXRlU2NyaXB0CiBfSlNHYXJiYWdl Q29sbGVjdApJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL0FQSS9KU0NvbnRleHRSZWYuY3Bw Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9BUEkvSlNDb250ZXh0UmVmLmNw cAkocmV2aXNpb24gMTA0ODA0OSkKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9BUEkvSlNDb250 ZXh0UmVmLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMjksMTIgKzI5LDE2IEBACiAKICNpbmNsdWRl ICJBUElDYXN0LmgiCiAjaW5jbHVkZSAiSW5pdGlhbGl6ZVRocmVhZGluZy5oIgorI2luY2x1ZGUg PGludGVycHJldGVyL0NhbGxGcmFtZS5oPgorI2luY2x1ZGUgPGludGVycHJldGVyL0ludGVycHJl dGVyLmg+CiAjaW5jbHVkZSAiSlNDYWxsYmFja09iamVjdC5oIgogI2luY2x1ZGUgIkpTQ2xhc3NS ZWYuaCIKICNpbmNsdWRlICJKU0dsb2JhbE9iamVjdC5oIgogI2luY2x1ZGUgIkpTT2JqZWN0Lmgi CisjaW5jbHVkZSAiVVN0cmluZ0J1aWxkZXIuaCIKICNpbmNsdWRlIDx3dGYvdGV4dC9TdHJpbmdI YXNoLmg+CiAKKwogI2lmIE9TKERBUldJTikKICNpbmNsdWRlIDxtYWNoLW8vZHlsZC5oPgogCkBA IC0xNzcsMyArMTgxLDYwIEBAIEpTR2xvYmFsQ29udGV4dFJlZiBKU0NvbnRleHRHZXRHbG9iYWxD b24KIAogICAgIHJldHVybiB0b0dsb2JhbFJlZihleGVjLT5sZXhpY2FsR2xvYmFsT2JqZWN0KCkt Pmdsb2JhbEV4ZWMoKSk7CiB9CisgICAgCitKU1N0cmluZ1JlZiBKU0NvbnRleHRDcmVhdGVCYWNr dHJhY2UoSlNDb250ZXh0UmVmIGN0eCwgdW5zaWduZWQgbWF4U3RhY2tTaXplKQoreworICAgIEV4 ZWNTdGF0ZSogZXhlYyA9IHRvSlMoY3R4KTsKKyAgICBKU0xvY2sgbG9jayhleGVjKTsKKworICAg IHVuc2lnbmVkIGNvdW50ID0gMDsKKyAgICBVU3RyaW5nQnVpbGRlciBidWlsZGVyOworICAgIENh bGxGcmFtZSogY2FsbEZyYW1lID0gZXhlYzsKKyAgICBVU3RyaW5nIGZ1bmN0aW9uTmFtZTsKKyAg ICBpZiAoZXhlYy0+Y2FsbGVlKCkpIHsKKyAgICAgICAgaWYgKGFzT2JqZWN0KGV4ZWMtPmNhbGxl ZSgpKS0+aW5oZXJpdHMoJkludGVybmFsRnVuY3Rpb246OnNfaW5mbykpIHsKKyAgICAgICAgICAg IGZ1bmN0aW9uTmFtZSA9IGFzSW50ZXJuYWxGdW5jdGlvbihleGVjLT5jYWxsZWUoKSktPm5hbWUo ZXhlYyk7CisgICAgICAgICAgICBidWlsZGVyLmFwcGVuZCgiIzAgIik7CisgICAgICAgICAgICBi dWlsZGVyLmFwcGVuZChmdW5jdGlvbk5hbWUpOworICAgICAgICAgICAgYnVpbGRlci5hcHBlbmQo IigpICIpOworICAgICAgICAgICAgY291bnQrKzsKKyAgICAgICAgfQorICAgIH0KKyAgICB3aGls ZSAodHJ1ZSkgeworICAgICAgICBBU1NFUlQoY2FsbEZyYW1lKTsKKyAgICAgICAgaW50IHNpZ25l ZExpbmVOdW1iZXI7CisgICAgICAgIGludHB0cl90IHNvdXJjZUlEOworICAgICAgICBVU3RyaW5n IHVybFN0cmluZzsKKyAgICAgICAgSlNWYWx1ZSBmdW5jdGlvbjsKKyAgICAgICAgCisgICAgICAg IFVTdHJpbmcgbGV2ZWxTdHIgPSBVU3RyaW5nOjpudW1iZXIoY291bnQpOworICAgICAgICAKKyAg ICAgICAgZXhlYy0+aW50ZXJwcmV0ZXIoKS0+cmV0cmlldmVMYXN0Q2FsbGVyKGNhbGxGcmFtZSwg c2lnbmVkTGluZU51bWJlciwgc291cmNlSUQsIHVybFN0cmluZywgZnVuY3Rpb24pOworCisgICAg ICAgIGlmIChmdW5jdGlvbikKKyAgICAgICAgICAgIGZ1bmN0aW9uTmFtZSA9IGFzRnVuY3Rpb24o ZnVuY3Rpb24pLT5uYW1lKGV4ZWMpOworICAgICAgICBlbHNlIHsKKyAgICAgICAgICAgIC8vIENh bGxlciBpcyB1bmtub3duLCBidXQgaWYgZnJhbWUgaXMgZW1wdHkgd2Ugc2hvdWxkIHN0aWxsIGFk ZCB0aGUgZnJhbWUsIGJlY2F1c2UKKyAgICAgICAgICAgIC8vIHNvbWV0aGluZyBjYWxsZWQgdXMs IGFuZCBnYXZlIHVzIGFyZ3VtZW50cy4KKyAgICAgICAgICAgIGlmIChjb3VudCkKKyAgICAgICAg ICAgICAgICBicmVhazsKKyAgICAgICAgfQorICAgICAgICB1bnNpZ25lZCBsaW5lTnVtYmVyID0g c2lnbmVkTGluZU51bWJlciA+PSAwID8gc2lnbmVkTGluZU51bWJlciA6IDA7CisgICAgICAgIGlm ICghYnVpbGRlci5pc0VtcHR5KCkpCisgICAgICAgICAgICBidWlsZGVyLmFwcGVuZCgiXG4iKTsK KyAgICAgICAgYnVpbGRlci5hcHBlbmQoIiMiKTsKKyAgICAgICAgYnVpbGRlci5hcHBlbmQobGV2 ZWxTdHIpOworICAgICAgICBidWlsZGVyLmFwcGVuZCgiICIpOworICAgICAgICBidWlsZGVyLmFw cGVuZChmdW5jdGlvbk5hbWUpOworICAgICAgICBidWlsZGVyLmFwcGVuZCgiKCkgYXQgIik7Cisg ICAgICAgIGJ1aWxkZXIuYXBwZW5kKHVybFN0cmluZyk7CisgICAgICAgIGJ1aWxkZXIuYXBwZW5k KCI6Iik7CisgICAgICAgIGJ1aWxkZXIuYXBwZW5kKFVTdHJpbmc6Om51bWJlcihsaW5lTnVtYmVy KSk7CisgICAgICAgIGlmICghZnVuY3Rpb24gfHwgKytjb3VudCA9PSBtYXhTdGFja1NpemUpCisg ICAgICAgICAgICBicmVhazsKKyAgICAgICAgY2FsbEZyYW1lID0gY2FsbEZyYW1lLT5jYWxsZXJG cmFtZSgpOworICAgIH0KKyAgICByZXR1cm4gT3BhcXVlSlNTdHJpbmc6OmNyZWF0ZShidWlsZGVy LnRvVVN0cmluZygpKS5sZWFrUmVmKCk7Cit9CisKKwpJbmRleDogU291cmNlL0phdmFTY3JpcHRD b3JlL0FQSS9KU0NvbnRleHRSZWZQcml2YXRlLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFT Y3JpcHRDb3JlL0FQSS9KU0NvbnRleHRSZWZQcml2YXRlLmgJKHJldmlzaW9uIDEwNDgwNDkpCisr KyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvQVBJL0pTQ29udGV4dFJlZlByaXZhdGUuaAkod29ya2lu ZyBjb3B5KQpAQCAtNDYsNiArNDYsMTUgQEAgZXh0ZXJuICJDIiB7CiAqLwogSlNfRVhQT1JUIEpT R2xvYmFsQ29udGV4dFJlZiBKU0NvbnRleHRHZXRHbG9iYWxDb250ZXh0KEpTQ29udGV4dFJlZiBj dHgpOwogCisgICAgCisvKiEKK0BmdW5jdGlvbgorQGFic3RyYWN0IEdldHMgYSBCYWNrdHJhY2Ug Zm9yIHRoZSBleGlzdGluZyBjb250ZXh0CitAcGFyYW0gY3R4IFRoZSBKU0NvbnRleHQgd2hvc2Ug YmFja3RyYWNlIHlvdSB3YW50IHRvIGdldAorQHJlc3VsdCBBIHN0cmluZyBjb250YWluaW5nIHRo ZSBiYWNrdHJhY2UKKyovCitKU19FWFBPUlQgSlNTdHJpbmdSZWYgSlNDb250ZXh0Q3JlYXRlQmFj a3RyYWNlKEpTQ29udGV4dFJlZiBjdHgsIHVuc2lnbmVkIG1heFN0YWNrU2l6ZSkgQVZBSUxBQkxF X0lOX1dFQktJVF9WRVJTSU9OXzRfMDsKKyAgICAKICNpZmRlZiBfX2NwbHVzcGx1cwogfQogI2Vu ZGlmCg==