30779 2009-10-26 09:39:01 -0700 [Qt] Make QWebPagePrivate's (QWidget) view to be a QWeakPointer 2009-10-28 03:25:36 -0700 1 1 1 Unclassified WebKit WebKit Qt 528+ (Nightly build) PC All RESOLVED FIXED Qt P2 Normal --- 1 tonikitoo tonikitoo ariya.hidayat hausmann vestbo zecke oldest_to_newest 157799 0 tonikitoo 2009-10-26 09:39:01 -0700 No one is deleting it explicitly, so it can lead to dangling pointers. Making it a qweakpointer would get us safier. patch coming ... 157800 1 41872 tonikitoo 2009-10-26 09:40:09 -0700 Created attachment 41872 (committed in r50142) patch 0.1 158177 2 tonikitoo 2009-10-27 06:46:58 -0700 commit in r50142 thx for reviewing 158357 3 41984 tonikitoo 2009-10-27 14:12:04 -0700 Created attachment 41984 (committed in r50209) patch 0.2 Patch updated what documentation says: for qweakpointer's tracking qobjects use data() not toStringRef().data() http://doc.trolltech.com/4.6-snapshot/qweakpointer.html#tracking-qobject it fixes current Qt-DRT crash 158358 4 tonikitoo 2009-10-27 14:12:39 -0700 reopening to track the pending commit 158479 5 zecke 2009-10-28 00:41:46 -0700 Hmm... bad inconsistency and the "other context" is pretty vague too.. I would r=+ if you agree to do a spelling fix before landing the commit. 158482 6 zecke 2009-10-28 00:46:20 -0700 okay and the problem toStringRef it must be toStrongRef 158506 7 tonikitoo 2009-10-28 03:24:58 -0700 patch 2 landed in r50209 thx zecke 41872 2009-10-26 09:40:09 -0700 2009-10-27 06:47:43 -0700 (committed in r50142) patch 0.1 0001-Make-QWebPagePrivate-s-QWidget-view-to-be-a-QWeakP.patch text/plain 10447 tonikitoo RnJvbSBhNDQxZjA5NGM4Y2RiZDkzZWQ0YjQyMmRhOGNiMDllOTFkMWJlOGU4IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBbnRvbmlvIEdvbWVzIDx0b25pa2l0b29Ad2Via2l0Lm9yZz4K RGF0ZTogU2F0LCAyNCBPY3QgMjAwOSAxNjoxMjoyMSAtMDQwMApTdWJqZWN0OiBbUEFUQ0hdIE1h a2UgUVdlYlBhZ2VQcml2YXRlJ3MgKFFXaWRnZXQpIHZpZXcgdG8gYmUgYSBRV2Vha1BvaW50ZXIu CgpQYXRjaCBieSBBbnRvbmlvIEdvbWVzIDx0b25pa2l0b29Ad2Via2l0Lm9yZz4gb24gMjAwOS0x MC0yNApSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KClRoZSBmYWN0IHRoYXQgaXQgd2FzIGJl ZW4gc2V0IGZyb20gZXh0ZXJuYWwgb2JqZWN0cyBvZiBxd2VicGFnZQphbmQgbm90IGJlaW5nIGRl bGV0ZWQgaW50ZXJuYWxseSBjYW4gbGVhZCB0byBkYW5nbGluZyByZWZlcmVuY2VzLgoKKiBBcGkv cWdyYXBoaWNzd2Vidmlldy5jcHA6CihRR3JhcGhpY3NXZWJWaWV3Ojp+UUdyYXBoaWNzV2ViVmll dyk6CiogQXBpL3F3ZWJwYWdlLmNwcDoKKFFXZWJQYWdlUHJpdmF0ZTo6UVdlYlBhZ2VQcml2YXRl KToKKFFXZWJQYWdlUHJpdmF0ZTo6Y3JlYXRlQ29udGV4dE1lbnUpOgooUVdlYlBhZ2VQcml2YXRl OjpoYW5kbGVTb2Z0d2FyZUlucHV0UGFuZWwpOgooUVdlYlBhZ2VQcml2YXRlOjprZXlQcmVzc0V2 ZW50KToKKFFXZWJQYWdlOjpzZXRWaWV3KToKKFFXZWJQYWdlOjp2aWV3KToKKFFXZWJQYWdlOjpq YXZhU2NyaXB0QWxlcnQpOgooUVdlYlBhZ2U6OmphdmFTY3JpcHRDb25maXJtKToKKFFXZWJQYWdl OjpqYXZhU2NyaXB0UHJvbXB0KToKKFFXZWJQYWdlOjpzaG91bGRJbnRlcnJ1cHRKYXZhU2NyaXB0 KToKKFFXZWJQYWdlOjpjcmVhdGVXaW5kb3cpOgooUVdlYlBhZ2U6OmV4dGVuc2lvbik6CihRV2Vi UGFnZTo6Y2hvb3NlRmlsZSk6CihRV2ViUGFnZTo6dXNlckFnZW50Rm9yVXJsKToKKiBBcGkvcXdl YnBhZ2VfcC5oOgoqIEFwaS9xd2Vidmlldy5jcHA6CihRV2ViVmlldzo6flFXZWJWaWV3KToKLS0t CiBXZWJLaXQvcXQvQXBpL3FncmFwaGljc3dlYnZpZXcuY3BwIHwgICAgNCArKysrCiBXZWJLaXQv cXQvQXBpL3F3ZWJwYWdlLmNwcCAgICAgICAgIHwgICAzNiArKysrKysrKysrKysrKysrKysrLS0t LS0tLS0tLS0tLS0tLS0KIFdlYktpdC9xdC9BcGkvcXdlYnBhZ2VfcC5oICAgICAgICAgfCAgICA1 ICsrKysrCiBXZWJLaXQvcXQvQXBpL3F3ZWJ2aWV3LmNwcCAgICAgICAgIHwgICAgNCArKysrCiBX ZWJLaXQvcXQvQ2hhbmdlTG9nICAgICAgICAgICAgICAgIHwgICAzMCArKysrKysrKysrKysrKysr KysrKysrKysrKysrKysKIDUgZmlsZXMgY2hhbmdlZCwgNjIgaW5zZXJ0aW9ucygrKSwgMTcgZGVs ZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvV2ViS2l0L3F0L0FwaS9xZ3JhcGhpY3N3ZWJ2aWV3LmNw cCBiL1dlYktpdC9xdC9BcGkvcWdyYXBoaWNzd2Vidmlldy5jcHAKaW5kZXggOTBkYzAxZC4uNTBh MDk4NiAxMDA2NDQKLS0tIGEvV2ViS2l0L3F0L0FwaS9xZ3JhcGhpY3N3ZWJ2aWV3LmNwcAorKysg Yi9XZWJLaXQvcXQvQXBpL3FncmFwaGljc3dlYnZpZXcuY3BwCkBAIC0xOTYsNyArMTk2LDExIEBA IFFHcmFwaGljc1dlYlZpZXc6OlFHcmFwaGljc1dlYlZpZXcoUUdyYXBoaWNzSXRlbSogcGFyZW50 KQogUUdyYXBoaWNzV2ViVmlldzo6flFHcmFwaGljc1dlYlZpZXcoKQogewogICAgIGlmIChkLT5w YWdlKSB7CisjaWYgUVRfVkVSU0lPTiA+PSAweDA0MDYwMAorICAgICAgICBkLT5wYWdlLT5kLT52 aWV3LmNsZWFyKCk7CisjZWxzZQogICAgICAgICBkLT5wYWdlLT5kLT52aWV3ID0gMDsKKyNlbmRp ZgogICAgICAgICBkLT5wYWdlLT5kLT5jbGllbnQgPSAwOyAvLyB1bnNldCB0aGUgcGFnZSBjbGll bnQKICAgICB9CiAKZGlmZiAtLWdpdCBhL1dlYktpdC9xdC9BcGkvcXdlYnBhZ2UuY3BwIGIvV2Vi S2l0L3F0L0FwaS9xd2VicGFnZS5jcHAKaW5kZXggYzA2NmU5Yi4uOWY2NDAzMiAxMDA2NDQKLS0t IGEvV2ViS2l0L3F0L0FwaS9xd2VicGFnZS5jcHAKKysrIGIvV2ViS2l0L3F0L0FwaS9xd2VicGFn ZS5jcHAKQEAgLTI2Myw3ICsyNjMsOSBAQCBzdGF0aWMgaW5saW5lIFF0OjpEcm9wQWN0aW9uIGRy YWdPcFRvRHJvcEFjdGlvbih1bnNpZ25lZCBhY3Rpb25zKQogUVdlYlBhZ2VQcml2YXRlOjpRV2Vi UGFnZVByaXZhdGUoUVdlYlBhZ2UgKnFxKQogICAgIDogcShxcSkKICAgICAsIGNsaWVudCgwKQor I2lmIFFUX1ZFUlNJT04gPCAweDA0MDYwMAogICAgICwgdmlldygwKQorI2VuZGlmCiAgICAgLCBp bnNwZWN0b3JGcm9udGVuZCgwKQogICAgICwgaW5zcGVjdG9yKDApCiAgICAgLCBpbnNwZWN0b3JJ c0ludGVybmFsT25seShmYWxzZSkKQEAgLTM4MSw3ICszODMsNyBAQCBzdGF0aWMgUVdlYlBhZ2U6 OldlYkFjdGlvbiB3ZWJBY3Rpb25Gb3JDb250ZXh0TWVudUFjdGlvbihXZWJDb3JlOjpDb250ZXh0 TWVudUFjdAogUU1lbnUgKlFXZWJQYWdlUHJpdmF0ZTo6Y3JlYXRlQ29udGV4dE1lbnUoY29uc3Qg V2ViQ29yZTo6Q29udGV4dE1lbnUgKndlYmNvcmVNZW51LAogICAgICAgICBjb25zdCBRTGlzdDxX ZWJDb3JlOjpDb250ZXh0TWVudUl0ZW0+ICppdGVtcywgUUJpdEFycmF5ICp2aXNpdGVkV2ViQWN0 aW9ucykKIHsKLSAgICBRTWVudSogbWVudSA9IG5ldyBRTWVudSh2aWV3KTsKKyAgICBRTWVudSog bWVudSA9IG5ldyBRTWVudShxLT52aWV3KCkpOwogICAgIGZvciAoaW50IGkgPSAwOyBpIDwgaXRl bXMtPmNvdW50KCk7ICsraSkgewogICAgICAgICBjb25zdCBDb250ZXh0TWVudUl0ZW0gJml0ZW0g PSBpdGVtcy0+YXQoaSk7CiAgICAgICAgIHN3aXRjaCAoaXRlbS50eXBlKCkpIHsKQEAgLTc2Miwx MyArNzY0LDEzIEBAIHZvaWQgUVdlYlBhZ2VQcml2YXRlOjptb3VzZVJlbGVhc2VFdmVudChRR3Jh cGhpY3NTY2VuZU1vdXNlRXZlbnQqIGV2KQogdm9pZCBRV2ViUGFnZVByaXZhdGU6OmhhbmRsZVNv ZnR3YXJlSW5wdXRQYW5lbChRdDo6TW91c2VCdXR0b24gYnV0dG9uKQogewogI2lmIFFUX1ZFUlNJ T04gPj0gUVRfVkVSU0lPTl9DSEVDSyg0LCA2LCAwKQotICAgIGlmICh2aWV3ICYmIHZpZXctPnRl c3RBdHRyaWJ1dGUoUXQ6OldBX0lucHV0TWV0aG9kRW5hYmxlZCkKKyAgICBpZiAocS0+dmlldygp ICYmIHEtPnZpZXcoKS0+dGVzdEF0dHJpYnV0ZShRdDo6V0FfSW5wdXRNZXRob2RFbmFibGVkKQog ICAgICAgICAmJiBidXR0b24gPT0gUXQ6OkxlZnRCdXR0b24gJiYgcUFwcC0+YXV0b1NpcEVuYWJs ZWQoKSkgewogICAgICAgICBRU3R5bGU6OlJlcXVlc3RTb2Z0d2FyZUlucHV0UGFuZWwgYmVoYXZp b3IgPSBRU3R5bGU6OlJlcXVlc3RTb2Z0d2FyZUlucHV0UGFuZWwoCi0gICAgICAgICAgICB2aWV3 LT5zdHlsZSgpLT5zdHlsZUhpbnQoUVN0eWxlOjpTSF9SZXF1ZXN0U29mdHdhcmVJbnB1dFBhbmVs KSk7CisgICAgICAgICAgICBxLT52aWV3KCktPnN0eWxlKCktPnN0eWxlSGludChRU3R5bGU6OlNI X1JlcXVlc3RTb2Z0d2FyZUlucHV0UGFuZWwpKTsKICAgICAgICAgaWYgKCFjbGlja0NhdXNlZEZv Y3VzIHx8IGJlaGF2aW9yID09IFFTdHlsZTo6UlNJUF9Pbk1vdXNlQ2xpY2spIHsKICAgICAgICAg ICAgIFFFdmVudCBldmVudChRRXZlbnQ6OlJlcXVlc3RTb2Z0d2FyZUlucHV0UGFuZWwpOwotICAg ICAgICAgICAgUUFwcGxpY2F0aW9uOjpzZW5kRXZlbnQodmlldywgJmV2ZW50KTsKKyAgICAgICAg ICAgIFFBcHBsaWNhdGlvbjo6c2VuZEV2ZW50KHEtPnZpZXcoKSwgJmV2ZW50KTsKICAgICAgICAg fQogICAgIH0KIApAQCAtOTEyLDggKzkxNCw4IEBAIHZvaWQgUVdlYlBhZ2VQcml2YXRlOjprZXlQ cmVzc0V2ZW50KFFLZXlFdmVudCAqZXYpCiAgICAgaWYgKCFoYW5kbGVkKSB7CiAgICAgICAgIGhh bmRsZWQgPSB0cnVlOwogICAgICAgICBRRm9udCBkZWZhdWx0Rm9udDsKLSAgICAgICAgaWYgKHZp ZXcpCi0gICAgICAgICAgICBkZWZhdWx0Rm9udCA9IHZpZXctPmZvbnQoKTsKKyAgICAgICAgaWYg KHEtPnZpZXcoKSkKKyAgICAgICAgICAgIGRlZmF1bHRGb250ID0gcS0+dmlldygpLT5mb250KCk7 CiAgICAgICAgIFFGb250TWV0cmljcyBmbShkZWZhdWx0Rm9udCk7CiAgICAgICAgIGlmICghaGFu ZGxlU2Nyb2xsaW5nKGV2LCBmcmFtZSkpIHsKICAgICAgICAgICAgIHN3aXRjaCAoZXYtPmtleSgp KSB7CkBAIC0xNjY4LDcgKzE2NzAsNyBAQCBRV2ViSGlzdG9yeSAqUVdlYlBhZ2U6Omhpc3Rvcnko KSBjb25zdAogKi8KIHZvaWQgUVdlYlBhZ2U6OnNldFZpZXcoUVdpZGdldCAqdmlldykKIHsKLSAg ICBpZiAoZC0+dmlldyAhPSB2aWV3KSB7CisgICAgaWYgKHRoaXMtPnZpZXcoKSAhPSB2aWV3KSB7 CiAgICAgICAgIGQtPnZpZXcgPSB2aWV3OwogICAgICAgICBzZXRWaWV3cG9ydFNpemUodmlldyA/ IHZpZXctPnNpemUoKSA6IFFTaXplKDAsIDApKTsKICAgICB9CkBAIC0xNjgxLDcgKzE2ODMsNyBA QCB2b2lkIFFXZWJQYWdlOjpzZXRWaWV3KFFXaWRnZXQgKnZpZXcpCiAqLwogUVdpZGdldCAqUVdl YlBhZ2U6OnZpZXcoKSBjb25zdAogewotICAgIHJldHVybiBkLT52aWV3OworICAgIHJldHVybiBk LT52aWV3LnRvU3Ryb25nUmVmKCkuZGF0YSgpOwogfQogCiAvKiEKQEAgLTE3MDgsNyArMTcxMCw3 IEBAIHZvaWQgUVdlYlBhZ2U6OmphdmFTY3JpcHRBbGVydChRV2ViRnJhbWUgKmZyYW1lLCBjb25z dCBRU3RyaW5nJiBtc2cpCiB7CiAgICAgUV9VTlVTRUQoZnJhbWUpCiAjaWZuZGVmIFFUX05PX01F U1NBR0VCT1gKLSAgICBRTWVzc2FnZUJveDo6aW5mb3JtYXRpb24oZC0+dmlldywgdHIoIkphdmFT Y3JpcHQgQWxlcnQgLSAlMSIpLmFyZyhtYWluRnJhbWUoKS0+dXJsKCkuaG9zdCgpKSwgbXNnLCBR TWVzc2FnZUJveDo6T2spOworICAgIFFNZXNzYWdlQm94OjppbmZvcm1hdGlvbih2aWV3KCksIHRy KCJKYXZhU2NyaXB0IEFsZXJ0IC0gJTEiKS5hcmcobWFpbkZyYW1lKCktPnVybCgpLmhvc3QoKSks IG1zZywgUU1lc3NhZ2VCb3g6Ok9rKTsKICNlbmRpZgogfQogCkBAIC0xNzI0LDcgKzE3MjYsNyBA QCBib29sIFFXZWJQYWdlOjpqYXZhU2NyaXB0Q29uZmlybShRV2ViRnJhbWUgKmZyYW1lLCBjb25z dCBRU3RyaW5nJiBtc2cpCiAjaWZkZWYgUVRfTk9fTUVTU0FHRUJPWAogICAgIHJldHVybiB0cnVl OwogI2Vsc2UKLSAgICByZXR1cm4gUU1lc3NhZ2VCb3g6OlllcyA9PSBRTWVzc2FnZUJveDo6aW5m b3JtYXRpb24oZC0+dmlldywgdHIoIkphdmFTY3JpcHQgQ29uZmlybSAtICUxIikuYXJnKG1haW5G cmFtZSgpLT51cmwoKS5ob3N0KCkpLCBtc2csIFFNZXNzYWdlQm94OjpZZXMsIFFNZXNzYWdlQm94 OjpObyk7CisgICAgcmV0dXJuIFFNZXNzYWdlQm94OjpZZXMgPT0gUU1lc3NhZ2VCb3g6OmluZm9y bWF0aW9uKHZpZXcoKSwgdHIoIkphdmFTY3JpcHQgQ29uZmlybSAtICUxIikuYXJnKG1haW5GcmFt ZSgpLT51cmwoKS5ob3N0KCkpLCBtc2csIFFNZXNzYWdlQm94OjpZZXMsIFFNZXNzYWdlQm94OjpO byk7CiAjZW5kaWYKIH0KIApAQCAtMTc0Miw3ICsxNzQ0LDcgQEAgYm9vbCBRV2ViUGFnZTo6amF2 YVNjcmlwdFByb21wdChRV2ViRnJhbWUgKmZyYW1lLCBjb25zdCBRU3RyaW5nJiBtc2csIGNvbnN0 IFFTdHIKICAgICBRX1VOVVNFRChmcmFtZSkKICAgICBib29sIG9rID0gZmFsc2U7CiAjaWZuZGVm IFFUX05PX0lOUFVURElBTE9HCi0gICAgUVN0cmluZyB4ID0gUUlucHV0RGlhbG9nOjpnZXRUZXh0 KGQtPnZpZXcsIHRyKCJKYXZhU2NyaXB0IFByb21wdCAtICUxIikuYXJnKG1haW5GcmFtZSgpLT51 cmwoKS5ob3N0KCkpLCBtc2csIFFMaW5lRWRpdDo6Tm9ybWFsLCBkZWZhdWx0VmFsdWUsICZvayk7 CisgICAgUVN0cmluZyB4ID0gUUlucHV0RGlhbG9nOjpnZXRUZXh0KHZpZXcoKSwgdHIoIkphdmFT Y3JpcHQgUHJvbXB0IC0gJTEiKS5hcmcobWFpbkZyYW1lKCktPnVybCgpLmhvc3QoKSksIG1zZywg UUxpbmVFZGl0OjpOb3JtYWwsIGRlZmF1bHRWYWx1ZSwgJm9rKTsKICAgICBpZiAob2sgJiYgcmVz dWx0KQogICAgICAgICAqcmVzdWx0ID0geDsKICNlbmRpZgpAQCAtMTc2Nyw3ICsxNzY5LDcgQEAg Ym9vbCBRV2ViUGFnZTo6c2hvdWxkSW50ZXJydXB0SmF2YVNjcmlwdCgpCiAjaWZkZWYgUVRfTk9f TUVTU0FHRUJPWAogICAgIHJldHVybiBmYWxzZTsKICNlbHNlCi0gICAgcmV0dXJuIFFNZXNzYWdl Qm94OjpZZXMgPT0gUU1lc3NhZ2VCb3g6OmluZm9ybWF0aW9uKGQtPnZpZXcsIHRyKCJKYXZhU2Ny aXB0IFByb2JsZW0gLSAlMSIpLmFyZyhtYWluRnJhbWUoKS0+dXJsKCkuaG9zdCgpKSwgdHIoIlRo ZSBzY3JpcHQgb24gdGhpcyBwYWdlIGFwcGVhcnMgdG8gaGF2ZSBhIHByb2JsZW0uIERvIHlvdSB3 YW50IHRvIHN0b3AgdGhlIHNjcmlwdD8iKSwgUU1lc3NhZ2VCb3g6OlllcywgUU1lc3NhZ2VCb3g6 Ok5vKTsKKyAgICByZXR1cm4gUU1lc3NhZ2VCb3g6OlllcyA9PSBRTWVzc2FnZUJveDo6aW5mb3Jt YXRpb24odmlldygpLCB0cigiSmF2YVNjcmlwdCBQcm9ibGVtIC0gJTEiKS5hcmcobWFpbkZyYW1l KCktPnVybCgpLmhvc3QoKSksIHRyKCJUaGUgc2NyaXB0IG9uIHRoaXMgcGFnZSBhcHBlYXJzIHRv IGhhdmUgYSBwcm9ibGVtLiBEbyB5b3Ugd2FudCB0byBzdG9wIHRoZSBzY3JpcHQ/IiksIFFNZXNz YWdlQm94OjpZZXMsIFFNZXNzYWdlQm94OjpObyk7CiAjZW5kaWYKIH0KIApAQCAtMTc4NCw3ICsx Nzg2LDcgQEAgYm9vbCBRV2ViUGFnZTo6c2hvdWxkSW50ZXJydXB0SmF2YVNjcmlwdCgpCiAqLwog UVdlYlBhZ2UgKlFXZWJQYWdlOjpjcmVhdGVXaW5kb3coV2ViV2luZG93VHlwZSB0eXBlKQogewot ICAgIFFXZWJWaWV3ICp3ZWJWaWV3ID0gcW9iamVjdF9jYXN0PFFXZWJWaWV3ICo+KGQtPnZpZXcp OworICAgIFFXZWJWaWV3ICp3ZWJWaWV3ID0gcW9iamVjdF9jYXN0PFFXZWJWaWV3ICo+KHZpZXco KSk7CiAgICAgaWYgKHdlYlZpZXcpIHsKICAgICAgICAgUVdlYlZpZXcgKm5ld1ZpZXcgPSB3ZWJW aWV3LT5jcmVhdGVXaW5kb3codHlwZSk7CiAgICAgICAgIGlmIChuZXdWaWV3KQpAQCAtMjc1MCw3 ICsyNzUyLDcgQEAgYm9vbCBRV2ViUGFnZTo6ZXh0ZW5zaW9uKEV4dGVuc2lvbiBleHRlbnNpb24s IGNvbnN0IEV4dGVuc2lvbk9wdGlvbiAqb3B0aW9uLCBFeHQKICAgICBpZiAoZXh0ZW5zaW9uID09 IENob29zZU11bHRpcGxlRmlsZXNFeHRlbnNpb24pIHsKICAgICAgICAgLy8gRklYTUU6IGRvIG5v dCBpZ25vcmUgc3VnZ2VzdGVkRmlsZXMKICAgICAgICAgUVN0cmluZ0xpc3Qgc3VnZ2VzdGVkRmls ZXMgPSBzdGF0aWNfY2FzdDxjb25zdCBDaG9vc2VNdWx0aXBsZUZpbGVzRXh0ZW5zaW9uT3B0aW9u Kj4ob3B0aW9uKS0+c3VnZ2VzdGVkRmlsZU5hbWVzOwotICAgICAgICBRU3RyaW5nTGlzdCBuYW1l cyA9IFFGaWxlRGlhbG9nOjpnZXRPcGVuRmlsZU5hbWVzKGQtPnZpZXcsIFFTdHJpbmc6Om51bGwp OworICAgICAgICBRU3RyaW5nTGlzdCBuYW1lcyA9IFFGaWxlRGlhbG9nOjpnZXRPcGVuRmlsZU5h bWVzKHZpZXcoKSwgUVN0cmluZzo6bnVsbCk7CiAgICAgICAgIHN0YXRpY19jYXN0PENob29zZU11 bHRpcGxlRmlsZXNFeHRlbnNpb25SZXR1cm4qPihvdXRwdXQpLT5maWxlTmFtZXMgPSBuYW1lczsK ICAgICAgICAgcmV0dXJuIHRydWU7CiAgICAgfQpAQCAtMjgzMiw3ICsyODM0LDcgQEAgUVN0cmlu ZyBRV2ViUGFnZTo6Y2hvb3NlRmlsZShRV2ViRnJhbWUgKnBhcmVudEZyYW1lLCBjb25zdCBRU3Ry aW5nJiBzdWdnZXN0ZWRGaWwKIHsKICAgICBRX1VOVVNFRChwYXJlbnRGcmFtZSkKICNpZm5kZWYg UVRfTk9fRklMRURJQUxPRwotICAgIHJldHVybiBRRmlsZURpYWxvZzo6Z2V0T3BlbkZpbGVOYW1l KGQtPnZpZXcsIFFTdHJpbmc6Om51bGwsIHN1Z2dlc3RlZEZpbGUpOworICAgIHJldHVybiBRRmls ZURpYWxvZzo6Z2V0T3BlbkZpbGVOYW1lKHZpZXcoKSwgUVN0cmluZzo6bnVsbCwgc3VnZ2VzdGVk RmlsZSk7CiAjZWxzZQogICAgIHJldHVybiBRU3RyaW5nOjpudWxsOwogI2VuZGlmCkBAIC0zMDk1 LDggKzMwOTcsOCBAQCBRU3RyaW5nIFFXZWJQYWdlOjp1c2VyQWdlbnRGb3JVcmwoY29uc3QgUVVy bCYgdXJsKSBjb25zdAogCiAgICAgLy8gTGFuZ3VhZ2UKICAgICBRTG9jYWxlIGxvY2FsZTsKLSAg ICBpZiAoZC0+dmlldykKLSAgICAgICAgbG9jYWxlID0gZC0+dmlldy0+bG9jYWxlKCk7CisgICAg aWYgKHZpZXcoKSkKKyAgICAgICAgbG9jYWxlID0gdmlldygpLT5sb2NhbGUoKTsKICAgICBRU3Ry aW5nIG5hbWUgPSBsb2NhbGUubmFtZSgpOwogICAgIG5hbWVbMl0gPSBRTGF0aW4xQ2hhcignLScp OwogICAgIHVhLmFwcGVuZChuYW1lKTsKZGlmZiAtLWdpdCBhL1dlYktpdC9xdC9BcGkvcXdlYnBh Z2VfcC5oIGIvV2ViS2l0L3F0L0FwaS9xd2VicGFnZV9wLmgKaW5kZXggYjk1NzFmYS4uZjBmODQy ZCAxMDA2NDQKLS0tIGEvV2ViS2l0L3F0L0FwaS9xd2VicGFnZV9wLmgKKysrIGIvV2ViS2l0L3F0 L0FwaS9xd2VicGFnZV9wLmgKQEAgLTEzNSw3ICsxMzUsMTIgQEAgcHVibGljOgogI2lmbmRlZiBR VF9OT19VTkRPU1RBQ0sKICAgICBRVW5kb1N0YWNrICp1bmRvU3RhY2s7CiAjZW5kaWYKKworI2lm IFFUX1ZFUlNJT04gPj0gMHgwNDA2MDAKKyAgICBRV2Vha1BvaW50ZXI8UVdpZGdldD4gdmlldzsK KyNlbHNlCiAgICAgUVdpZGdldCogdmlldzsKKyNlbmRpZgogCiAgICAgYm9vbCBpbnNpZGVPcGVu Q2FsbDsKICAgICBxdWludDY0IG1fdG90YWxCeXRlczsKZGlmZiAtLWdpdCBhL1dlYktpdC9xdC9B cGkvcXdlYnZpZXcuY3BwIGIvV2ViS2l0L3F0L0FwaS9xd2Vidmlldy5jcHAKaW5kZXggZjdjYWE5 NC4uODhmNWYwNCAxMDA2NDQKLS0tIGEvV2ViS2l0L3F0L0FwaS9xd2Vidmlldy5jcHAKKysrIGIv V2ViS2l0L3F0L0FwaS9xd2Vidmlldy5jcHAKQEAgLTI0Niw3ICsyNDYsMTEgQEAgUVdlYlZpZXc6 OlFXZWJWaWV3KFFXaWRnZXQgKnBhcmVudCkKIFFXZWJWaWV3Ojp+UVdlYlZpZXcoKQogewogICAg IGlmIChkLT5wYWdlKSB7CisjaWYgUVRfVkVSU0lPTiA+PSAweDA0MDYwMAorICAgICAgICBkLT5w YWdlLT5kLT52aWV3LmNsZWFyKCk7CisjZWxzZQogICAgICAgICBkLT5wYWdlLT5kLT52aWV3ID0g MDsKKyNlbmRpZgogICAgICAgICBkLT5wYWdlLT5kLT5jbGllbnQgPSAwOwogICAgIH0KIApkaWZm IC0tZ2l0IGEvV2ViS2l0L3F0L0NoYW5nZUxvZyBiL1dlYktpdC9xdC9DaGFuZ2VMb2cKaW5kZXgg OGM3ODVjZS4uMDNjNTg5ZiAxMDA2NDQKLS0tIGEvV2ViS2l0L3F0L0NoYW5nZUxvZworKysgYi9X ZWJLaXQvcXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzMgQEAKKzIwMDktMTAtMjYgIEFudG9uaW8g R29tZXMgIDx0b25pa2l0b29Ad2Via2l0Lm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBNYWtlIFFXZWJQYWdlUHJpdmF0ZSdzIChRV2lkZ2V0KSB2 aWV3IHRvIGJlIGEgUVdlYWtQb2ludGVyLgorCisgICAgICAgIFRoZSBmYWN0IHRoYXQgaXQgd2Fz IGJlZW4gc2V0IGZyb20gZXh0ZXJuYWwgb2JqZWN0cyBvZiBxd2VicGFnZQorICAgICAgICBhbmQg bm90IGJlaW5nIGRlbGV0ZWQgaW50ZXJuYWxseSBjYW4gbGVhZCB0byBkYW5nbGluZyByZWZlcmVu Y2VzLgorCisgICAgICAgICogQXBpL3FncmFwaGljc3dlYnZpZXcuY3BwOgorICAgICAgICAoUUdy YXBoaWNzV2ViVmlldzo6flFHcmFwaGljc1dlYlZpZXcpOgorICAgICAgICAqIEFwaS9xd2VicGFn ZS5jcHA6CisgICAgICAgIChRV2ViUGFnZVByaXZhdGU6OlFXZWJQYWdlUHJpdmF0ZSk6CisgICAg ICAgIChRV2ViUGFnZVByaXZhdGU6OmNyZWF0ZUNvbnRleHRNZW51KToKKyAgICAgICAgKFFXZWJQ YWdlUHJpdmF0ZTo6aGFuZGxlU29mdHdhcmVJbnB1dFBhbmVsKToKKyAgICAgICAgKFFXZWJQYWdl UHJpdmF0ZTo6a2V5UHJlc3NFdmVudCk6CisgICAgICAgIChRV2ViUGFnZTo6c2V0Vmlldyk6Cisg ICAgICAgIChRV2ViUGFnZTo6dmlldyk6CisgICAgICAgIChRV2ViUGFnZTo6amF2YVNjcmlwdEFs ZXJ0KToKKyAgICAgICAgKFFXZWJQYWdlOjpqYXZhU2NyaXB0Q29uZmlybSk6CisgICAgICAgIChR V2ViUGFnZTo6amF2YVNjcmlwdFByb21wdCk6CisgICAgICAgIChRV2ViUGFnZTo6c2hvdWxkSW50 ZXJydXB0SmF2YVNjcmlwdCk6CisgICAgICAgIChRV2ViUGFnZTo6Y3JlYXRlV2luZG93KToKKyAg ICAgICAgKFFXZWJQYWdlOjpleHRlbnNpb24pOgorICAgICAgICAoUVdlYlBhZ2U6OmNob29zZUZp bGUpOgorICAgICAgICAoUVdlYlBhZ2U6OnVzZXJBZ2VudEZvclVybCk6CisgICAgICAgICogQXBp L3F3ZWJwYWdlX3AuaDoKKyAgICAgICAgKiBBcGkvcXdlYnZpZXcuY3BwOgorICAgICAgICAoUVdl YlZpZXc6On5RV2ViVmlldyk6CisKIDIwMDktMTAtMjQgIExhc3psbyBHb21ib3MgIDxsYXN6bG8u MS5nb21ib3NAbm9raWEuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IEhvbGdlciBGcmV5dGhl ci4KLS0gCjEuNi4wLjQKCg== 41984 2009-10-27 14:12:04 -0700 2009-10-28 03:25:36 -0700 (committed in r50209) patch 0.2 0001-Complementary-fix-to-bug-30779.patch text/plain 1755 tonikitoo RnJvbSBiZDFkNWU5NTA3NWY1ZTYwNWM2ZDIwZjlhZDI4YjJkNDVhODNkNzhjIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBbnRvbmlvIEdvbWVzIDx0b25pa2l0b29Ad2Via2l0Lm9yZz4K RGF0ZTogVHVlLCAyNyBPY3QgMjAwOSAxNzowNDo1MiAtMDQwMApTdWJqZWN0OiBbUEFUQ0hdIENv bXBsZW1lbnRhcnkgZml4IHRvIGJ1ZyAzMDc3OS4KClBhdGNoIGJ5IEFudG9uaW8gR29tZXMgPHRv bmlraXRvb0B3ZWJraXQub3JnPiBvbiAyMDA5LTEwLTI3ClJldmlld2VkIGJ5IE9PUFMgTk9CT0RZ ICEhIQoKQnkgbWlzdGFrZSBJIHVzZWQgUVdlYWtQb2ludGVyJ3MgdG9TdHJpbmdSZWYoKSBtZXRo b2Qgd2hpY2ggZG9jcwpleHBsaWNpdGx5IHNheSB0byBub3QgYmUgdXNlZCBpbiB0aGlzIHNpdHVh dGlvbiAod2hlbiB0aGUgdHJhY2tlZApwb2ludGVyIGlzIGRldmlyZWQgZnJvbSBRT2JqZWN0KS4g SW5zdGVhZCBRV2Vha1BvaW50ZXIncyBkYXRhKCkKaXMgcmVjb21tZW5kZWQuCgoqIEFwaS9xd2Vi cGFnZS5jcHA6CihRV2ViUGFnZTo6dmlldyk6Ci0tLQogV2ViS2l0L3F0L0FwaS9xd2VicGFnZS5j cHAgfCAgICAyICstCiBXZWJLaXQvcXQvQ2hhbmdlTG9nICAgICAgICB8ICAgMTQgKysrKysrKysr KysrKysKIDIgZmlsZXMgY2hhbmdlZCwgMTUgaW5zZXJ0aW9ucygrKSwgMSBkZWxldGlvbnMoLSkK CmRpZmYgLS1naXQgYS9XZWJLaXQvcXQvQXBpL3F3ZWJwYWdlLmNwcCBiL1dlYktpdC9xdC9BcGkv cXdlYnBhZ2UuY3BwCmluZGV4IDI5YjhiMjcuLjBiMTIyYjQgMTAwNjQ0Ci0tLSBhL1dlYktpdC9x dC9BcGkvcXdlYnBhZ2UuY3BwCisrKyBiL1dlYktpdC9xdC9BcGkvcXdlYnBhZ2UuY3BwCkBAIC0x Njg2LDcgKzE2ODYsNyBAQCBRV2lkZ2V0ICpRV2ViUGFnZTo6dmlldygpIGNvbnN0CiAjaWYgUVRf VkVSU0lPTiA8IDB4MDQwNjAwCiAgICAgcmV0dXJuIGQtPnZpZXc7CiAjZWxzZQotICAgIHJldHVy biBkLT52aWV3LnRvU3Ryb25nUmVmKCkuZGF0YSgpOworICAgIHJldHVybiBkLT52aWV3LmRhdGEo KTsKICNlbmRpZgogfQogCmRpZmYgLS1naXQgYS9XZWJLaXQvcXQvQ2hhbmdlTG9nIGIvV2ViS2l0 L3F0L0NoYW5nZUxvZwppbmRleCA4OTNjMzU4Li43YWJlZWUxIDEwMDY0NAotLS0gYS9XZWJLaXQv cXQvQ2hhbmdlTG9nCisrKyBiL1dlYktpdC9xdC9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNyBAQAor MjAwOS0xMC0yNyAgQW50b25pbyBHb21lcyAgPHRvbmlraXRvb0B3ZWJraXQub3JnPgorCisgICAg ICAgIFJldmlld2VkIGJ5IE9PUFMgTk9CT0RZICEhIQorCisgICAgICAgIENvbXBsZW1lbnRhcnkg Zml4IHRvIGJ1ZyAzMDc3OS4KKwkKKyAgICAgICAgQnkgbWlzdGFrZSBJIHVzZWQgUVdlYWtQb2lu dGVyJ3MgdG9TdHJpbmdSZWYoKSBtZXRob2Qgd2hpY2ggZG9jcworICAgICAgICBleHBsaWNpdGx5 IHNheSB0byBub3QgYmUgdXNlZCBpbiB0aGlzIHNpdHVhdGlvbiAod2hlbiB0aGUgdHJhY2tlZAor ICAgICAgICBwb2ludGVyIGlzIGRldmlyZWQgZnJvbSBRT2JqZWN0KS4gSW5zdGVhZCBRV2Vha1Bv aW50ZXIncyBkYXRhKCkKKyAgICAgICAgaXMgcmVjb21tZW5kZWQuCisKKyAgICAgICAgKiBBcGkv cXdlYnBhZ2UuY3BwOgorICAgICAgICAoUVdlYlBhZ2U6OnZpZXcpOgorCiAyMDA5LTEwLTI3ICBL ZW5uZXRoIFJvaGRlIENocmlzdGlhbnNlbiAgPGtlbm5ldGhAd2Via2l0Lm9yZz4KIAogICAgICAg ICBSdWJiZXJzdGFtcGVkIGJ5IE9saXZlciBIdW50LgotLSAKMS42LjAuNAoK