31681 2009-11-19 13:30:40 -0800 [Qt] Wrong runtime instance objects of wrapped QObjects may be used if the wrapped object died before the gc removed the instance. 2009-11-23 04:58:45 -0800 1 1 1 Unclassified WebKit WebKit Qt 420+ PC Windows XP RESOLVED FIXED P2 Major --- 1 yoann.lopes hausmann commit-queue hausmann kenneth yoann.lopes oldest_to_newest 165074 0 43519 yoann.lopes 2009-11-19 13:30:40 -0800 Created attachment 43519 Bug example A bug occurs when a new Object is made available to javascript (addToJavascriptWindowObject) and when this new object is at the same address in memory than a previously deleted object (which one was also made available to javascript at some point). In that case, a javascript exception is raised saying that you are trying to access a deleted object, when actually the object that you are trying to access is not deleted. (It just raises that exception because the new object occupies a memory address that has been previously marked as deleted). Bug spotted using Qt 4.5.1 I attach to this report a small example illustrating the bug. 165727 1 hausmann 2009-11-22 09:27:21 -0800 ACK. This may be fixable inside QtInstance::getQtInstance 165728 2 43682 hausmann 2009-11-22 09:30:22 -0800 Created attachment 43682 Potential fix, without changelog and testcase. Yoann, can you try the attached patch? It shouldn't be too hard to turn your testcase into a unit test. Want to have a go at it? :) 165743 3 kenneth 2009-11-22 11:21:23 -0800 I guess it would be nice with some comments in the code as well. 165818 4 43702 hausmann 2009-11-23 04:27:22 -0800 Created attachment 43702 Patch 165819 5 yoann.lopes 2009-11-23 04:37:54 -0800 Just tried the patch, it works just fine now :) 165820 6 43702 commit-queue 2009-11-23 04:58:39 -0800 Comment on attachment 43702 Patch Clearing flags on attachment: 43702 Committed r51306: <http://trac.webkit.org/changeset/51306> 165821 7 commit-queue 2009-11-23 04:58:45 -0800 All reviewed patches have been landed. Closing bug. 43519 2009-11-19 13:30:40 -0800 2009-11-19 13:30:40 -0800 Bug example bugqtinstance.tar application/x-tar 6144 yoann.lopes YnVncXRpbnN0YW5jZS8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAgIDc3NyAAICAgICAw IAAgICAgIDAgACAgICAgICAgICAwIDExMzAxMzM0MDcwICAgNjY3MCAANQAAAAAAAAAAAAAAAAAA AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABi dWdxdGluc3RhbmNlL21haW4uY3BwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAICAgNzc3IAAgICAgIDAg ACAgICAgMCAAICAgICAgICA2MTQgMTEzMDEzMzM1NjIgIDEwMzcxIAAwAAAAAAAAAAAAAAAAAAAA AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACNp bmNsdWRlIDxRdEd1aS9RQXBwbGljYXRpb24+DQojaW5jbHVkZSA8UXRXZWJraXQvUVdlYlZpZXc+ DQojaW5jbHVkZSA8UXRXZWJraXQvUVdlYkZyYW1lPg0KDQojaW5jbHVkZSAidGVzdG9iamVjdC5o Ig0KDQppbnQgbWFpbihpbnQgYXJnYywgY2hhciAqYXJndltdKQ0Kew0KICAgIFFBcHBsaWNhdGlv biBhKGFyZ2MsIGFyZ3YpOw0KDQogICAgUVdlYlZpZXcgd3Y7DQoNCiAgICB3di5sb2FkKFFVcmwo Ii4uL3Rlc3QuaHRtbCIpKTsNCiAgICB3di5zaG93KCk7DQoNCiAgICBUZXN0T2JqZWN0IHRlc3Q7 DQogICAgd3YucGFnZSgpLT5jdXJyZW50RnJhbWUoKS0+YWRkVG9KYXZhU2NyaXB0V2luZG93T2Jq ZWN0KCJ0ZXN0IiwgJnRlc3QpOw0KICAgIA0KICAgIHJldHVybiBhLmV4ZWMoKTsNCn0NCgAAAAAA AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAYnVn cXRpbnN0YW5jZS90ZXN0Lmh0bWwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAgIDc3NyAAICAgICAwIAAg ICAgIDAgACAgICAgICAgNjAxIDExMzAxMzMzNDYxICAxMDYwMCAAMAAAAAAAAAAAAAAAAAAAAAAA AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA8aHRt bD4NCg0KPHNjcmlwdD4NCmZ1bmN0aW9uIG1ha2VJdEJ1ZygpDQp7DQoJdHJ5DQoJew0KCQlkb2N1 bWVudC5nZXRFbGVtZW50QnlJZCgnc3BhbjEnKS5pbm5lckhUTUwgPSB0ZXN0LmdldE5ld09iamVj dCgpLm9iamVjdE5hbWU7DQoJfQ0KCWNhdGNoKGUpDQoJew0KCQlkb2N1bWVudC5nZXRFbGVtZW50 QnlJZCgnc3BhbjEnKS5pbm5lckhUTUwgPSBlLm1lc3NhZ2U7DQoJfQ0KfQ0KPC9zY3JpcHQ+DQoN Cjxib2R5IG9ubG9hZD0nbWFrZUl0QnVnKCknPg0KPHNwYW4gaWQ9J3NwYW4xJz48L3NwYW4+DQo8 YnIgLz48YnIgLz4NCjxidXR0b24gb25jbGljaz0nbWFrZUl0QnVnKCknPkNsaWNrIG1lIHRvIG1h a2UgaXQgYnVnITwvYnV0dG9uPg0KPC9ib2R5Pg0KDQo8L2h0bWw+AAAAAAAAAAAAAAAAAAAAAAAA AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGJ1Z3F0 aW5zdGFuY2UvdGVzdC5wcm8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgICA3NzcgACAgICAgMCAAICAg ICAwIAAgICAgICAgIDQ0MiAxMTMwMTMzMzA1MiAgMTA0MzMgADAAAAAAAAAAAAAAAAAAAAAAAAAA AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIyAtLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tDQojIFByb2plY3Qg Y3JlYXRlZCBieSBRdENyZWF0b3IgMjAwOS0xMS0xOVQxOToyNjo0OA0KIyAtLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tDQpRVCArPSB3ZWJraXQNClRBUkdF VCA9IHRlc3QNCkNPTkZJRyArPSBjb25zb2xlDQpDT05GSUcgLT0gYXBwX2J1bmRsZQ0KVEVNUExB VEUgPSBhcHANClNPVVJDRVMgKz0gbWFpbi5jcHANCkhFQURFUlMgKz0gdGVzdG9iamVjdC5oDQoA AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABidWdxdGlu c3RhbmNlL3Rlc3RvYmplY3QuaAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAICAgNzc3IAAgICAgIDAgACAgICAg MCAAICAgICAgIDEwNTAgMTEzMDEzMjQ2MDEgIDExMjY1IAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAA AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACNpZm5kZWYg VEVTVE9CSkVDVF9IDQojZGVmaW5lIFRFU1RPQkpFQ1RfSA0KDQojaW5jbHVkZSA8UXRDb3JlL1FP YmplY3Q+DQoNCmNsYXNzIFRlc3RPYmplY3QgOiBwdWJsaWMgUU9iamVjdA0Kew0KICAgIFFfT0JK RUNUDQoNCiAgICBwdWJsaWM6DQogICAgICAgIFRlc3RPYmplY3QoKSA6IFFPYmplY3QoKQ0KICAg ICAgICAsb2JqKDApDQogICAgICAgIHt9DQoNCiAgICAgICAgUV9JTlZPS0FCTEUgUU9iamVjdCog Z2V0TmV3T2JqZWN0KCkNCiAgICAgICAgew0KICAgICAgICAgICAgc3RhdGljIGludCBpID0gMTsN Cg0KICAgICAgICAgICAgaWYob2JqKQ0KICAgICAgICAgICAgICAgIGRlbGV0ZSBvYmo7DQoNCiAg ICAgICAgICAgIG9iaiA9IG5ldyBRT2JqZWN0Ow0KICAgICAgICAgICAgb2JqLT5zZXRPYmplY3RO YW1lKFFTdHJpbmcoInRlc3QlMSIpLmFyZyhpKSk7DQoNCiAgICAgICAgICAgIGkrKzsNCg0KICAg ICAgICAgICAgcmV0dXJuIG9iajsNCiAgICAgICAgfQ0KDQogICAgICAgIFFPYmplY3QqIG9iajsN Cn07DQoNCiNlbmRpZiAvLyBURVNUT0JKRUNUX0gNCgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA 43682 2009-11-22 09:30:22 -0800 2009-11-23 04:27:16 -0800 Potential fix, without changelog and testcase. patch.txt text/plain 1051 hausmann LS0tIGEvV2ViQ29yZS9icmlkZ2UvcXQvcXRfaW5zdGFuY2UuY3BwCisrKyBiL1dlYkNvcmUvYnJp ZGdlL3F0L3F0X2luc3RhbmNlLmNwcApAQCAtMTEyLDggKzExMiwxMiBAQCBQYXNzUmVmUHRyPFF0 SW5zdGFuY2U+IFF0SW5zdGFuY2U6OmdldFF0SW5zdGFuY2UoUU9iamVjdCogbywgUGFzc1JlZlB0 cjxSb290T2JqZQogICAgIEpTTG9jayBsb2NrKFNpbGVuY2VBc3NlcnRpb25zT25seSk7CiAKICAg ICBmb3JlYWNoKFF0SW5zdGFuY2UqIGluc3RhbmNlLCBjYWNoZWRJbnN0YW5jZXMudmFsdWVzKG8p KSB7Ci0gICAgICAgIGlmIChpbnN0YW5jZS0+cm9vdE9iamVjdCgpID09IHJvb3RPYmplY3QpCi0g ICAgICAgICAgICByZXR1cm4gaW5zdGFuY2U7CisgICAgICAgIGlmIChpbnN0YW5jZS0+cm9vdE9i amVjdCgpID09IHJvb3RPYmplY3QpIHsKKyAgICAgICAgICAgIGlmIChpbnN0YW5jZS0+Z2V0T2Jq ZWN0KCkgPT0gbykKKyAgICAgICAgICAgICAgICByZXR1cm4gaW5zdGFuY2U7CisgICAgICAgICAg ICBlbHNlCisgICAgICAgICAgICAgICAgY2FjaGVkSW5zdGFuY2VzLnJlbW92ZShpbnN0YW5jZS0+ aGFzaEtleSgpKTsKKyAgICAgICAgfQogICAgIH0KIAogICAgIFJlZlB0cjxRdEluc3RhbmNlPiBy ZXQgPSBRdEluc3RhbmNlOjpjcmVhdGUobywgcm9vdE9iamVjdCwgb3duZXJzaGlwKTsKLS0tIGEv V2ViQ29yZS9icmlkZ2UvcXQvcXRfaW5zdGFuY2UuaAorKysgYi9XZWJDb3JlL2JyaWRnZS9xdC9x dF9pbnN0YW5jZS5oCkBAIC01OSw2ICs1OSw3IEBAIHB1YmxpYzoKICAgICBKU1ZhbHVlIGJvb2xl YW5WYWx1ZSgpIGNvbnN0OwogCiAgICAgUU9iamVjdCogZ2V0T2JqZWN0KCkgY29uc3QgeyByZXR1 cm4gbV9vYmplY3Q7IH0KKyAgICBRT2JqZWN0KiBoYXNoS2V5KCkgY29uc3QgeyByZXR1cm4gbV9o YXNoa2V5OyB9CiAKICAgICBzdGF0aWMgUGFzc1JlZlB0cjxRdEluc3RhbmNlPiBnZXRRdEluc3Rh bmNlKFFPYmplY3QqLCBQYXNzUmVmUHRyPFJvb3RPYmplY3Q+LCBRU2NyaXB0RW5naW5lOjpWYWx1 ZU93bmVyc2hpcCBvd25lcnNoaXApOwogCg== 43702 2009-11-23 04:27:22 -0800 2009-11-23 04:58:38 -0800 Patch bug-31681-20091123132720.patch text/plain 4997 hausmann ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg OWFjYWFkZi4uYzI3ZGE5YSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyMCBAQAorMjAwOS0xMS0yMyAgU2ltb24gSGF1c21h bm4gIDxzaW1vbi5oYXVzbWFubkBub2tpYS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgW1F0XSBXcm9uZyBydW50aW1lIGluc3RhbmNlIG9iamVj dHMgb2Ygd3JhcHBlZCBRT2JqZWN0cyBtYXkgYmUgdXNlZCBpZgorICAgICAgICB0aGUgd3JhcHBl ZCBvYmplY3QgZGllZCBiZWZvcmUgdGhlIGdjIHJlbW92ZWQgdGhlIGluc3RhbmNlLgorCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0zMTY4MQorCisgICAg ICAgIEJlZm9yZSB1c2luZyBhIGNhY2hlZCBpbnN0YW5jZSwgdmVyaWZ5IHRoYXQgaXRzIHdyYXBw ZWQgUU9iamVjdCBpcworICAgICAgICBzdGlsbCBhbGl2ZS4KKworICAgICAgICAqIGJyaWRnZS9x dC9xdF9pbnN0YW5jZS5jcHA6CisgICAgICAgIChKU0M6OkJpbmRpbmdzOjpRdEluc3RhbmNlOjpn ZXRRdEluc3RhbmNlKToKKyAgICAgICAgKiBicmlkZ2UvcXQvcXRfaW5zdGFuY2UuaDoKKyAgICAg ICAgKEpTQzo6QmluZGluZ3M6OlF0SW5zdGFuY2U6Omhhc2hLZXkpOgorCiAyMDA5LTExLTIyICBD aHJpcyBGbGVpemFjaCAgPGNmbGVpemFjaEBhcHBsZS5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQg YnkgT2xpdmVyIEh1bnQuCmRpZmYgLS1naXQgYS9XZWJDb3JlL2JyaWRnZS9xdC9xdF9pbnN0YW5j ZS5jcHAgYi9XZWJDb3JlL2JyaWRnZS9xdC9xdF9pbnN0YW5jZS5jcHAKaW5kZXggMjZmZDcwMS4u YzYxODVlOSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9icmlkZ2UvcXQvcXRfaW5zdGFuY2UuY3BwCisr KyBiL1dlYkNvcmUvYnJpZGdlL3F0L3F0X2luc3RhbmNlLmNwcApAQCAtMTE5LDEwICsxMTksMTcg QEAgUGFzc1JlZlB0cjxRdEluc3RhbmNlPiBRdEluc3RhbmNlOjpnZXRRdEluc3RhbmNlKFFPYmpl Y3QqIG8sIFBhc3NSZWZQdHI8Um9vdE9iamUKIHsKICAgICBKU0xvY2sgbG9jayhTaWxlbmNlQXNz ZXJ0aW9uc09ubHkpOwogCi0gICAgZm9yZWFjaChRdEluc3RhbmNlKiBpbnN0YW5jZSwgY2FjaGVk SW5zdGFuY2VzLnZhbHVlcyhvKSkgewotICAgICAgICBpZiAoaW5zdGFuY2UtPnJvb3RPYmplY3Qo KSA9PSByb290T2JqZWN0KQotICAgICAgICAgICAgcmV0dXJuIGluc3RhbmNlOwotICAgIH0KKyAg ICBmb3JlYWNoKFF0SW5zdGFuY2UqIGluc3RhbmNlLCBjYWNoZWRJbnN0YW5jZXMudmFsdWVzKG8p KQorICAgICAgICBpZiAoaW5zdGFuY2UtPnJvb3RPYmplY3QoKSA9PSByb290T2JqZWN0KSB7Cisg ICAgICAgICAgICAvLyBUaGUgZ2FyYmFnZSBjb2xsZWN0b3IgcmVtb3ZlcyBpbnN0YW5jZXMsIGJ1 dCBpdCBtYXkgaGFwcGVuIHRoYXQgdGhlIHdyYXBwZWQKKyAgICAgICAgICAgIC8vIFFPYmplY3Qg ZGllcyBiZWZvcmUgdGhlIGdjIGtpY2tzIGluLiBUbyBoYW5kbGUgdGhhdCBjYXNlIHdlIGhhdmUg dG8gZG8gYW4gYWRkaXRpb25hbAorICAgICAgICAgICAgLy8gY2hlY2sgaWYgdG8gc2VlIGlmIHRo ZSBpbnN0YW5jZSdzIHdyYXBwZWQgb2JqZWN0IGlzIHN0aWxsIGFsaXZlLiBJZiBpdCBpc24ndCwg dGhlbgorICAgICAgICAgICAgLy8gd2UgaGF2ZSB0byBjcmVhdGUgYSBuZXcgd3JhcHBlci4KKyAg ICAgICAgICAgIGlmICghaW5zdGFuY2UtPmdldE9iamVjdCgpKQorICAgICAgICAgICAgICAgIGNh Y2hlZEluc3RhbmNlcy5yZW1vdmUoaW5zdGFuY2UtPmhhc2hLZXkoKSk7CisgICAgICAgICAgICBl bHNlCisgICAgICAgICAgICAgICAgcmV0dXJuIGluc3RhbmNlOworICAgICAgICB9CiAKICAgICBS ZWZQdHI8UXRJbnN0YW5jZT4gcmV0ID0gUXRJbnN0YW5jZTo6Y3JlYXRlKG8sIHJvb3RPYmplY3Qs IG93bmVyc2hpcCk7CiAgICAgY2FjaGVkSW5zdGFuY2VzLmluc2VydChvLCByZXQuZ2V0KCkpOwpk aWZmIC0tZ2l0IGEvV2ViQ29yZS9icmlkZ2UvcXQvcXRfaW5zdGFuY2UuaCBiL1dlYkNvcmUvYnJp ZGdlL3F0L3F0X2luc3RhbmNlLmgKaW5kZXggMDBhYWE1Yi4uMGFmYzZjNyAxMDA2NDQKLS0tIGEv V2ViQ29yZS9icmlkZ2UvcXQvcXRfaW5zdGFuY2UuaAorKysgYi9XZWJDb3JlL2JyaWRnZS9xdC9x dF9pbnN0YW5jZS5oCkBAIC01OSw2ICs1OSw3IEBAIHB1YmxpYzoKICAgICBKU1ZhbHVlIGJvb2xl YW5WYWx1ZSgpIGNvbnN0OwogCiAgICAgUU9iamVjdCogZ2V0T2JqZWN0KCkgY29uc3QgeyByZXR1 cm4gbV9vYmplY3Q7IH0KKyAgICBRT2JqZWN0KiBoYXNoS2V5KCkgY29uc3QgeyByZXR1cm4gbV9o YXNoa2V5OyB9CiAKICAgICBzdGF0aWMgUGFzc1JlZlB0cjxRdEluc3RhbmNlPiBnZXRRdEluc3Rh bmNlKFFPYmplY3QqLCBQYXNzUmVmUHRyPFJvb3RPYmplY3Q+LCBRU2NyaXB0RW5naW5lOjpWYWx1 ZU93bmVyc2hpcCBvd25lcnNoaXApOwogCmRpZmYgLS1naXQgYS9XZWJLaXQvcXQvQ2hhbmdlTG9n IGIvV2ViS2l0L3F0L0NoYW5nZUxvZwppbmRleCA3ZWQzNjFiLi45ZjhjZWZhIDEwMDY0NAotLS0g YS9XZWJLaXQvcXQvQ2hhbmdlTG9nCisrKyBiL1dlYktpdC9xdC9DaGFuZ2VMb2cKQEAgLTEsMyAr MSwxNyBAQAorMjAwOS0xMS0yMyAgU2ltb24gSGF1c21hbm4gIDxzaW1vbi5oYXVzbWFubkBub2tp YS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg W1F0XSBXcm9uZyBydW50aW1lIGluc3RhbmNlIG9iamVjdHMgb2Ygd3JhcHBlZCBRT2JqZWN0cyBt YXkgYmUgdXNlZCBpZgorICAgICAgICB0aGUgd3JhcHBlZCBvYmplY3QgZGllZCBiZWZvcmUgdGhl IGdjIHJlbW92ZWQgdGhlIGluc3RhbmNlLgorCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0zMTY4MQorCisgICAgICAgIEFkZGVkIGEgdW5pdC10ZXN0IHRv IHZlcmlmeSB0aGF0IHdyYXBwaW5nIGEgUU9iamVjdCB3aXRoIHRoZQorICAgICAgICBzYW1lIGlk ZW50aXR5IGFzIGEgcHJldmlvdXNseSBidXQgbm93IGRlYWQgb2JqZWN0IHdvcmtzLgorCisgICAg ICAgICogdGVzdHMvcXdlYmZyYW1lL3RzdF9xd2ViZnJhbWUuY3BwOgorCiAyMDA5LTExLTE5ICBK b2NlbHluIFR1cmNvdHRlICA8am9jZWx5bi50dXJjb3R0ZUBub2tpYS5jb20+CiAKICAgICAgICAg UmV2aWV3ZWQgYnkgS2VubmV0aCBSb2hkZSBDaHJpc3RpYW5zZW4uCmRpZmYgLS1naXQgYS9XZWJL aXQvcXQvdGVzdHMvcXdlYmZyYW1lL3RzdF9xd2ViZnJhbWUuY3BwIGIvV2ViS2l0L3F0L3Rlc3Rz L3F3ZWJmcmFtZS90c3RfcXdlYmZyYW1lLmNwcAppbmRleCBmNmYyMzAyLi5jYjM1YmMxIDEwMDY0 NAotLS0gYS9XZWJLaXQvcXQvdGVzdHMvcXdlYmZyYW1lL3RzdF9xd2ViZnJhbWUuY3BwCisrKyBi L1dlYktpdC9xdC90ZXN0cy9xd2ViZnJhbWUvdHN0X3F3ZWJmcmFtZS5jcHAKQEAgLTYwNCw2ICs2 MDQsNyBAQCBwcml2YXRlIHNsb3RzOgogICAgIHZvaWQgcmVuZGVyKCk7CiAgICAgdm9pZCBzY3Jv bGxQb3NpdGlvbigpOwogICAgIHZvaWQgZXZhbHVhdGVXaWxsQ2F1c2VSZXBhaW50KCk7CisgICAg dm9pZCBxT2JqZWN0V3JhcHBlcldpdGhTYW1lSWRlbnRpdHkoKTsKIAogcHJpdmF0ZToKICAgICBR U3RyaW5nICBldmFsSlMoY29uc3QgUVN0cmluZyZzKSB7CkBAIC0yNzU4LDYgKzI3NTksNDMgQEAg dm9pZCB0c3RfUVdlYkZyYW1lOjpldmFsdWF0ZVdpbGxDYXVzZVJlcGFpbnQoKQogICAgIFFUZXN0 OjpxV2FpdCgyMDAwKTsKIH0KIAorY2xhc3MgVGVzdEZhY3RvcnkgOiBwdWJsaWMgUU9iamVjdAor eworICAgIFFfT0JKRUNUCitwdWJsaWM6CisgICAgVGVzdEZhY3RvcnkoKQorICAgICAgICA6IG9i aigwKSwgY291bnRlcigwKQorICAgIHt9CisKKyAgICBRX0lOVk9LQUJMRSBRT2JqZWN0KiBnZXRO ZXdPYmplY3QoKQorICAgIHsKKyAgICAgICAgZGVsZXRlIG9iajsKKyAgICAgICAgb2JqID0gbmV3 IFFPYmplY3QodGhpcyk7CisgICAgICAgIG9iai0+c2V0T2JqZWN0TmFtZShRTGF0aW4xU3RyaW5n KCJ0ZXN0IikgKyBRU3RyaW5nOjpudW1iZXIoKytjb3VudGVyKSk7CisgICAgICAgIHJldHVybiBv Ymo7CisKKyAgICB9CisKKyAgICBRT2JqZWN0KiBvYmo7CisgICAgaW50IGNvdW50ZXI7Cit9Owor Cit2b2lkIHRzdF9RV2ViRnJhbWU6OnFPYmplY3RXcmFwcGVyV2l0aFNhbWVJZGVudGl0eSgpCit7 CisgICAgbV92aWV3LT5zZXRIdG1sKCI8c2NyaXB0PmZ1bmN0aW9uIHRyaWdnZXJCdWcoKSB7IGRv Y3VtZW50LmdldEVsZW1lbnRCeUlkKCdzcGFuMScpLmlubmVyVGV4dCA9IHRlc3QuZ2V0TmV3T2Jq ZWN0KCkub2JqZWN0TmFtZTsgfTwvc2NyaXB0PiIKKyAgICAgICAgICAgICAgICAgICAgIjxib2R5 PjxzcGFuIGlkPSdzcGFuMSc+dGVzdDwvc3Bhbj48L2JvZHk+Iik7CisKKyAgICBRV2ViRnJhbWUq IG1haW5GcmFtZSA9IG1fdmlldy0+cGFnZSgpLT5tYWluRnJhbWUoKTsKKyAgICBRQ09NUEFSRSht YWluRnJhbWUtPnRvUGxhaW5UZXh0KCksIFFTdHJpbmcoInRlc3QiKSk7CisKKyAgICBtYWluRnJh bWUtPmFkZFRvSmF2YVNjcmlwdFdpbmRvd09iamVjdCgidGVzdCIsIG5ldyBUZXN0RmFjdG9yeSwg UVNjcmlwdEVuZ2luZTo6U2NyaXB0T3duZXJzaGlwKTsKKworICAgIG1haW5GcmFtZS0+ZXZhbHVh dGVKYXZhU2NyaXB0KCJ0cmlnZ2VyQnVnKCk7Iik7CisgICAgUUNPTVBBUkUobWFpbkZyYW1lLT50 b1BsYWluVGV4dCgpLCBRU3RyaW5nKCJ0ZXN0MSIpKTsKKworICAgIG1haW5GcmFtZS0+ZXZhbHVh dGVKYXZhU2NyaXB0KCJ0cmlnZ2VyQnVnKCk7Iik7CisgICAgUUNPTVBBUkUobWFpbkZyYW1lLT50 b1BsYWluVGV4dCgpLCBRU3RyaW5nKCJ0ZXN0MiIpKTsKK30KIAogUVRFU1RfTUFJTih0c3RfUVdl YkZyYW1lKQogI2luY2x1ZGUgInRzdF9xd2ViZnJhbWUubW9jIgo=