23199 2009-01-08 16:25:29 -0800 WorkerThread shouldn't deref strings on the main thread that it used on the worker thread. 2009-01-09 01:42:42 -0800 1 1 1 Unclassified WebKit DOM 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 23175 1 levin levin levin oldest_to_newest 104959 0 levin 2009-01-08 16:25:29 -0800 Currently, WorkerThread::WorkerThread copies some Strings and a KURL for use on the worker thread. After passing them off to other objects in side of the worker thread (where they get ref/deref'ed), its destructor runs on the main thread and does a deref on these string there. This should mostly work, but there is a potential for some subtle race conditions to occur, so it would be good to clean them up on the WorkerThread. 104970 1 26548 levin 2009-01-08 16:58:50 -0800 Created attachment 26548 Patch for bug. 105008 2 26561 levin 2009-01-09 01:32:40 -0800 Created attachment 26561 Changed to a static create method (instead of using new directly) and added a comment. 105009 3 26562 levin 2009-01-09 01:36:08 -0800 Created attachment 26562 Diff form last version of the patch: I noticed a bad indentation in one place and fixed it. 105010 4 26562 ap 2009-01-09 01:41:03 -0800 Comment on attachment 26562 Diff form last version of the patch: I noticed a bad indentation in one place and fixed it. r=me A general comment, not for this patch: the prevalent style is to have "using namespace std", and avoid explicit namespace qualifiers. 105011 5 ap 2009-01-09 01:42:42 -0800 Committed revision 39740. 26548 2009-01-08 16:58:50 -0800 2009-01-09 01:32:40 -0800 Patch for bug. patch-for-bug23199.txt text/plain 4369 levin ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg N2FhOWRmNC4uZjc1Nzk2MyAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyMSBAQAorMjAwOS0wMS0wOCAgRGF2aWQgTGV2aW4g IDxsZXZpbkBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIz MTk5CisKKyAgICAgICAgRml4IGRlcmVmJ3Mgb2Ygc3RyaW5nIGhhcHBlbmluZyBvbiB0d28gZGlm ZmVyZW50IHRocmVhZHMuCisKKyAgICAgICAgTm8gb2JzZXJ2YWJsZSBjaGFuZ2UgaW4gYmVoYXZp b3IsIHNvIG5vIHRlc3QuICBIb3dldmVyLCB0aGVyZSBhcmUgYXNzZXJ0cworICAgICAgICBiZWlu ZyBhZGRlZCBmb3IgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzMTc1 IHdoaWNoCisgICAgICAgIHdpbGwgZGV0ZWN0IHRoaXMgaXNzdWUgd2hpbGUgcnVubmluZyB0aGUg bm9ybWFsIHdvcmtlciB0ZXN0cy4KKworICAgICAgICAqIGRvbS9Xb3JrZXJUaHJlYWQuY3BwOgor ICAgICAgICAoV2ViQ29yZTo6V29ya2VyVGhyZWFkU3RhcnR1cERhdGE6OldvcmtlclRocmVhZFN0 YXJ0dXBEYXRhKToKKyAgICAgICAgKFdlYkNvcmU6OldvcmtlclRocmVhZDo6V29ya2VyVGhyZWFk KToKKyAgICAgICAgKFdlYkNvcmU6OldvcmtlclRocmVhZDo6d29ya2VyVGhyZWFkKToKKyAgICAg ICAgKiBkb20vV29ya2VyVGhyZWFkLmg6CisKIDIwMDktMDEtMDcgIERhdmlkIExldmluICA8bGV2 aW5AY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgpk aWZmIC0tZ2l0IGEvV2ViQ29yZS9kb20vV29ya2VyVGhyZWFkLmNwcCBiL1dlYkNvcmUvZG9tL1dv cmtlclRocmVhZC5jcHAKaW5kZXggZTkxNDY2MS4uNjAxOTA1OSAxMDA2NDQKLS0tIGEvV2ViQ29y ZS9kb20vV29ya2VyVGhyZWFkLmNwcAorKysgYi9XZWJDb3JlL2RvbS9Xb3JrZXJUaHJlYWQuY3Bw CkBAIC0zMCw2ICszMCw4IEBACiAKICNpbmNsdWRlICJXb3JrZXJUaHJlYWQuaCIKIAorI2luY2x1 ZGUgIktVUkwuaCIKKyNpbmNsdWRlICJQbGF0Zm9ybVN0cmluZy5oIgogI2luY2x1ZGUgIlNjcmlw dFNvdXJjZUNvZGUuaCIKICNpbmNsdWRlICJTY3JpcHRWYWx1ZS5oIgogI2luY2x1ZGUgIldvcmtl ci5oIgpAQCAtMzcsNyArMzksMjIgQEAKICNpbmNsdWRlICJXb3JrZXJNZXNzYWdpbmdQcm94eS5o IgogI2luY2x1ZGUgIldvcmtlclRhc2suaCIKIAorI2luY2x1ZGUgPHd0Zi9Ob25jb3B5YWJsZS5o PgorCiBuYW1lc3BhY2UgV2ViQ29yZSB7CitzdHJ1Y3QgV29ya2VyVGhyZWFkU3RhcnR1cERhdGEg OiBOb25jb3B5YWJsZSB7CisgICAgV29ya2VyVGhyZWFkU3RhcnR1cERhdGEoY29uc3QgS1VSTCYg c2NyaXB0VVJMLCBjb25zdCBTdHJpbmcmIHVzZXJBZ2VudCwgY29uc3QgU3RyaW5nJiBzb3VyY2VD b2RlKTsKKyAgICBLVVJMIG1fc2NyaXB0VVJMOworICAgIFN0cmluZyBtX3VzZXJBZ2VudDsKKyAg ICBTdHJpbmcgbV9zb3VyY2VDb2RlOworfTsKKworV29ya2VyVGhyZWFkU3RhcnR1cERhdGE6Oldv cmtlclRocmVhZFN0YXJ0dXBEYXRhKGNvbnN0IEtVUkwmIHNjcmlwdFVSTCwgY29uc3QgU3RyaW5n JiB1c2VyQWdlbnQsIGNvbnN0IFN0cmluZyYgc291cmNlQ29kZSkKKyAgOiBtX3NjcmlwdFVSTChz Y3JpcHRVUkwuY29weSgpKQorICAsIG1fdXNlckFnZW50KHVzZXJBZ2VudC5jb3B5KCkpCisgICwg bV9zb3VyY2VDb2RlKHNvdXJjZUNvZGUuY29weSgpKQoreworfQogCiBQYXNzUmVmUHRyPFdvcmtl clRocmVhZD4gV29ya2VyVGhyZWFkOjpjcmVhdGUoY29uc3QgS1VSTCYgc2NyaXB0VVJMLCBjb25z dCBTdHJpbmcmIHVzZXJBZ2VudCwgY29uc3QgU3RyaW5nJiBzb3VyY2VDb2RlLCBXb3JrZXJNZXNz YWdpbmdQcm94eSogbWVzc2FnaW5nUHJveHkpCiB7CkBAIC00NiwxMCArNjMsOCBAQCBQYXNzUmVm UHRyPFdvcmtlclRocmVhZD4gV29ya2VyVGhyZWFkOjpjcmVhdGUoY29uc3QgS1VSTCYgc2NyaXB0 VVJMLCBjb25zdCBTdHJpbgogCiBXb3JrZXJUaHJlYWQ6OldvcmtlclRocmVhZChjb25zdCBLVVJM JiBzY3JpcHRVUkwsIGNvbnN0IFN0cmluZyYgdXNlckFnZW50LCBjb25zdCBTdHJpbmcmIHNvdXJj ZUNvZGUsIFdvcmtlck1lc3NhZ2luZ1Byb3h5KiBtZXNzYWdpbmdQcm94eSkKICAgICA6IG1fdGhy ZWFkSUQoMCkKLSAgICAsIG1fc2NyaXB0VVJMKHNjcmlwdFVSTC5jb3B5KCkpCi0gICAgLCBtX3Vz ZXJBZ2VudCh1c2VyQWdlbnQuY29weSgpKQotICAgICwgbV9zb3VyY2VDb2RlKHNvdXJjZUNvZGUu Y29weSgpKQogICAgICwgbV9tZXNzYWdpbmdQcm94eShtZXNzYWdpbmdQcm94eSkKKyAgICAsIG1f c3RhcnR1cERhdGEobmV3IFdvcmtlclRocmVhZFN0YXJ0dXBEYXRhKHNjcmlwdFVSTCwgdXNlckFn ZW50LCBzb3VyY2VDb2RlKSkKIHsKIH0KIApAQCAtNzksMTEgKzk0LDEyIEBAIHZvaWQqIFdvcmtl clRocmVhZDo6d29ya2VyVGhyZWFkKCkKIHsKICAgICB7CiAgICAgICAgIE11dGV4TG9ja2VyIGxv Y2sobV90aHJlYWRDcmVhdGlvbk11dGV4KTsKLSAgICAgICAgbV93b3JrZXJDb250ZXh0ID0gV29y a2VyQ29udGV4dDo6Y3JlYXRlKG1fc2NyaXB0VVJMLCBtX3VzZXJBZ2VudCwgdGhpcyk7CisgICAg ICAgIG1fd29ya2VyQ29udGV4dCA9IFdvcmtlckNvbnRleHQ6OmNyZWF0ZShtX3N0YXJ0dXBEYXRh LT5tX3NjcmlwdFVSTCwgbV9zdGFydHVwRGF0YS0+bV91c2VyQWdlbnQsIHRoaXMpOwogICAgIH0K IAogICAgIFdvcmtlclNjcmlwdENvbnRyb2xsZXIqIHNjcmlwdCA9IG1fd29ya2VyQ29udGV4dC0+ c2NyaXB0KCk7Ci0gICAgc2NyaXB0LT5ldmFsdWF0ZShTY3JpcHRTb3VyY2VDb2RlKG1fc291cmNl Q29kZSwgbV9zY3JpcHRVUkwpKTsKKyAgICBzY3JpcHQtPmV2YWx1YXRlKFNjcmlwdFNvdXJjZUNv ZGUobV9zdGFydHVwRGF0YS0+bV9zb3VyY2VDb2RlLCBtX3N0YXJ0dXBEYXRhLT5tX3NjcmlwdFVS TCkpOworICAgIG1fc3RhcnR1cERhdGEuY2xlYXIoKTsKICAgICBtX21lc3NhZ2luZ1Byb3h5LT5j b25maXJtV29ya2VyVGhyZWFkTWVzc2FnZShtX3dvcmtlckNvbnRleHQtPmhhc1BlbmRpbmdBY3Rp dml0eSgpKTsgLy8gVGhpcyB3YXNuJ3QgcmVhbGx5IGEgbWVzc2FnZSwgYnV0IGl0IGNvdW50cyBh cyBvbmUgZm9yIEdDLgogCiAgICAgd2hpbGUgKHRydWUpIHsKZGlmZiAtLWdpdCBhL1dlYkNvcmUv ZG9tL1dvcmtlclRocmVhZC5oIGIvV2ViQ29yZS9kb20vV29ya2VyVGhyZWFkLmgKaW5kZXggOTg4 NDFkMy4uMDdlM2U4YSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9kb20vV29ya2VyVGhyZWFkLmgKKysr IGIvV2ViQ29yZS9kb20vV29ya2VyVGhyZWFkLmgKQEAgLTI5LDE1ICsyOSwxOSBAQAogCiAjaWYg RU5BQkxFKFdPUktFUlMpCiAKLSNpbmNsdWRlICJLVVJMLmgiCiAjaW5jbHVkZSA8d3RmL01lc3Nh Z2VRdWV1ZS5oPgorI2luY2x1ZGUgPHd0Zi9Pd25QdHIuaD4KICNpbmNsdWRlIDx3dGYvUGFzc1Jl ZlB0ci5oPgorI2luY2x1ZGUgPHd0Zi9SZWZDb3VudGVkLmg+CiAKIG5hbWVzcGFjZSBXZWJDb3Jl IHsKIAorICAgIGNsYXNzIEtVUkw7CisgICAgY2xhc3MgU3RyaW5nOwogICAgIGNsYXNzIFdvcmtl ckNvbnRleHQ7CiAgICAgY2xhc3MgV29ya2VyTWVzc2FnaW5nUHJveHk7CiAgICAgY2xhc3MgV29y a2VyVGFzazsKKyAgICBjbGFzcyBXb3JrZXJUaHJlYWRTdGFydHVwRGF0YTsKIAogICAgIGNsYXNz IFdvcmtlclRocmVhZCA6IHB1YmxpYyBSZWZDb3VudGVkPFdvcmtlclRocmVhZD4gewogICAgIHB1 YmxpYzoKQEAgLTU5LDE2ICs2MywxMyBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAgICAgICAgIHZv aWQqIHdvcmtlclRocmVhZCgpOwogCiAgICAgICAgIFRocmVhZElkZW50aWZpZXIgbV90aHJlYWRJ RDsKLQotICAgICAgICBLVVJMIG1fc2NyaXB0VVJMOwotICAgICAgICBTdHJpbmcgbV91c2VyQWdl bnQ7Ci0gICAgICAgIFN0cmluZyBtX3NvdXJjZUNvZGU7CiAgICAgICAgIFdvcmtlck1lc3NhZ2lu Z1Byb3h5KiBtX21lc3NhZ2luZ1Byb3h5OwogCiAgICAgICAgIFJlZlB0cjxXb3JrZXJDb250ZXh0 PiBtX3dvcmtlckNvbnRleHQ7CiAgICAgICAgIE11dGV4IG1fdGhyZWFkQ3JlYXRpb25NdXRleDsK IAogICAgICAgICBNZXNzYWdlUXVldWU8UmVmUHRyPFdvcmtlclRhc2s+ID4gbV9tZXNzYWdlUXVl dWU7CisgICAgICAgIE93blB0cjxXb3JrZXJUaHJlYWRTdGFydHVwRGF0YT4gbV9zdGFydHVwRGF0 YTsKICAgICB9OwogCiB9IC8vIG5hbWVzcGFjZSBXZWJDb3JlCg== 26561 2009-01-09 01:32:40 -0800 2009-01-09 01:33:49 -0800 Changed to a static create method (instead of using new directly) and added a comment. patch-for-bug23199_rev2.txt text/plain 5021 levin ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg N2FhOWRmNC4uY2JhYTM4OCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyMiBAQAorMjAwOS0wMS0wOSAgRGF2aWQgTGV2aW4g IDxsZXZpbkBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIz MTk5CisKKyAgICAgICAgRml4IGRlcmVmJ3Mgb2Ygc3RyaW5nIGhhcHBlbmluZyBvbiB0d28gZGlm ZmVyZW50IHRocmVhZHMuCisKKyAgICAgICAgTm8gb2JzZXJ2YWJsZSBjaGFuZ2UgaW4gYmVoYXZp b3IsIHNvIG5vIHRlc3QuICBIb3dldmVyLCB0aGVyZSBhcmUgYXNzZXJ0cworICAgICAgICBiZWlu ZyBhZGRlZCBmb3IgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzMTc1 IHdoaWNoCisgICAgICAgIHdpbGwgZGV0ZWN0IHRoaXMgaXNzdWUgd2hpbGUgcnVubmluZyB0aGUg bm9ybWFsIHdvcmtlciB0ZXN0cy4KKworICAgICAgICAqIGRvbS9Xb3JrZXJUaHJlYWQuY3BwOgor ICAgICAgICAoV2ViQ29yZTo6V29ya2VyVGhyZWFkU3RhcnR1cERhdGE6OmNyZWF0ZSk6CisgICAg ICAgIChXZWJDb3JlOjpXb3JrZXJUaHJlYWRTdGFydHVwRGF0YTo6V29ya2VyVGhyZWFkU3RhcnR1 cERhdGEpOgorICAgICAgICAoV2ViQ29yZTo6V29ya2VyVGhyZWFkOjpXb3JrZXJUaHJlYWQpOgor ICAgICAgICAoV2ViQ29yZTo6V29ya2VyVGhyZWFkOjp3b3JrZXJUaHJlYWQpOgorICAgICAgICAq IGRvbS9Xb3JrZXJUaHJlYWQuaDoKKwogMjAwOS0wMS0wNyAgRGF2aWQgTGV2aW4gIDxsZXZpbkBj aHJvbWl1bS5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCmRpZmYg LS1naXQgYS9XZWJDb3JlL2RvbS9Xb3JrZXJUaHJlYWQuY3BwIGIvV2ViQ29yZS9kb20vV29ya2Vy VGhyZWFkLmNwcAppbmRleCBlOTE0NjYxLi5kYWFiYWQ3IDEwMDY0NAotLS0gYS9XZWJDb3JlL2Rv bS9Xb3JrZXJUaHJlYWQuY3BwCisrKyBiL1dlYkNvcmUvZG9tL1dvcmtlclRocmVhZC5jcHAKQEAg LTMwLDYgKzMwLDggQEAKIAogI2luY2x1ZGUgIldvcmtlclRocmVhZC5oIgogCisjaW5jbHVkZSAi S1VSTC5oIgorI2luY2x1ZGUgIlBsYXRmb3JtU3RyaW5nLmgiCiAjaW5jbHVkZSAiU2NyaXB0U291 cmNlQ29kZS5oIgogI2luY2x1ZGUgIlNjcmlwdFZhbHVlLmgiCiAjaW5jbHVkZSAiV29ya2VyLmgi CkBAIC0zNyw3ICszOSwzMCBAQAogI2luY2x1ZGUgIldvcmtlck1lc3NhZ2luZ1Byb3h5LmgiCiAj aW5jbHVkZSAiV29ya2VyVGFzay5oIgogCisjaW5jbHVkZSA8dXRpbGl0eT4KKyNpbmNsdWRlIDx3 dGYvTm9uY29weWFibGUuaD4KKwogbmFtZXNwYWNlIFdlYkNvcmUgeworc3RydWN0IFdvcmtlclRo cmVhZFN0YXJ0dXBEYXRhIDogTm9uY29weWFibGUgeworcHVibGljOgorICAgIHN0YXRpYyBzdGQ6 OmF1dG9fcHRyPFdvcmtlclRocmVhZFN0YXJ0dXBEYXRhPiBjcmVhdGUoY29uc3QgS1VSTCYgc2Ny aXB0VVJMLCBjb25zdCBTdHJpbmcmIHVzZXJBZ2VudCwgY29uc3QgU3RyaW5nJiBzb3VyY2VDb2Rl KQorICAgIHsKKyAgICAgICAgcmV0dXJuIHN0ZDo6YXV0b19wdHI8V29ya2VyVGhyZWFkU3RhcnR1 cERhdGE+KG5ldyBXb3JrZXJUaHJlYWRTdGFydHVwRGF0YShzY3JpcHRVUkwsIHVzZXJBZ2VudCwg c291cmNlQ29kZSkpOworICAgIH0KKworICAgIEtVUkwgbV9zY3JpcHRVUkw7CisgICAgU3RyaW5n IG1fdXNlckFnZW50OworICAgIFN0cmluZyBtX3NvdXJjZUNvZGU7Citwcml2YXRlOgorICAgIFdv cmtlclRocmVhZFN0YXJ0dXBEYXRhKGNvbnN0IEtVUkwmIHNjcmlwdFVSTCwgY29uc3QgU3RyaW5n JiB1c2VyQWdlbnQsIGNvbnN0IFN0cmluZyYgc291cmNlQ29kZSk7Cit9OworCitXb3JrZXJUaHJl YWRTdGFydHVwRGF0YTo6V29ya2VyVGhyZWFkU3RhcnR1cERhdGEoY29uc3QgS1VSTCYgc2NyaXB0 VVJMLCBjb25zdCBTdHJpbmcmIHVzZXJBZ2VudCwgY29uc3QgU3RyaW5nJiBzb3VyY2VDb2RlKQor ICA6IG1fc2NyaXB0VVJMKHNjcmlwdFVSTC5jb3B5KCkpCisgICwgbV91c2VyQWdlbnQodXNlckFn ZW50LmNvcHkoKSkKKyAgLCBtX3NvdXJjZUNvZGUoc291cmNlQ29kZS5jb3B5KCkpCit7Cit9CiAK IFBhc3NSZWZQdHI8V29ya2VyVGhyZWFkPiBXb3JrZXJUaHJlYWQ6OmNyZWF0ZShjb25zdCBLVVJM JiBzY3JpcHRVUkwsIGNvbnN0IFN0cmluZyYgdXNlckFnZW50LCBjb25zdCBTdHJpbmcmIHNvdXJj ZUNvZGUsIFdvcmtlck1lc3NhZ2luZ1Byb3h5KiBtZXNzYWdpbmdQcm94eSkKIHsKQEAgLTQ2LDEw ICs3MSw4IEBAIFBhc3NSZWZQdHI8V29ya2VyVGhyZWFkPiBXb3JrZXJUaHJlYWQ6OmNyZWF0ZShj b25zdCBLVVJMJiBzY3JpcHRVUkwsIGNvbnN0IFN0cmluCiAKIFdvcmtlclRocmVhZDo6V29ya2Vy VGhyZWFkKGNvbnN0IEtVUkwmIHNjcmlwdFVSTCwgY29uc3QgU3RyaW5nJiB1c2VyQWdlbnQsIGNv bnN0IFN0cmluZyYgc291cmNlQ29kZSwgV29ya2VyTWVzc2FnaW5nUHJveHkqIG1lc3NhZ2luZ1By b3h5KQogICAgIDogbV90aHJlYWRJRCgwKQotICAgICwgbV9zY3JpcHRVUkwoc2NyaXB0VVJMLmNv cHkoKSkKLSAgICAsIG1fdXNlckFnZW50KHVzZXJBZ2VudC5jb3B5KCkpCi0gICAgLCBtX3NvdXJj ZUNvZGUoc291cmNlQ29kZS5jb3B5KCkpCiAgICAgLCBtX21lc3NhZ2luZ1Byb3h5KG1lc3NhZ2lu Z1Byb3h5KQorICAgICwgbV9zdGFydHVwRGF0YShXb3JrZXJUaHJlYWRTdGFydHVwRGF0YTo6Y3Jl YXRlKHNjcmlwdFVSTCwgdXNlckFnZW50LCBzb3VyY2VDb2RlKSkKIHsKIH0KIApAQCAtNzksMTEg KzEwMiwxNiBAQCB2b2lkKiBXb3JrZXJUaHJlYWQ6OndvcmtlclRocmVhZCgpCiB7CiAgICAgewog ICAgICAgICBNdXRleExvY2tlciBsb2NrKG1fdGhyZWFkQ3JlYXRpb25NdXRleCk7Ci0gICAgICAg IG1fd29ya2VyQ29udGV4dCA9IFdvcmtlckNvbnRleHQ6OmNyZWF0ZShtX3NjcmlwdFVSTCwgbV91 c2VyQWdlbnQsIHRoaXMpOworICAgICAgICBtX3dvcmtlckNvbnRleHQgPSBXb3JrZXJDb250ZXh0 OjpjcmVhdGUobV9zdGFydHVwRGF0YS0+bV9zY3JpcHRVUkwsIG1fc3RhcnR1cERhdGEtPm1fdXNl ckFnZW50LCB0aGlzKTsKICAgICB9CiAKICAgICBXb3JrZXJTY3JpcHRDb250cm9sbGVyKiBzY3Jp cHQgPSBtX3dvcmtlckNvbnRleHQtPnNjcmlwdCgpOwotICAgIHNjcmlwdC0+ZXZhbHVhdGUoU2Ny aXB0U291cmNlQ29kZShtX3NvdXJjZUNvZGUsIG1fc2NyaXB0VVJMKSk7CisgICAgc2NyaXB0LT5l dmFsdWF0ZShTY3JpcHRTb3VyY2VDb2RlKG1fc3RhcnR1cERhdGEtPm1fc291cmNlQ29kZSwgbV9z dGFydHVwRGF0YS0+bV9zY3JpcHRVUkwpKTsKKyAgICAvLyBGcmVlIHRoZSBzdGFydHVwIGRhdGEg dG8gY2F1c2UgaXRzIG1lbWJlciB2YXJpYWJsZSBkZXJlZidzIGhhcHBlbiBvbiB0aGUgd29ya2Vy J3MgdGhyZWFkIChzaW5jZQorICAgIC8vIGFsbCByZWYvZGVyZWZzIG9mIHRoZXNlIG9iamVjdHMg YXJlIGhhcHBlbmluZyBvbiB0aGUgdGhyZWFkIGF0IHRoaXMgcG9pbnQpLiBOb3RlIHRoYXQKKyAg ICAvLyBXb3JrZXJUaHJlYWQ6On5Xb3JrZXJUaHJlYWQgaGFwcGVucyBvbiBhIGRpZmZlcmVudCB0 aHJlYWQgd2hlcmUgaXQgd2FzIGNyZWF0ZWQuCisgICAgbV9zdGFydHVwRGF0YS5jbGVhcigpOwor CiAgICAgbV9tZXNzYWdpbmdQcm94eS0+Y29uZmlybVdvcmtlclRocmVhZE1lc3NhZ2UobV93b3Jr ZXJDb250ZXh0LT5oYXNQZW5kaW5nQWN0aXZpdHkoKSk7IC8vIFRoaXMgd2Fzbid0IHJlYWxseSBh IG1lc3NhZ2UsIGJ1dCBpdCBjb3VudHMgYXMgb25lIGZvciBHQy4KIAogICAgIHdoaWxlICh0cnVl KSB7CmRpZmYgLS1naXQgYS9XZWJDb3JlL2RvbS9Xb3JrZXJUaHJlYWQuaCBiL1dlYkNvcmUvZG9t L1dvcmtlclRocmVhZC5oCmluZGV4IDk4ODQxZDMuLjA3ZTNlOGEgMTAwNjQ0Ci0tLSBhL1dlYkNv cmUvZG9tL1dvcmtlclRocmVhZC5oCisrKyBiL1dlYkNvcmUvZG9tL1dvcmtlclRocmVhZC5oCkBA IC0yOSwxNSArMjksMTkgQEAKIAogI2lmIEVOQUJMRShXT1JLRVJTKQogCi0jaW5jbHVkZSAiS1VS TC5oIgogI2luY2x1ZGUgPHd0Zi9NZXNzYWdlUXVldWUuaD4KKyNpbmNsdWRlIDx3dGYvT3duUHRy Lmg+CiAjaW5jbHVkZSA8d3RmL1Bhc3NSZWZQdHIuaD4KKyNpbmNsdWRlIDx3dGYvUmVmQ291bnRl ZC5oPgogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKKyAgICBjbGFzcyBLVVJMOworICAgIGNsYXNz IFN0cmluZzsKICAgICBjbGFzcyBXb3JrZXJDb250ZXh0OwogICAgIGNsYXNzIFdvcmtlck1lc3Nh Z2luZ1Byb3h5OwogICAgIGNsYXNzIFdvcmtlclRhc2s7CisgICAgY2xhc3MgV29ya2VyVGhyZWFk U3RhcnR1cERhdGE7CiAKICAgICBjbGFzcyBXb3JrZXJUaHJlYWQgOiBwdWJsaWMgUmVmQ291bnRl ZDxXb3JrZXJUaHJlYWQ+IHsKICAgICBwdWJsaWM6CkBAIC01OSwxNiArNjMsMTMgQEAgbmFtZXNw YWNlIFdlYkNvcmUgewogICAgICAgICB2b2lkKiB3b3JrZXJUaHJlYWQoKTsKIAogICAgICAgICBU aHJlYWRJZGVudGlmaWVyIG1fdGhyZWFkSUQ7Ci0KLSAgICAgICAgS1VSTCBtX3NjcmlwdFVSTDsK LSAgICAgICAgU3RyaW5nIG1fdXNlckFnZW50OwotICAgICAgICBTdHJpbmcgbV9zb3VyY2VDb2Rl OwogICAgICAgICBXb3JrZXJNZXNzYWdpbmdQcm94eSogbV9tZXNzYWdpbmdQcm94eTsKIAogICAg ICAgICBSZWZQdHI8V29ya2VyQ29udGV4dD4gbV93b3JrZXJDb250ZXh0OwogICAgICAgICBNdXRl eCBtX3RocmVhZENyZWF0aW9uTXV0ZXg7CiAKICAgICAgICAgTWVzc2FnZVF1ZXVlPFJlZlB0cjxX b3JrZXJUYXNrPiA+IG1fbWVzc2FnZVF1ZXVlOworICAgICAgICBPd25QdHI8V29ya2VyVGhyZWFk U3RhcnR1cERhdGE+IG1fc3RhcnR1cERhdGE7CiAgICAgfTsKIAogfSAvLyBuYW1lc3BhY2UgV2Vi Q29yZQo= 26562 2009-01-09 01:36:08 -0800 2009-01-09 01:41:03 -0800 Diff form last version of the patch: I noticed a bad indentation in one place and fixed it. patch-for-bug23199_rev2.txt text/plain 5027 levin ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg N2FhOWRmNC4uY2JhYTM4OCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyMiBAQAorMjAwOS0wMS0wOSAgRGF2aWQgTGV2aW4g IDxsZXZpbkBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIz MTk5CisKKyAgICAgICAgRml4IGRlcmVmJ3Mgb2Ygc3RyaW5nIGhhcHBlbmluZyBvbiB0d28gZGlm ZmVyZW50IHRocmVhZHMuCisKKyAgICAgICAgTm8gb2JzZXJ2YWJsZSBjaGFuZ2UgaW4gYmVoYXZp b3IsIHNvIG5vIHRlc3QuICBIb3dldmVyLCB0aGVyZSBhcmUgYXNzZXJ0cworICAgICAgICBiZWlu ZyBhZGRlZCBmb3IgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzMTc1 IHdoaWNoCisgICAgICAgIHdpbGwgZGV0ZWN0IHRoaXMgaXNzdWUgd2hpbGUgcnVubmluZyB0aGUg bm9ybWFsIHdvcmtlciB0ZXN0cy4KKworICAgICAgICAqIGRvbS9Xb3JrZXJUaHJlYWQuY3BwOgor ICAgICAgICAoV2ViQ29yZTo6V29ya2VyVGhyZWFkU3RhcnR1cERhdGE6OmNyZWF0ZSk6CisgICAg ICAgIChXZWJDb3JlOjpXb3JrZXJUaHJlYWRTdGFydHVwRGF0YTo6V29ya2VyVGhyZWFkU3RhcnR1 cERhdGEpOgorICAgICAgICAoV2ViQ29yZTo6V29ya2VyVGhyZWFkOjpXb3JrZXJUaHJlYWQpOgor ICAgICAgICAoV2ViQ29yZTo6V29ya2VyVGhyZWFkOjp3b3JrZXJUaHJlYWQpOgorICAgICAgICAq IGRvbS9Xb3JrZXJUaHJlYWQuaDoKKwogMjAwOS0wMS0wNyAgRGF2aWQgTGV2aW4gIDxsZXZpbkBj aHJvbWl1bS5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCmRpZmYg LS1naXQgYS9XZWJDb3JlL2RvbS9Xb3JrZXJUaHJlYWQuY3BwIGIvV2ViQ29yZS9kb20vV29ya2Vy VGhyZWFkLmNwcAppbmRleCBlOTE0NjYxLi5kMmM0OTMzIDEwMDY0NAotLS0gYS9XZWJDb3JlL2Rv bS9Xb3JrZXJUaHJlYWQuY3BwCisrKyBiL1dlYkNvcmUvZG9tL1dvcmtlclRocmVhZC5jcHAKQEAg LTMwLDYgKzMwLDggQEAKIAogI2luY2x1ZGUgIldvcmtlclRocmVhZC5oIgogCisjaW5jbHVkZSAi S1VSTC5oIgorI2luY2x1ZGUgIlBsYXRmb3JtU3RyaW5nLmgiCiAjaW5jbHVkZSAiU2NyaXB0U291 cmNlQ29kZS5oIgogI2luY2x1ZGUgIlNjcmlwdFZhbHVlLmgiCiAjaW5jbHVkZSAiV29ya2VyLmgi CkBAIC0zNyw3ICszOSwzMCBAQAogI2luY2x1ZGUgIldvcmtlck1lc3NhZ2luZ1Byb3h5LmgiCiAj aW5jbHVkZSAiV29ya2VyVGFzay5oIgogCisjaW5jbHVkZSA8dXRpbGl0eT4KKyNpbmNsdWRlIDx3 dGYvTm9uY29weWFibGUuaD4KKwogbmFtZXNwYWNlIFdlYkNvcmUgeworc3RydWN0IFdvcmtlclRo cmVhZFN0YXJ0dXBEYXRhIDogTm9uY29weWFibGUgeworcHVibGljOgorICAgIHN0YXRpYyBzdGQ6 OmF1dG9fcHRyPFdvcmtlclRocmVhZFN0YXJ0dXBEYXRhPiBjcmVhdGUoY29uc3QgS1VSTCYgc2Ny aXB0VVJMLCBjb25zdCBTdHJpbmcmIHVzZXJBZ2VudCwgY29uc3QgU3RyaW5nJiBzb3VyY2VDb2Rl KQorICAgIHsKKyAgICAgICAgcmV0dXJuIHN0ZDo6YXV0b19wdHI8V29ya2VyVGhyZWFkU3RhcnR1 cERhdGE+KG5ldyBXb3JrZXJUaHJlYWRTdGFydHVwRGF0YShzY3JpcHRVUkwsIHVzZXJBZ2VudCwg c291cmNlQ29kZSkpOworICAgIH0KKworICAgIEtVUkwgbV9zY3JpcHRVUkw7CisgICAgU3RyaW5n IG1fdXNlckFnZW50OworICAgIFN0cmluZyBtX3NvdXJjZUNvZGU7Citwcml2YXRlOgorICAgIFdv cmtlclRocmVhZFN0YXJ0dXBEYXRhKGNvbnN0IEtVUkwmIHNjcmlwdFVSTCwgY29uc3QgU3RyaW5n JiB1c2VyQWdlbnQsIGNvbnN0IFN0cmluZyYgc291cmNlQ29kZSk7Cit9OworCitXb3JrZXJUaHJl YWRTdGFydHVwRGF0YTo6V29ya2VyVGhyZWFkU3RhcnR1cERhdGEoY29uc3QgS1VSTCYgc2NyaXB0 VVJMLCBjb25zdCBTdHJpbmcmIHVzZXJBZ2VudCwgY29uc3QgU3RyaW5nJiBzb3VyY2VDb2RlKQor ICAgIDogbV9zY3JpcHRVUkwoc2NyaXB0VVJMLmNvcHkoKSkKKyAgICAsIG1fdXNlckFnZW50KHVz ZXJBZ2VudC5jb3B5KCkpCisgICAgLCBtX3NvdXJjZUNvZGUoc291cmNlQ29kZS5jb3B5KCkpCit7 Cit9CiAKIFBhc3NSZWZQdHI8V29ya2VyVGhyZWFkPiBXb3JrZXJUaHJlYWQ6OmNyZWF0ZShjb25z dCBLVVJMJiBzY3JpcHRVUkwsIGNvbnN0IFN0cmluZyYgdXNlckFnZW50LCBjb25zdCBTdHJpbmcm IHNvdXJjZUNvZGUsIFdvcmtlck1lc3NhZ2luZ1Byb3h5KiBtZXNzYWdpbmdQcm94eSkKIHsKQEAg LTQ2LDEwICs3MSw4IEBAIFBhc3NSZWZQdHI8V29ya2VyVGhyZWFkPiBXb3JrZXJUaHJlYWQ6OmNy ZWF0ZShjb25zdCBLVVJMJiBzY3JpcHRVUkwsIGNvbnN0IFN0cmluCiAKIFdvcmtlclRocmVhZDo6 V29ya2VyVGhyZWFkKGNvbnN0IEtVUkwmIHNjcmlwdFVSTCwgY29uc3QgU3RyaW5nJiB1c2VyQWdl bnQsIGNvbnN0IFN0cmluZyYgc291cmNlQ29kZSwgV29ya2VyTWVzc2FnaW5nUHJveHkqIG1lc3Nh Z2luZ1Byb3h5KQogICAgIDogbV90aHJlYWRJRCgwKQotICAgICwgbV9zY3JpcHRVUkwoc2NyaXB0 VVJMLmNvcHkoKSkKLSAgICAsIG1fdXNlckFnZW50KHVzZXJBZ2VudC5jb3B5KCkpCi0gICAgLCBt X3NvdXJjZUNvZGUoc291cmNlQ29kZS5jb3B5KCkpCiAgICAgLCBtX21lc3NhZ2luZ1Byb3h5KG1l c3NhZ2luZ1Byb3h5KQorICAgICwgbV9zdGFydHVwRGF0YShXb3JrZXJUaHJlYWRTdGFydHVwRGF0 YTo6Y3JlYXRlKHNjcmlwdFVSTCwgdXNlckFnZW50LCBzb3VyY2VDb2RlKSkKIHsKIH0KIApAQCAt NzksMTEgKzEwMiwxNiBAQCB2b2lkKiBXb3JrZXJUaHJlYWQ6OndvcmtlclRocmVhZCgpCiB7CiAg ICAgewogICAgICAgICBNdXRleExvY2tlciBsb2NrKG1fdGhyZWFkQ3JlYXRpb25NdXRleCk7Ci0g ICAgICAgIG1fd29ya2VyQ29udGV4dCA9IFdvcmtlckNvbnRleHQ6OmNyZWF0ZShtX3NjcmlwdFVS TCwgbV91c2VyQWdlbnQsIHRoaXMpOworICAgICAgICBtX3dvcmtlckNvbnRleHQgPSBXb3JrZXJD b250ZXh0OjpjcmVhdGUobV9zdGFydHVwRGF0YS0+bV9zY3JpcHRVUkwsIG1fc3RhcnR1cERhdGEt Pm1fdXNlckFnZW50LCB0aGlzKTsKICAgICB9CiAKICAgICBXb3JrZXJTY3JpcHRDb250cm9sbGVy KiBzY3JpcHQgPSBtX3dvcmtlckNvbnRleHQtPnNjcmlwdCgpOwotICAgIHNjcmlwdC0+ZXZhbHVh dGUoU2NyaXB0U291cmNlQ29kZShtX3NvdXJjZUNvZGUsIG1fc2NyaXB0VVJMKSk7CisgICAgc2Ny aXB0LT5ldmFsdWF0ZShTY3JpcHRTb3VyY2VDb2RlKG1fc3RhcnR1cERhdGEtPm1fc291cmNlQ29k ZSwgbV9zdGFydHVwRGF0YS0+bV9zY3JpcHRVUkwpKTsKKyAgICAvLyBGcmVlIHRoZSBzdGFydHVw IGRhdGEgdG8gY2F1c2UgaXRzIG1lbWJlciB2YXJpYWJsZSBkZXJlZidzIGhhcHBlbiBvbiB0aGUg d29ya2VyJ3MgdGhyZWFkIChzaW5jZQorICAgIC8vIGFsbCByZWYvZGVyZWZzIG9mIHRoZXNlIG9i amVjdHMgYXJlIGhhcHBlbmluZyBvbiB0aGUgdGhyZWFkIGF0IHRoaXMgcG9pbnQpLiBOb3RlIHRo YXQKKyAgICAvLyBXb3JrZXJUaHJlYWQ6On5Xb3JrZXJUaHJlYWQgaGFwcGVucyBvbiBhIGRpZmZl cmVudCB0aHJlYWQgd2hlcmUgaXQgd2FzIGNyZWF0ZWQuCisgICAgbV9zdGFydHVwRGF0YS5jbGVh cigpOworCiAgICAgbV9tZXNzYWdpbmdQcm94eS0+Y29uZmlybVdvcmtlclRocmVhZE1lc3NhZ2Uo bV93b3JrZXJDb250ZXh0LT5oYXNQZW5kaW5nQWN0aXZpdHkoKSk7IC8vIFRoaXMgd2Fzbid0IHJl YWxseSBhIG1lc3NhZ2UsIGJ1dCBpdCBjb3VudHMgYXMgb25lIGZvciBHQy4KIAogICAgIHdoaWxl ICh0cnVlKSB7CmRpZmYgLS1naXQgYS9XZWJDb3JlL2RvbS9Xb3JrZXJUaHJlYWQuaCBiL1dlYkNv cmUvZG9tL1dvcmtlclRocmVhZC5oCmluZGV4IDk4ODQxZDMuLjA3ZTNlOGEgMTAwNjQ0Ci0tLSBh L1dlYkNvcmUvZG9tL1dvcmtlclRocmVhZC5oCisrKyBiL1dlYkNvcmUvZG9tL1dvcmtlclRocmVh ZC5oCkBAIC0yOSwxNSArMjksMTkgQEAKIAogI2lmIEVOQUJMRShXT1JLRVJTKQogCi0jaW5jbHVk ZSAiS1VSTC5oIgogI2luY2x1ZGUgPHd0Zi9NZXNzYWdlUXVldWUuaD4KKyNpbmNsdWRlIDx3dGYv T3duUHRyLmg+CiAjaW5jbHVkZSA8d3RmL1Bhc3NSZWZQdHIuaD4KKyNpbmNsdWRlIDx3dGYvUmVm Q291bnRlZC5oPgogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKKyAgICBjbGFzcyBLVVJMOworICAg IGNsYXNzIFN0cmluZzsKICAgICBjbGFzcyBXb3JrZXJDb250ZXh0OwogICAgIGNsYXNzIFdvcmtl ck1lc3NhZ2luZ1Byb3h5OwogICAgIGNsYXNzIFdvcmtlclRhc2s7CisgICAgY2xhc3MgV29ya2Vy VGhyZWFkU3RhcnR1cERhdGE7CiAKICAgICBjbGFzcyBXb3JrZXJUaHJlYWQgOiBwdWJsaWMgUmVm Q291bnRlZDxXb3JrZXJUaHJlYWQ+IHsKICAgICBwdWJsaWM6CkBAIC01OSwxNiArNjMsMTMgQEAg bmFtZXNwYWNlIFdlYkNvcmUgewogICAgICAgICB2b2lkKiB3b3JrZXJUaHJlYWQoKTsKIAogICAg ICAgICBUaHJlYWRJZGVudGlmaWVyIG1fdGhyZWFkSUQ7Ci0KLSAgICAgICAgS1VSTCBtX3Njcmlw dFVSTDsKLSAgICAgICAgU3RyaW5nIG1fdXNlckFnZW50OwotICAgICAgICBTdHJpbmcgbV9zb3Vy Y2VDb2RlOwogICAgICAgICBXb3JrZXJNZXNzYWdpbmdQcm94eSogbV9tZXNzYWdpbmdQcm94eTsK IAogICAgICAgICBSZWZQdHI8V29ya2VyQ29udGV4dD4gbV93b3JrZXJDb250ZXh0OwogICAgICAg ICBNdXRleCBtX3RocmVhZENyZWF0aW9uTXV0ZXg7CiAKICAgICAgICAgTWVzc2FnZVF1ZXVlPFJl ZlB0cjxXb3JrZXJUYXNrPiA+IG1fbWVzc2FnZVF1ZXVlOworICAgICAgICBPd25QdHI8V29ya2Vy VGhyZWFkU3RhcnR1cERhdGE+IG1fc3RhcnR1cERhdGE7CiAgICAgfTsKIAogfSAvLyBuYW1lc3Bh Y2UgV2ViQ29yZQo=