23245 2009-01-11 14:44:04 -0800 REGRESSION: Use of JavaScriptCore C API without using WebKit leads to immediate crash inside JSC::Identifier::add 2009-01-11 23:38:49 -0800 1 1 1 Unclassified WebKit JavaScriptCore 528+ (Nightly build) Mac OS X 10.5 RESOLVED FIXED HasReduction, InRadar, Regression P1 Major --- 1 mrowe levin ap levin oldest_to_newest 105273 0 mrowe 2009-01-11 14:44:04 -0800 #include <JavaScriptCore/JavaScriptCore.h> int main(int argc, char **argv) { JSGlobalContextRef context = JSGlobalContextCreate(0); return 0; } running this against TOT crashes inside JSC::Identifier::add when calling UString::Rep::null().hash();, as the data used by UString::Rep::null() has not been initialized 105275 1 mrowe 2009-01-11 14:51:20 -0800 Program received signal EXC_BAD_ACCESS, Could not access memory. Reason: KERN_PROTECTION_FAILURE at address: 0x0000000c 0x004bda64 in JSC::UString::Rep::hash (this=0x0) at UString.h:96 96 unsigned hash() const { if (_hash == 0) _hash = computeHash(data(), len); return _hash; } (gdb) bt #0 0x004bda64 in JSC::UString::Rep::hash (this=0x0) at UString.h:96 #1 0x0047d664 in JSC::Identifier::add (globalData=0x1009800, c=0x0) at Identifier.cpp:127 #2 0x00507f9f in JSC::Identifier::Identifier (this=0x904ad0, globalData=0x1009800, s=0x0) at Identifier.h:41 #3 0x0048388a in JSC::CommonIdentifiers::CommonIdentifiers (this=0x904ad0, globalData=0x1009800) at CommonIdentifiers.cpp:34 #4 0x00569e81 in JSC::JSGlobalData::JSGlobalData (this=0x1009800, isShared=true) at JavaScriptCore/runtime/JSGlobalData.cpp:94 #5 0x00569ff6 in JSC::JSGlobalData::sharedInstance () at JavaScriptCore/runtime/JSGlobalData.cpp:169 #6 0x00566635 in JSGlobalContextCreate (globalObjectClass=0x0) at JavaScriptCore/API/JSContextRef.cpp:72 #7 0x00001ff4 in main (argc=1, argv=0xbffff860) at test.c:5 Looks like perhaps JSGlobalContextCreate needs to call initializeThreading() before calling JSGlobalData::sharedInstance(). 105277 2 mrowe 2009-01-11 14:57:07 -0800 <rdar://problem/6488045> 105294 3 26622 levin 2009-01-11 20:38:08 -0800 Created attachment 26622 Fix for bug. 105295 4 26622 darin 2009-01-11 21:10:39 -0800 Comment on attachment 26622 Fix for bug. I think it's subtle and non-obvious that OpaqueJSString::ustring is a suitable bottleneck, yet OpaqueJSString::identifier, a function with a nearly identical purpose, doesn't need the initializeThreading call. I think it might be better to initialize in the individual JSStringCreate functions, even though there are many of them, because the subtle relationship between the external functions and the reason OpaqueJSString has initialization inside it is very likely to get broken in the future even though it's fine right now. You missed JSGlobalContextCreateInGroup, which can take NULL for the group. prepare-ChangeLog somehow missed JSGlobalContextCreate, because it's not listed in your change log. I'm going to say review- because you missed JSGlobalContextCreateInGroup. 105297 5 26623 levin 2009-01-11 21:34:27 -0800 Created attachment 26623 Patch for bug. I put the init in the JSString api where it creates the JSStringRef. About JSGlobalContextCreateInGroup, I likely would have missed it (because of its ability to take NULL), but fortunately the init call was already there. 105298 6 26624 levin 2009-01-11 21:38:20 -0800 Created attachment 26624 Patch with the comments addressed. 105299 7 26624 darin 2009-01-11 21:41:11 -0800 Comment on attachment 26624 Patch with the comments addressed. Oh, I am so evil. I told you to move it into JSStringCreate functions, *knowing* you'd probably missing JSStringCreateWithBSTR. But did I say anything? No! So I made you take a perfectly good, working patch, and ruin it. review-, but I'm sure it will take you like 10 seconds to fix it 105301 8 levin 2009-01-11 21:51:42 -0800 (In reply to comment #7) > (From update of attachment 26624 [review]) > Oh, I am so evil. I told you to move it into JSStringCreate functions, > *knowing* you'd probably missing JSStringCreateWithBSTR. But did I say > anything? No! So I made you take a perfectly good, working patch, and ruin it. > > review-, but I'm sure it will take you like 10 seconds to fix it > Actually, I did look at them. :) * JSStringCreateWithBSTR just calls JSStringCreateWithCharacters (which has the init function). Is it too tricky to rely on that? * JSStringCopyBSTR takes a JSStringRef so it doesn't need a call to the init function. 105302 9 darin 2009-01-11 22:00:14 -0800 (In reply to comment #8) > * JSStringCreateWithBSTR just calls JSStringCreateWithCharacters (which has > the init function). > Is it too tricky to rely on that? No. I don't know why the others don't work that way. It's better! 105303 10 26624 darin 2009-01-11 22:00:24 -0800 Comment on attachment 26624 Patch with the comments addressed. r=me 105304 11 levin 2009-01-11 22:02:22 -0800 fwiw, the bstr api worries me a little bit. BSTR are a windows construct (ole automation), so this is a windows api. However, initializeThreading is only threadsafe on OSX. I guess these string apis could be called on any thread which would be trouble on Windows. It may help to know when these apis are called. Is it just there for Apple products that run on windows (and they'll call something on the main thread that initializes this)? Or do I need to be more concerned about this? 105307 12 ap 2009-01-11 23:38:49 -0800 Committed revision 39817. It isn't all that important for a pure JS API client to have a correct main thread identifier (it's needed for WTF MainThread functionality, which is not reachable via API). There could be problems if a client first uses JSC from secondary thread, and later uses WebCore from main thread. So, there are improvements to be made, but the issue is not too horrible. 26622 2009-01-11 20:38:08 -0800 2009-01-11 21:34:27 -0800 Fix for bug. patch-for-bug23245.txt text/plain 3490 levin ZGlmZiAtLWdpdCBhL0phdmFTY3JpcHRDb3JlL0FQSS9KU0NvbnRleHRSZWYuY3BwIGIvSmF2YVNj cmlwdENvcmUvQVBJL0pTQ29udGV4dFJlZi5jcHAKaW5kZXggNDBjNDVkMy4uYzMzMTE3OSAxMDA2 NDQKLS0tIGEvSmF2YVNjcmlwdENvcmUvQVBJL0pTQ29udGV4dFJlZi5jcHAKKysrIGIvSmF2YVNj cmlwdENvcmUvQVBJL0pTQ29udGV4dFJlZi5jcHAKQEAgLTQ0LDYgKzQ0LDcgQEAgdXNpbmcgbmFt ZXNwYWNlIEpTQzsKIAogSlNDb250ZXh0R3JvdXBSZWYgSlNDb250ZXh0R3JvdXBDcmVhdGUoKQog eworICAgIGluaXRpYWxpemVUaHJlYWRpbmcoKTsKICAgICByZXR1cm4gdG9SZWYoSlNHbG9iYWxE YXRhOjpjcmVhdGUoKS5yZWxlYXNlUmVmKCkpOwogfQogCkBAIC02MCw2ICs2MSw3IEBAIHZvaWQg SlNDb250ZXh0R3JvdXBSZWxlYXNlKEpTQ29udGV4dEdyb3VwUmVmIGdyb3VwKQogCiBKU0dsb2Jh bENvbnRleHRSZWYgSlNHbG9iYWxDb250ZXh0Q3JlYXRlKEpTQ2xhc3NSZWYgZ2xvYmFsT2JqZWN0 Q2xhc3MpCiB7CisgICAgaW5pdGlhbGl6ZVRocmVhZGluZygpOwogI2lmIFBMQVRGT1JNKERBUldJ TikKICAgICAvLyBXaGVuIHJ1bm5pbmcgb24gVGlnZXIgb3IgTGVvcGFyZCwgb3IgaWYgdGhlIGFw cGxpY2F0aW9uIHdhcyBsaW5rZWQgYmVmb3JlIEpTR2xvYmFsQ29udGV4dENyZWF0ZSB3YXMgY2hh bmdlZAogICAgIC8vIHRvIHVzZSBhIHVuaXF1ZSBKU0dsb2JhbERhdGEsIHdlIHVzZSBhIHNoYXJl ZCBvbmUgZm9yIGNvbXBhdGliaWxpdHkuCmRpZmYgLS1naXQgYS9KYXZhU2NyaXB0Q29yZS9BUEkv SlNPYmplY3RSZWYuY3BwIGIvSmF2YVNjcmlwdENvcmUvQVBJL0pTT2JqZWN0UmVmLmNwcAppbmRl eCBjMDhiOGIwLi42YzE0ZjJkIDEwMDY0NAotLS0gYS9KYXZhU2NyaXB0Q29yZS9BUEkvSlNPYmpl Y3RSZWYuY3BwCisrKyBiL0phdmFTY3JpcHRDb3JlL0FQSS9KU09iamVjdFJlZi5jcHAKQEAgLTMy LDYgKzMyLDcgQEAKICNpbmNsdWRlICJFcnJvckNvbnN0cnVjdG9yLmgiCiAjaW5jbHVkZSAiRnVu Y3Rpb25Db25zdHJ1Y3Rvci5oIgogI2luY2x1ZGUgIklkZW50aWZpZXIuaCIKKyNpbmNsdWRlICJJ bml0aWFsaXplVGhyZWFkaW5nLmgiCiAjaW5jbHVkZSAiSlNBcnJheS5oIgogI2luY2x1ZGUgIkpT Q2FsbGJhY2tDb25zdHJ1Y3Rvci5oIgogI2luY2x1ZGUgIkpTQ2FsbGJhY2tGdW5jdGlvbi5oIgpA QCAtNTIsNiArNTMsNyBAQCB1c2luZyBuYW1lc3BhY2UgSlNDOwogCiBKU0NsYXNzUmVmIEpTQ2xh c3NDcmVhdGUoY29uc3QgSlNDbGFzc0RlZmluaXRpb24qIGRlZmluaXRpb24pCiB7CisgICAgaW5p dGlhbGl6ZVRocmVhZGluZygpOwogICAgIFJlZlB0cjxPcGFxdWVKU0NsYXNzPiBqc0NsYXNzID0g KGRlZmluaXRpb24tPmF0dHJpYnV0ZXMgJiBrSlNDbGFzc0F0dHJpYnV0ZU5vQXV0b21hdGljUHJv dG90eXBlKQogICAgICAgICA/IE9wYXF1ZUpTQ2xhc3M6OmNyZWF0ZU5vQXV0b21hdGljUHJvdG90 eXBlKGRlZmluaXRpb24pCiAgICAgICAgIDogT3BhcXVlSlNDbGFzczo6Y3JlYXRlKGRlZmluaXRp b24pOwpkaWZmIC0tZ2l0IGEvSmF2YVNjcmlwdENvcmUvQVBJL0pTU3RyaW5nUmVmQ0YuY3BwIGIv SmF2YVNjcmlwdENvcmUvQVBJL0pTU3RyaW5nUmVmQ0YuY3BwCmluZGV4IDY1ZWRkMDkuLjlmYTQ2 NDAgMTAwNjQ0Ci0tLSBhL0phdmFTY3JpcHRDb3JlL0FQSS9KU1N0cmluZ1JlZkNGLmNwcAorKysg Yi9KYXZhU2NyaXB0Q29yZS9BUEkvSlNTdHJpbmdSZWZDRi5jcHAKQEAgLTQ0LDcgKzQ0LDcgQEAg SlNTdHJpbmdSZWYgSlNTdHJpbmdDcmVhdGVXaXRoQ0ZTdHJpbmcoQ0ZTdHJpbmdSZWYgc3RyaW5n KQogICAgIH0gZWxzZSB7CiAgICAgICAgIHJldHVybiBPcGFxdWVKU1N0cmluZzo6Y3JlYXRlKDAs IDApLnJlbGVhc2VSZWYoKTsKICAgICB9Ci0gICAgfQorfQogCiBDRlN0cmluZ1JlZiBKU1N0cmlu Z0NvcHlDRlN0cmluZyhDRkFsbG9jYXRvclJlZiBhbGxvYywgSlNTdHJpbmdSZWYgc3RyaW5nKQog ewpkaWZmIC0tZ2l0IGEvSmF2YVNjcmlwdENvcmUvQVBJL09wYXF1ZUpTU3RyaW5nLmNwcCBiL0ph dmFTY3JpcHRDb3JlL0FQSS9PcGFxdWVKU1N0cmluZy5jcHAKaW5kZXggN2M3YjFhZi4uMmI3M2Yy ZiAxMDA2NDQKLS0tIGEvSmF2YVNjcmlwdENvcmUvQVBJL09wYXF1ZUpTU3RyaW5nLmNwcAorKysg Yi9KYXZhU2NyaXB0Q29yZS9BUEkvT3BhcXVlSlNTdHJpbmcuY3BwCkBAIC0yNiw2ICsyNiw3IEBA CiAjaW5jbHVkZSAiY29uZmlnLmgiCiAjaW5jbHVkZSAiT3BhcXVlSlNTdHJpbmcuaCIKIAorI2lu Y2x1ZGUgIkluaXRpYWxpemVUaHJlYWRpbmcuaCIKICNpbmNsdWRlIDxpbnRlcnByZXRlci9DYWxs RnJhbWUuaD4KICNpbmNsdWRlIDxydW50aW1lL0pTR2xvYmFsT2JqZWN0Lmg+CiAjaW5jbHVkZSA8 cnVudGltZS9JZGVudGlmaWVyLmg+CkBAIC00MSw2ICs0Miw3IEBAIFBhc3NSZWZQdHI8T3BhcXVl SlNTdHJpbmc+IE9wYXF1ZUpTU3RyaW5nOjpjcmVhdGUoY29uc3QgVVN0cmluZyYgdXN0cmluZykK IAogVVN0cmluZyBPcGFxdWVKU1N0cmluZzo6dXN0cmluZygpIGNvbnN0CiB7CisgICAgaW5pdGlh bGl6ZVRocmVhZGluZygpOwogICAgIGlmICh0aGlzICYmIG1fY2hhcmFjdGVycykKICAgICAgICAg cmV0dXJuIFVTdHJpbmcobV9jaGFyYWN0ZXJzLCBtX2xlbmd0aCwgdHJ1ZSk7CiAgICAgcmV0dXJu IFVTdHJpbmc6Om51bGwoKTsKZGlmZiAtLWdpdCBhL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZyBi L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCA3OTE3NzgxLi5iOWYyZGJiIDEwMDY0NAot LS0gYS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKKysrIGIvSmF2YVNjcmlwdENvcmUvQ2hhbmdl TG9nCkBAIC0xLDMgKzEsMjEgQEAKKzIwMDktMDEtMTEgIERhdmlkIExldmluICA8bGV2aW5AY2hy b21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzI0NQorCisgICAg ICAgIEFkZCBpbml0aWFsaXplVGhyZWFkaW5nIHRvIGtleSBwbGFjZXMgaW4gSlMgQVBJIHRvIGVu c3VyZSB0aGF0CisgICAgICAgIFVTdHJpbmcgaXMgcHJvcGVybHkgaW5pdGlhbGl6ZWQuCisKKyAg ICAgICAgKiBBUEkvSlNDb250ZXh0UmVmLmNwcDoKKyAgICAgICAgKEpTQ29udGV4dEdyb3VwQ3Jl YXRlKToKKyAgICAgICAgKiBBUEkvSlNPYmplY3RSZWYuY3BwOgorICAgICAgICAoSlNDbGFzc0Ny ZWF0ZSk6CisgICAgICAgICogQVBJL0pTU3RyaW5nUmVmQ0YuY3BwOgorICAgICAgICAoSlNTdHJp bmdDcmVhdGVXaXRoQ0ZTdHJpbmcpOgorICAgICAgICAqIEFQSS9PcGFxdWVKU1N0cmluZy5jcHA6 CisgICAgICAgIChPcGFxdWVKU1N0cmluZzo6dXN0cmluZyk6CisKIDIwMDktMDEtMTEgIE9saXZl ciBIdW50ICA8b2xpdmVyQGFwcGxlLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KEJ1aWxkIGZpeCkuCg== 26623 2009-01-11 21:34:27 -0800 2009-01-11 21:38:20 -0800 Patch for bug. patch-for-bug23245.txt text/plain 4059 levin ZGlmZiAtLWdpdCBhL0phdmFTY3JpcHRDb3JlL0FQSS9KU0NvbnRleHRSZWYuY3BwIGIvSmF2YVNj cmlwdENvcmUvQVBJL0pTQ29udGV4dFJlZi5jcHAKaW5kZXggNDBjNDVkMy4uYzMzMTE3OSAxMDA2 NDQKLS0tIGEvSmF2YVNjcmlwdENvcmUvQVBJL0pTQ29udGV4dFJlZi5jcHAKKysrIGIvSmF2YVNj cmlwdENvcmUvQVBJL0pTQ29udGV4dFJlZi5jcHAKQEAgLTQ0LDYgKzQ0LDcgQEAgdXNpbmcgbmFt ZXNwYWNlIEpTQzsKIAogSlNDb250ZXh0R3JvdXBSZWYgSlNDb250ZXh0R3JvdXBDcmVhdGUoKQog eworICAgIGluaXRpYWxpemVUaHJlYWRpbmcoKTsKICAgICByZXR1cm4gdG9SZWYoSlNHbG9iYWxE YXRhOjpjcmVhdGUoKS5yZWxlYXNlUmVmKCkpOwogfQogCkBAIC02MCw2ICs2MSw3IEBAIHZvaWQg SlNDb250ZXh0R3JvdXBSZWxlYXNlKEpTQ29udGV4dEdyb3VwUmVmIGdyb3VwKQogCiBKU0dsb2Jh bENvbnRleHRSZWYgSlNHbG9iYWxDb250ZXh0Q3JlYXRlKEpTQ2xhc3NSZWYgZ2xvYmFsT2JqZWN0 Q2xhc3MpCiB7CisgICAgaW5pdGlhbGl6ZVRocmVhZGluZygpOwogI2lmIFBMQVRGT1JNKERBUldJ TikKICAgICAvLyBXaGVuIHJ1bm5pbmcgb24gVGlnZXIgb3IgTGVvcGFyZCwgb3IgaWYgdGhlIGFw cGxpY2F0aW9uIHdhcyBsaW5rZWQgYmVmb3JlIEpTR2xvYmFsQ29udGV4dENyZWF0ZSB3YXMgY2hh bmdlZAogICAgIC8vIHRvIHVzZSBhIHVuaXF1ZSBKU0dsb2JhbERhdGEsIHdlIHVzZSBhIHNoYXJl ZCBvbmUgZm9yIGNvbXBhdGliaWxpdHkuCmRpZmYgLS1naXQgYS9KYXZhU2NyaXB0Q29yZS9BUEkv SlNPYmplY3RSZWYuY3BwIGIvSmF2YVNjcmlwdENvcmUvQVBJL0pTT2JqZWN0UmVmLmNwcAppbmRl eCBjMDhiOGIwLi42YzE0ZjJkIDEwMDY0NAotLS0gYS9KYXZhU2NyaXB0Q29yZS9BUEkvSlNPYmpl Y3RSZWYuY3BwCisrKyBiL0phdmFTY3JpcHRDb3JlL0FQSS9KU09iamVjdFJlZi5jcHAKQEAgLTMy LDYgKzMyLDcgQEAKICNpbmNsdWRlICJFcnJvckNvbnN0cnVjdG9yLmgiCiAjaW5jbHVkZSAiRnVu Y3Rpb25Db25zdHJ1Y3Rvci5oIgogI2luY2x1ZGUgIklkZW50aWZpZXIuaCIKKyNpbmNsdWRlICJJ bml0aWFsaXplVGhyZWFkaW5nLmgiCiAjaW5jbHVkZSAiSlNBcnJheS5oIgogI2luY2x1ZGUgIkpT Q2FsbGJhY2tDb25zdHJ1Y3Rvci5oIgogI2luY2x1ZGUgIkpTQ2FsbGJhY2tGdW5jdGlvbi5oIgpA QCAtNTIsNiArNTMsNyBAQCB1c2luZyBuYW1lc3BhY2UgSlNDOwogCiBKU0NsYXNzUmVmIEpTQ2xh c3NDcmVhdGUoY29uc3QgSlNDbGFzc0RlZmluaXRpb24qIGRlZmluaXRpb24pCiB7CisgICAgaW5p dGlhbGl6ZVRocmVhZGluZygpOwogICAgIFJlZlB0cjxPcGFxdWVKU0NsYXNzPiBqc0NsYXNzID0g KGRlZmluaXRpb24tPmF0dHJpYnV0ZXMgJiBrSlNDbGFzc0F0dHJpYnV0ZU5vQXV0b21hdGljUHJv dG90eXBlKQogICAgICAgICA/IE9wYXF1ZUpTQ2xhc3M6OmNyZWF0ZU5vQXV0b21hdGljUHJvdG90 eXBlKGRlZmluaXRpb24pCiAgICAgICAgIDogT3BhcXVlSlNDbGFzczo6Y3JlYXRlKGRlZmluaXRp b24pOwpkaWZmIC0tZ2l0IGEvSmF2YVNjcmlwdENvcmUvQVBJL0pTU3RyaW5nUmVmLmNwcCBiL0ph dmFTY3JpcHRDb3JlL0FQSS9KU1N0cmluZ1JlZi5jcHAKaW5kZXggNjQ1MmZmYy4uOGUyMzZlNCAx MDA2NDQKLS0tIGEvSmF2YVNjcmlwdENvcmUvQVBJL0pTU3RyaW5nUmVmLmNwcAorKysgYi9KYXZh U2NyaXB0Q29yZS9BUEkvSlNTdHJpbmdSZWYuY3BwCkBAIC0yNiw2ICsyNiw3IEBACiAjaW5jbHVk ZSAiY29uZmlnLmgiCiAjaW5jbHVkZSAiSlNTdHJpbmdSZWYuaCIKIAorI2luY2x1ZGUgIkluaXRp YWxpemVUaHJlYWRpbmcuaCIKICNpbmNsdWRlICJPcGFxdWVKU1N0cmluZy5oIgogI2luY2x1ZGUg PHd0Zi91bmljb2RlL1VURjguaD4KIApAQCAtMzQsMTEgKzM1LDEzIEBAIHVzaW5nIG5hbWVzcGFj ZSBXVEY6OlVuaWNvZGU7CiAKIEpTU3RyaW5nUmVmIEpTU3RyaW5nQ3JlYXRlV2l0aENoYXJhY3Rl cnMoY29uc3QgSlNDaGFyKiBjaGFycywgc2l6ZV90IG51bUNoYXJzKQogeworICAgIGluaXRpYWxp emVUaHJlYWRpbmcoKTsKICAgICByZXR1cm4gT3BhcXVlSlNTdHJpbmc6OmNyZWF0ZShjaGFycywg bnVtQ2hhcnMpLnJlbGVhc2VSZWYoKTsKIH0KIAogSlNTdHJpbmdSZWYgSlNTdHJpbmdDcmVhdGVX aXRoVVRGOENTdHJpbmcoY29uc3QgY2hhciogc3RyaW5nKQogeworICAgIGluaXRpYWxpemVUaHJl YWRpbmcoKTsKICAgICBpZiAoc3RyaW5nKSB7CiAgICAgICAgIHNpemVfdCBsZW5ndGggPSBzdHJs ZW4oc3RyaW5nKTsKICAgICAgICAgVmVjdG9yPFVDaGFyLCAxMDI0PiBidWZmZXIobGVuZ3RoKTsK ZGlmZiAtLWdpdCBhL0phdmFTY3JpcHRDb3JlL0FQSS9KU1N0cmluZ1JlZkNGLmNwcCBiL0phdmFT Y3JpcHRDb3JlL0FQSS9KU1N0cmluZ1JlZkNGLmNwcAppbmRleCA2NWVkZDA5Li4yYjhmZDllIDEw MDY0NAotLS0gYS9KYXZhU2NyaXB0Q29yZS9BUEkvSlNTdHJpbmdSZWZDRi5jcHAKKysrIGIvSmF2 YVNjcmlwdENvcmUvQVBJL0pTU3RyaW5nUmVmQ0YuY3BwCkBAIC0yNyw2ICsyNyw3IEBACiAjaW5j bHVkZSAiSlNTdHJpbmdSZWZDRi5oIgogCiAjaW5jbHVkZSAiQVBJQ2FzdC5oIgorI2luY2x1ZGUg IkluaXRpYWxpemVUaHJlYWRpbmcuaCIKICNpbmNsdWRlICJKU1N0cmluZ1JlZi5oIgogI2luY2x1 ZGUgIk9wYXF1ZUpTU3RyaW5nLmgiCiAjaW5jbHVkZSA8cnVudGltZS9VU3RyaW5nLmg+CkBAIC0z NSw2ICszNiw3IEBACiAKIEpTU3RyaW5nUmVmIEpTU3RyaW5nQ3JlYXRlV2l0aENGU3RyaW5nKENG U3RyaW5nUmVmIHN0cmluZykKIHsKKyAgICBKU0M6OmluaXRpYWxpemVUaHJlYWRpbmcoKTsKICAg ICBDRkluZGV4IGxlbmd0aCA9IENGU3RyaW5nR2V0TGVuZ3RoKHN0cmluZyk7CiAgICAgaWYgKGxl bmd0aCkgewogICAgICAgICBPd25BcnJheVB0cjxVbmlDaGFyPiBidWZmZXIobmV3IFVuaUNoYXJb bGVuZ3RoXSk7CkBAIC00NCw3ICs0Niw3IEBAIEpTU3RyaW5nUmVmIEpTU3RyaW5nQ3JlYXRlV2l0 aENGU3RyaW5nKENGU3RyaW5nUmVmIHN0cmluZykKICAgICB9IGVsc2UgewogICAgICAgICByZXR1 cm4gT3BhcXVlSlNTdHJpbmc6OmNyZWF0ZSgwLCAwKS5yZWxlYXNlUmVmKCk7CiAgICAgfQotICAg IH0KK30KIAogQ0ZTdHJpbmdSZWYgSlNTdHJpbmdDb3B5Q0ZTdHJpbmcoQ0ZBbGxvY2F0b3JSZWYg YWxsb2MsIEpTU3RyaW5nUmVmIHN0cmluZykKIHsKZGlmZiAtLWdpdCBhL0phdmFTY3JpcHRDb3Jl L0NoYW5nZUxvZyBiL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCA3OTE3NzgxLi42ZGVi ZDU2IDEwMDY0NAotLS0gYS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKKysrIGIvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjIgQEAKKzIwMDktMDEtMTEgIERhdmlkIExldmlu ICA8bGV2aW5AY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0y MzI0NQorCisgICAgICAgIEFkZCBpbml0aWFsaXplVGhyZWFkaW5nIHRvIGtleSBwbGFjZXMgaW4g SlMgQVBJIHRvIGVuc3VyZSB0aGF0CisgICAgICAgIFVTdHJpbmcgaXMgcHJvcGVybHkgaW5pdGlh bGl6ZWQuCisKKyAgICAgICAgKiBBUEkvSlNDb250ZXh0UmVmLmNwcDoKKyAgICAgICAgKEpTQ29u dGV4dEdyb3VwQ3JlYXRlKToKKyAgICAgICAgKiBBUEkvSlNPYmplY3RSZWYuY3BwOgorICAgICAg ICAoSlNDbGFzc0NyZWF0ZSk6CisgICAgICAgICogQVBJL0pTU3RyaW5nUmVmLmNwcDoKKyAgICAg ICAgKEpTU3RyaW5nQ3JlYXRlV2l0aENoYXJhY3RlcnMpOgorICAgICAgICAoSlNTdHJpbmdDcmVh dGVXaXRoVVRGOENTdHJpbmcpOgorICAgICAgICAqIEFQSS9KU1N0cmluZ1JlZkNGLmNwcDoKKyAg ICAgICAgKEpTU3RyaW5nQ3JlYXRlV2l0aENGU3RyaW5nKToKKwogMjAwOS0wMS0xMSAgT2xpdmVy IEh1bnQgIDxvbGl2ZXJAYXBwbGUuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo QnVpbGQgZml4KS4K 26624 2009-01-11 21:38:20 -0800 2009-01-11 22:00:24 -0800 Patch with the comments addressed. patch-for-bug23245.txt text/plain 4093 levin ZGlmZiAtLWdpdCBhL0phdmFTY3JpcHRDb3JlL0FQSS9KU0NvbnRleHRSZWYuY3BwIGIvSmF2YVNj cmlwdENvcmUvQVBJL0pTQ29udGV4dFJlZi5jcHAKaW5kZXggNDBjNDVkMy4uYzMzMTE3OSAxMDA2 NDQKLS0tIGEvSmF2YVNjcmlwdENvcmUvQVBJL0pTQ29udGV4dFJlZi5jcHAKKysrIGIvSmF2YVNj cmlwdENvcmUvQVBJL0pTQ29udGV4dFJlZi5jcHAKQEAgLTQ0LDYgKzQ0LDcgQEAgdXNpbmcgbmFt ZXNwYWNlIEpTQzsKIAogSlNDb250ZXh0R3JvdXBSZWYgSlNDb250ZXh0R3JvdXBDcmVhdGUoKQog eworICAgIGluaXRpYWxpemVUaHJlYWRpbmcoKTsKICAgICByZXR1cm4gdG9SZWYoSlNHbG9iYWxE YXRhOjpjcmVhdGUoKS5yZWxlYXNlUmVmKCkpOwogfQogCkBAIC02MCw2ICs2MSw3IEBAIHZvaWQg SlNDb250ZXh0R3JvdXBSZWxlYXNlKEpTQ29udGV4dEdyb3VwUmVmIGdyb3VwKQogCiBKU0dsb2Jh bENvbnRleHRSZWYgSlNHbG9iYWxDb250ZXh0Q3JlYXRlKEpTQ2xhc3NSZWYgZ2xvYmFsT2JqZWN0 Q2xhc3MpCiB7CisgICAgaW5pdGlhbGl6ZVRocmVhZGluZygpOwogI2lmIFBMQVRGT1JNKERBUldJ TikKICAgICAvLyBXaGVuIHJ1bm5pbmcgb24gVGlnZXIgb3IgTGVvcGFyZCwgb3IgaWYgdGhlIGFw cGxpY2F0aW9uIHdhcyBsaW5rZWQgYmVmb3JlIEpTR2xvYmFsQ29udGV4dENyZWF0ZSB3YXMgY2hh bmdlZAogICAgIC8vIHRvIHVzZSBhIHVuaXF1ZSBKU0dsb2JhbERhdGEsIHdlIHVzZSBhIHNoYXJl ZCBvbmUgZm9yIGNvbXBhdGliaWxpdHkuCmRpZmYgLS1naXQgYS9KYXZhU2NyaXB0Q29yZS9BUEkv SlNPYmplY3RSZWYuY3BwIGIvSmF2YVNjcmlwdENvcmUvQVBJL0pTT2JqZWN0UmVmLmNwcAppbmRl eCBjMDhiOGIwLi42YzE0ZjJkIDEwMDY0NAotLS0gYS9KYXZhU2NyaXB0Q29yZS9BUEkvSlNPYmpl Y3RSZWYuY3BwCisrKyBiL0phdmFTY3JpcHRDb3JlL0FQSS9KU09iamVjdFJlZi5jcHAKQEAgLTMy LDYgKzMyLDcgQEAKICNpbmNsdWRlICJFcnJvckNvbnN0cnVjdG9yLmgiCiAjaW5jbHVkZSAiRnVu Y3Rpb25Db25zdHJ1Y3Rvci5oIgogI2luY2x1ZGUgIklkZW50aWZpZXIuaCIKKyNpbmNsdWRlICJJ bml0aWFsaXplVGhyZWFkaW5nLmgiCiAjaW5jbHVkZSAiSlNBcnJheS5oIgogI2luY2x1ZGUgIkpT Q2FsbGJhY2tDb25zdHJ1Y3Rvci5oIgogI2luY2x1ZGUgIkpTQ2FsbGJhY2tGdW5jdGlvbi5oIgpA QCAtNTIsNiArNTMsNyBAQCB1c2luZyBuYW1lc3BhY2UgSlNDOwogCiBKU0NsYXNzUmVmIEpTQ2xh c3NDcmVhdGUoY29uc3QgSlNDbGFzc0RlZmluaXRpb24qIGRlZmluaXRpb24pCiB7CisgICAgaW5p dGlhbGl6ZVRocmVhZGluZygpOwogICAgIFJlZlB0cjxPcGFxdWVKU0NsYXNzPiBqc0NsYXNzID0g KGRlZmluaXRpb24tPmF0dHJpYnV0ZXMgJiBrSlNDbGFzc0F0dHJpYnV0ZU5vQXV0b21hdGljUHJv dG90eXBlKQogICAgICAgICA/IE9wYXF1ZUpTQ2xhc3M6OmNyZWF0ZU5vQXV0b21hdGljUHJvdG90 eXBlKGRlZmluaXRpb24pCiAgICAgICAgIDogT3BhcXVlSlNDbGFzczo6Y3JlYXRlKGRlZmluaXRp b24pOwpkaWZmIC0tZ2l0IGEvSmF2YVNjcmlwdENvcmUvQVBJL0pTU3RyaW5nUmVmLmNwcCBiL0ph dmFTY3JpcHRDb3JlL0FQSS9KU1N0cmluZ1JlZi5jcHAKaW5kZXggNjQ1MmZmYy4uOGUyMzZlNCAx MDA2NDQKLS0tIGEvSmF2YVNjcmlwdENvcmUvQVBJL0pTU3RyaW5nUmVmLmNwcAorKysgYi9KYXZh U2NyaXB0Q29yZS9BUEkvSlNTdHJpbmdSZWYuY3BwCkBAIC0yNiw2ICsyNiw3IEBACiAjaW5jbHVk ZSAiY29uZmlnLmgiCiAjaW5jbHVkZSAiSlNTdHJpbmdSZWYuaCIKIAorI2luY2x1ZGUgIkluaXRp YWxpemVUaHJlYWRpbmcuaCIKICNpbmNsdWRlICJPcGFxdWVKU1N0cmluZy5oIgogI2luY2x1ZGUg PHd0Zi91bmljb2RlL1VURjguaD4KIApAQCAtMzQsMTEgKzM1LDEzIEBAIHVzaW5nIG5hbWVzcGFj ZSBXVEY6OlVuaWNvZGU7CiAKIEpTU3RyaW5nUmVmIEpTU3RyaW5nQ3JlYXRlV2l0aENoYXJhY3Rl cnMoY29uc3QgSlNDaGFyKiBjaGFycywgc2l6ZV90IG51bUNoYXJzKQogeworICAgIGluaXRpYWxp emVUaHJlYWRpbmcoKTsKICAgICByZXR1cm4gT3BhcXVlSlNTdHJpbmc6OmNyZWF0ZShjaGFycywg bnVtQ2hhcnMpLnJlbGVhc2VSZWYoKTsKIH0KIAogSlNTdHJpbmdSZWYgSlNTdHJpbmdDcmVhdGVX aXRoVVRGOENTdHJpbmcoY29uc3QgY2hhciogc3RyaW5nKQogeworICAgIGluaXRpYWxpemVUaHJl YWRpbmcoKTsKICAgICBpZiAoc3RyaW5nKSB7CiAgICAgICAgIHNpemVfdCBsZW5ndGggPSBzdHJs ZW4oc3RyaW5nKTsKICAgICAgICAgVmVjdG9yPFVDaGFyLCAxMDI0PiBidWZmZXIobGVuZ3RoKTsK ZGlmZiAtLWdpdCBhL0phdmFTY3JpcHRDb3JlL0FQSS9KU1N0cmluZ1JlZkNGLmNwcCBiL0phdmFT Y3JpcHRDb3JlL0FQSS9KU1N0cmluZ1JlZkNGLmNwcAppbmRleCA2NWVkZDA5Li4yYjhmZDllIDEw MDY0NAotLS0gYS9KYXZhU2NyaXB0Q29yZS9BUEkvSlNTdHJpbmdSZWZDRi5jcHAKKysrIGIvSmF2 YVNjcmlwdENvcmUvQVBJL0pTU3RyaW5nUmVmQ0YuY3BwCkBAIC0yNyw2ICsyNyw3IEBACiAjaW5j bHVkZSAiSlNTdHJpbmdSZWZDRi5oIgogCiAjaW5jbHVkZSAiQVBJQ2FzdC5oIgorI2luY2x1ZGUg IkluaXRpYWxpemVUaHJlYWRpbmcuaCIKICNpbmNsdWRlICJKU1N0cmluZ1JlZi5oIgogI2luY2x1 ZGUgIk9wYXF1ZUpTU3RyaW5nLmgiCiAjaW5jbHVkZSA8cnVudGltZS9VU3RyaW5nLmg+CkBAIC0z NSw2ICszNiw3IEBACiAKIEpTU3RyaW5nUmVmIEpTU3RyaW5nQ3JlYXRlV2l0aENGU3RyaW5nKENG U3RyaW5nUmVmIHN0cmluZykKIHsKKyAgICBKU0M6OmluaXRpYWxpemVUaHJlYWRpbmcoKTsKICAg ICBDRkluZGV4IGxlbmd0aCA9IENGU3RyaW5nR2V0TGVuZ3RoKHN0cmluZyk7CiAgICAgaWYgKGxl bmd0aCkgewogICAgICAgICBPd25BcnJheVB0cjxVbmlDaGFyPiBidWZmZXIobmV3IFVuaUNoYXJb bGVuZ3RoXSk7CkBAIC00NCw3ICs0Niw3IEBAIEpTU3RyaW5nUmVmIEpTU3RyaW5nQ3JlYXRlV2l0 aENGU3RyaW5nKENGU3RyaW5nUmVmIHN0cmluZykKICAgICB9IGVsc2UgewogICAgICAgICByZXR1 cm4gT3BhcXVlSlNTdHJpbmc6OmNyZWF0ZSgwLCAwKS5yZWxlYXNlUmVmKCk7CiAgICAgfQotICAg IH0KK30KIAogQ0ZTdHJpbmdSZWYgSlNTdHJpbmdDb3B5Q0ZTdHJpbmcoQ0ZBbGxvY2F0b3JSZWYg YWxsb2MsIEpTU3RyaW5nUmVmIHN0cmluZykKIHsKZGlmZiAtLWdpdCBhL0phdmFTY3JpcHRDb3Jl L0NoYW5nZUxvZyBiL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCA3OTE3NzgxLi5kN2Yx YjZjIDEwMDY0NAotLS0gYS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKKysrIGIvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjMgQEAKKzIwMDktMDEtMTEgIERhdmlkIExldmlu ICA8bGV2aW5AY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0y MzI0NQorCisgICAgICAgIEFkZCBpbml0aWFsaXplVGhyZWFkaW5nIHRvIGtleSBwbGFjZXMgaW4g SlMgQVBJIHRvIGVuc3VyZSB0aGF0CisgICAgICAgIFVTdHJpbmcgaXMgcHJvcGVybHkgaW5pdGlh bGl6ZWQuCisKKyAgICAgICAgKiBBUEkvSlNDb250ZXh0UmVmLmNwcDoKKyAgICAgICAgKEpTQ29u dGV4dEdyb3VwQ3JlYXRlKToKKyAgICAgICAgKEpTR2xvYmFsQ29udGV4dENyZWF0ZSk6CisgICAg ICAgICogQVBJL0pTT2JqZWN0UmVmLmNwcDoKKyAgICAgICAgKEpTQ2xhc3NDcmVhdGUpOgorICAg ICAgICAqIEFQSS9KU1N0cmluZ1JlZi5jcHA6CisgICAgICAgIChKU1N0cmluZ0NyZWF0ZVdpdGhD aGFyYWN0ZXJzKToKKyAgICAgICAgKEpTU3RyaW5nQ3JlYXRlV2l0aFVURjhDU3RyaW5nKToKKyAg ICAgICAgKiBBUEkvSlNTdHJpbmdSZWZDRi5jcHA6CisgICAgICAgIChKU1N0cmluZ0NyZWF0ZVdp dGhDRlN0cmluZyk6CisKIDIwMDktMDEtMTEgIE9saXZlciBIdW50ICA8b2xpdmVyQGFwcGxlLmNv bT4KIAogICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKEJ1aWxkIGZpeCkuCg==