12251 2007-01-13 03:36:21 -0800 REGRESSION (r18822-r18823): Assertion failure opening document with non-existent resources (dom/xhtml/level2/html/HTMLIFrameElement11.xhtml) 2007-01-14 14:03:36 -0800 1 1 1 Unclassified WebKit Page Loading 420+ Mac OS X 10.4 RESOLVED FIXED LayoutTestFailure, Regression P1 Critical --- 1 ddkilzer webkit-unassigned andersca ap aroben mitz oldest_to_newest 35238 0 ddkilzer 2007-01-13 03:36:21 -0800 In my locally-build debug build of WebKit r18824, dom/xhtml/level2/html/HTMLIFrameElement11.xhtml fails with an assertion error: ASSERTION FAILED: _private->identifierMap->contains(identifier) (/path/to/WebKit/WebKit/WebView/WebView.mm:3696 -[WebView(WebViewInternal) _objectForIdentifier:]) Segmentation fault 35239 1 12413 ddkilzer 2007-01-13 03:38:03 -0800 Created attachment 12413 Stack trace 35139 2 ddkilzer 2007-01-13 15:11:56 -0800 Confirmed that this broke with r18822-18823. 35145 3 aroben 2007-01-13 20:16:32 -0800 fast/frames/empty-frame-src.html is failing with the same assertion. 35146 4 aroben 2007-01-13 20:21:32 -0800 fast/frames/frame-element-name.html also suffers 35147 5 aroben 2007-01-13 20:25:31 -0800 And fast/frames/frame-js-url-clientWidth.html 35148 6 aroben 2007-01-13 20:32:46 -0800 And fast/frames/frame-limit.html, fast/frames/frame-name-reset.html, fast/frames/frame-set-same-location.html, fast/frames/frame-set-same-src.html, fast/frames/frame-src-attribute.html, fast/frames/frameElement-frame.html, and probably many others. 35111 7 ddkilzer 2007-01-14 04:38:09 -0800 (In reply to comment #0) > In my locally-build debug build of WebKit r18824, > dom/xhtml/level2/html/HTMLIFrameElement11.xhtml fails with an assertion error: The problem here is that HTMLIFrameElement11.xhtml references two files that don't exist via <iframe> tags. The assertion code added in r18822 trips because these files (resources) aren't found and thus aren't loaded. The solution is to add equivalent nil checks. What's more disconcerting is that both frame.xhtml and iframe.xhtml exist in the same directory as HTMLIFrameElement11.xhtml, but apparently that's what the actual test does as well: http://dev.w3.org/cvsweb/2001/DOM-Test-Suite/tests/level2/html/files/iframe2.html?rev=1.4 I have a patch to fix this. 35109 8 12424 ddkilzer 2007-01-14 05:06:45 -0800 Created attachment 12424 Patch v1 This is the obvious fix--to do the equivalent nil checking when retrieving an object or removing it from the hash map. Not sure if the callers of these methods should be smarter about when they call them, e.g., after an attempt was made to load a resource that didn't exist. Running layout tests now; will report results when completed. 35093 9 mitz 2007-01-14 05:21:07 -0800 (In reply to comment #7) > The problem here is that HTMLIFrameElement11.xhtml references two files that > don't exist via <iframe> tags. The assertion code added in r18822 trips > because these files (resources) aren't found and thus aren't loaded. This isn't quite accurate. Loader items for the missing resources are created. The assertion trips because when the resource fails to load, FrameLoader::didFailToLoad() is invoked twice, once from ResourceLoader::didFail(), then another time from ResourceLoader::didCancel(). In the first time, the identifier is removed from the map. Thus in the second time, it's missing and the assretion fails. 35066 10 12424 darin 2007-01-14 06:03:10 -0800 Comment on attachment 12424 Patch v1 We definitely need to fix this! Can't have layout tests failing. But HashMap remove already has the behavior of removing it only if it's there, so no need for the contains call. And if the object that comes back from _objectForIdentifier is nil, then the caller needs to not send the notification. I think we should land a fixed-up version of this now. The real problem is that the loader is sending multiple "done loading" calls to the client for the same resource -- it can be fixed entirely on the WebCore side. But it's a complex job that we should do later. This approach is correct for now. 35059 11 ddkilzer 2007-01-14 08:37:51 -0800 (In reply to comment #8) > Running layout tests now; will report results when completed. No new regressions with this change, but I had to call run-webkit-tests with these arguments to get the non-patched version to finish: ./Tools/Scripts/run-webkit-tests --ignore-tests dom/xhtml/level2/html/HTMLIFrameElement11.xhtml,fast/frames 35045 12 12428 ddkilzer 2007-01-14 08:43:38 -0800 Created attachment 12428 Patch v2 Updated per Comment #10. Reran failing tests (dom/xhtml/level2/html/HTMLIFrameElement11.xhtml, fast/frames) and they still pass. 34996 13 12428 darin 2007-01-14 13:56:54 -0800 Comment on attachment 12428 Patch v2 Looks fine for a first cut. We need to follow through and make sure that we don't pass the nil object through to the delegate callbacks. But I think that can wait. r=me 34999 14 ddkilzer 2007-01-14 14:03:36 -0800 (In reply to comment #13) > Looks fine for a first cut. We need to follow through and make sure that we > don't pass the nil object through to the delegate callbacks. But I think that > can wait. Anders mentioned that he's working on it in IRC today. Committed revision 18846. 12413 2007-01-13 03:38:03 -0800 2007-01-13 03:38:03 -0800 Stack trace bug-12251-stack.txt text/plain 9058 ddkilzer RXhjZXB0aW9uOiAgRVhDX0JBRF9BQ0NFU1MgKDB4MDAwMSkKQ29kZXM6ICAgICAgS0VSTl9JTlZB TElEX0FERFJFU1MgKDB4MDAwMSkgYXQgMHhiYmFkYmVlZgoKVGhyZWFkIDAgQ3Jhc2hlZDoKMCAg IGNvbS5hcHBsZS5XZWJLaXQgICAgICAgICAJMHgwMDI5NGNiNCAtW1dlYlZpZXcoV2ViVmlld0lu dGVybmFsKSBfb2JqZWN0Rm9ySWRlbnRpZmllcjpdICsgMTI0IChXZWJWaWV3Lm1tOjM2OTYpCjEg ICBjb20uYXBwbGUuV2ViS2l0ICAgICAgICAgCTB4MDAyY2MyODQgV2ViRnJhbWVMb2FkZXJDbGll bnQ6OmNvbXBsZXRlUHJvZ3Jlc3ModW5zaWduZWQgbG9uZykgKyAxMjAgKFdlYkZyYW1lTG9hZGVy Q2xpZW50Lm1tOjYxMikKMiAgIGNvbS5hcHBsZS5XZWJDb3JlICAgICAgICAJMHgwMTRhZjQzOCBX ZWJDb3JlOjpGcmFtZUxvYWRlcjo6ZGlkRmFpbFRvTG9hZChXZWJDb3JlOjpSZXNvdXJjZUxvYWRl ciosIFdlYkNvcmU6OlJlc291cmNlRXJyb3IgY29uc3QmKSArIDkyIChGcmFtZUxvYWRlci5jcHA6 MzA4NikKMyAgIGNvbS5hcHBsZS5XZWJDb3JlICAgICAgICAJMHgwMTRjNzAzMCBXZWJDb3JlOjpS ZXNvdXJjZUxvYWRlcjo6ZGlkQ2FuY2VsKFdlYkNvcmU6OlJlc291cmNlRXJyb3IgY29uc3QmKSAr IDQ0OAo0ICAgY29tLmFwcGxlLldlYkNvcmUgICAgICAgIAkweDAxNGM0NzMwIFdlYkNvcmU6Ok1h aW5SZXNvdXJjZUxvYWRlcjo6ZGlkQ2FuY2VsKFdlYkNvcmU6OlJlc291cmNlRXJyb3IgY29uc3Qm KSArIDIzMiAoTWFpblJlc291cmNlTG9hZGVyLmNwcDo5MykKNSAgIGNvbS5hcHBsZS5XZWJDb3Jl ICAgICAgICAJMHgwMTRjNjlmNCBXZWJDb3JlOjpSZXNvdXJjZUxvYWRlcjo6Y2FuY2VsKFdlYkNv cmU6OlJlc291cmNlRXJyb3IgY29uc3QmKSArIDE1Ngo2ICAgY29tLmFwcGxlLldlYkNvcmUgICAg ICAgIAkweDAxNGM2YTU0IFdlYkNvcmU6OlJlc291cmNlTG9hZGVyOjpjYW5jZWwoKSArIDY4Cjcg ICBjb20uYXBwbGUuV2ViQ29yZSAgICAgICAgCTB4MDE0YWRkZGMgV2ViQ29yZTo6RnJhbWVMb2Fk ZXI6OmNhbmNlbE1haW5SZXNvdXJjZUxvYWQoKSArIDEyNCAoRnJhbWVMb2FkZXIuY3BwOjIwOTQp CjggICBjb20uYXBwbGUuV2ViQ29yZSAgICAgICAgCTB4MDE0YzJjODQgV2ViQ29yZTo6RG9jdW1l bnRMb2FkZXI6OnN0b3BMb2FkaW5nKCkgKyAxODggKERvY3VtZW50TG9hZGVyLmNwcDoyNjIpCjkg ICBjb20uYXBwbGUuV2ViQ29yZSAgICAgICAgCTB4MDE0Yjg2ZTggV2ViQ29yZTo6RnJhbWVMb2Fk ZXI6OnN0b3BBbGxMb2FkZXJzKCkgKyAxNjggKEZyYW1lTG9hZGVyLmNwcDoyMDgyKQoxMCAgY29t LmFwcGxlLldlYkNvcmUgICAgICAgIAkweDAxNGJlNDI4IFdlYkNvcmU6OkZyYW1lTG9hZGVyOjpm cmFtZURldGFjaGVkKCkgKyAzMiAoRnJhbWVMb2FkZXIuY3BwOjI4NTMpCjExICBjb20uYXBwbGUu V2ViQ29yZSAgICAgICAgCTB4MDE0OTc1MWMgV2ViQ29yZTo6SFRNTEZyYW1lRWxlbWVudEJhc2U6 OndpbGxSZW1vdmUoKSArIDg0IChIVE1MRnJhbWVFbGVtZW50QmFzZS5jcHA6MTk1KQoxMiAgY29t LmFwcGxlLldlYkNvcmUgICAgICAgIAkweDAxMTQzOGE0IFdlYkNvcmU6OkNvbnRhaW5lck5vZGU6 OndpbGxSZW1vdmUoKSArIDcyIChDb250YWluZXJOb2RlLmNwcDozMzEpCjEzICBjb20uYXBwbGUu V2ViQ29yZSAgICAgICAgCTB4MDExNDVjOTAgV2ViQ29yZTo6d2lsbFJlbW92ZUNoaWxkKFdlYkNv cmU6Ok5vZGUqKSArIDEyMCAoQ29udGFpbmVyTm9kZS5jcHA6MzQ3KQoxNCAgY29tLmFwcGxlLldl YkNvcmUgICAgICAgIAkweDAxMTQ2MTE4IFdlYkNvcmU6OkNvbnRhaW5lck5vZGU6OnJlbW92ZUNo aWxkKFdlYkNvcmU6Ok5vZGUqLCBpbnQmKSArIDcxMiAoQ29udGFpbmVyTm9kZS5jcHA6MzgwKQox NSAgY29tLmFwcGxlLldlYkNvcmUgICAgICAgIAkweDAxMTQ2YzI4IFdlYkNvcmU6OkNvbnRhaW5l ck5vZGU6OnJlcGxhY2VDaGlsZChXVEY6OlBhc3NSZWZQdHI8V2ViQ29yZTo6Tm9kZT4sIFdlYkNv cmU6Ok5vZGUqLCBpbnQmKSArIDQ1NiAoQ29udGFpbmVyTm9kZS5jcHA6MjUwKQoxNiAgY29tLmFw cGxlLldlYkNvcmUgICAgICAgIAkweDAxMzEyNGVjIEtKUzo6RE9NTm9kZVByb3RvRnVuYzo6Y2Fs bEFzRnVuY3Rpb24oS0pTOjpFeGVjU3RhdGUqLCBLSlM6OkpTT2JqZWN0KiwgS0pTOjpMaXN0IGNv bnN0JikgKyAxNzc2IChranNfZG9tLmNwcDozMjUpCjE3ICBjb20uYXBwbGUuSmF2YVNjcmlwdENv cmUgCTB4MDA0NGE0N2MgS0pTOjpKU09iamVjdDo6Y2FsbChLSlM6OkV4ZWNTdGF0ZSosIEtKUzo6 SlNPYmplY3QqLCBLSlM6Okxpc3QgY29uc3QmKSArIDI4OCAob2JqZWN0LmNwcDo5NikKMTggIGNv bS5hcHBsZS5KYXZhU2NyaXB0Q29yZSAJMHgwMDQzZTYwNCBLSlM6OkZ1bmN0aW9uQ2FsbERvdE5v ZGU6OmV2YWx1YXRlKEtKUzo6RXhlY1N0YXRlKikgKyA5NzIgKG5vZGVzLmNwcDo3NzIpCjE5ICBj b20uYXBwbGUuSmF2YVNjcmlwdENvcmUgCTB4MDA0M2FhMzggS0pTOjpFeHByU3RhdGVtZW50Tm9k ZTo6ZXhlY3V0ZShLSlM6OkV4ZWNTdGF0ZSopICsgMjIwIChub2Rlcy5jcHA6MTY3MikKMjAgIGNv bS5hcHBsZS5KYXZhU2NyaXB0Q29yZSAJMHgwMDQzN2ZkNCBLSlM6OlNvdXJjZUVsZW1lbnRzTm9k ZTo6ZXhlY3V0ZShLSlM6OkV4ZWNTdGF0ZSopICsgNjU2IChub2Rlcy5jcHA6MjQ1NikKMjEgIGNv bS5hcHBsZS5KYXZhU2NyaXB0Q29yZSAJMHgwMDQzNTk2OCBLSlM6OkJsb2NrTm9kZTo6ZXhlY3V0 ZShLSlM6OkV4ZWNTdGF0ZSopICsgMjE2IChub2Rlcy5jcHA6MTY0OSkKMjIgIGNvbS5hcHBsZS5K YXZhU2NyaXB0Q29yZSAJMHgwMDQyMzYxMCBLSlM6OkRlY2xhcmVkRnVuY3Rpb25JbXA6OmV4ZWN1 dGUoS0pTOjpFeGVjU3RhdGUqKSArIDkyIChmdW5jdGlvbi5jcHA6MzY0KQoyMyAgY29tLmFwcGxl LkphdmFTY3JpcHRDb3JlIAkweDAwNDI2ODE0IEtKUzo6RnVuY3Rpb25JbXA6OmNhbGxBc0Z1bmN0 aW9uKEtKUzo6RXhlY1N0YXRlKiwgS0pTOjpKU09iamVjdCosIEtKUzo6TGlzdCBjb25zdCYpICsg Njg4IChmdW5jdGlvbi5jcHA6MTE0KQoyNCAgY29tLmFwcGxlLkphdmFTY3JpcHRDb3JlIAkweDAw NDRhNDdjIEtKUzo6SlNPYmplY3Q6OmNhbGwoS0pTOjpFeGVjU3RhdGUqLCBLSlM6OkpTT2JqZWN0 KiwgS0pTOjpMaXN0IGNvbnN0JikgKyAyODggKG9iamVjdC5jcHA6OTYpCjI1ICBjb20uYXBwbGUu SmF2YVNjcmlwdENvcmUgCTB4MDA0M2VlZjAgS0pTOjpGdW5jdGlvbkNhbGxSZXNvbHZlTm9kZTo6 ZXZhbHVhdGUoS0pTOjpFeGVjU3RhdGUqKSArIDg1NiAobm9kZXMuY3BwOjY3OSkKMjYgIGNvbS5h cHBsZS5KYXZhU2NyaXB0Q29yZSAJMHgwMDQzYWEzOCBLSlM6OkV4cHJTdGF0ZW1lbnROb2RlOjpl eGVjdXRlKEtKUzo6RXhlY1N0YXRlKikgKyAyMjAgKG5vZGVzLmNwcDoxNjcyKQoyNyAgY29tLmFw cGxlLkphdmFTY3JpcHRDb3JlIAkweDAwNDM3ZTcwIEtKUzo6U291cmNlRWxlbWVudHNOb2RlOjpl eGVjdXRlKEtKUzo6RXhlY1N0YXRlKikgKyAzMDAgKG5vZGVzLmNwcDoyNDUwKQoyOCAgY29tLmFw cGxlLkphdmFTY3JpcHRDb3JlIAkweDAwNDM1OTY4IEtKUzo6QmxvY2tOb2RlOjpleGVjdXRlKEtK Uzo6RXhlY1N0YXRlKikgKyAyMTYgKG5vZGVzLmNwcDoxNjQ5KQoyOSAgY29tLmFwcGxlLkphdmFT Y3JpcHRDb3JlIAkweDAwNDNhOTQ0IEtKUzo6SWZOb2RlOjpleGVjdXRlKEtKUzo6RXhlY1N0YXRl KikgKyA2NTIgKG5vZGVzLmNwcDoxNjk5KQozMCAgY29tLmFwcGxlLkphdmFTY3JpcHRDb3JlIAkw eDAwNDM3ZTcwIEtKUzo6U291cmNlRWxlbWVudHNOb2RlOjpleGVjdXRlKEtKUzo6RXhlY1N0YXRl KikgKyAzMDAgKG5vZGVzLmNwcDoyNDUwKQozMSAgY29tLmFwcGxlLkphdmFTY3JpcHRDb3JlIAkw eDAwNDM1OTY4IEtKUzo6QmxvY2tOb2RlOjpleGVjdXRlKEtKUzo6RXhlY1N0YXRlKikgKyAyMTYg KG5vZGVzLmNwcDoxNjQ5KQozMiAgY29tLmFwcGxlLkphdmFTY3JpcHRDb3JlIAkweDAwNDM2Zjlj IEtKUzo6VHJ5Tm9kZTo6ZXhlY3V0ZShLSlM6OkV4ZWNTdGF0ZSopICsgNTI4IChub2Rlcy5jcHA6 MjMwMCkKMzMgIGNvbS5hcHBsZS5KYXZhU2NyaXB0Q29yZSAJMHgwMDQzN2ZkNCBLSlM6OlNvdXJj ZUVsZW1lbnRzTm9kZTo6ZXhlY3V0ZShLSlM6OkV4ZWNTdGF0ZSopICsgNjU2IChub2Rlcy5jcHA6 MjQ1NikKMzQgIGNvbS5hcHBsZS5KYXZhU2NyaXB0Q29yZSAJMHgwMDQzNTk2OCBLSlM6OkJsb2Nr Tm9kZTo6ZXhlY3V0ZShLSlM6OkV4ZWNTdGF0ZSopICsgMjE2IChub2Rlcy5jcHA6MTY0OSkKMzUg IGNvbS5hcHBsZS5KYXZhU2NyaXB0Q29yZSAJMHgwMDQyMzYxMCBLSlM6OkRlY2xhcmVkRnVuY3Rp b25JbXA6OmV4ZWN1dGUoS0pTOjpFeGVjU3RhdGUqKSArIDkyIChmdW5jdGlvbi5jcHA6MzY0KQoz NiAgY29tLmFwcGxlLkphdmFTY3JpcHRDb3JlIAkweDAwNDI2ODE0IEtKUzo6RnVuY3Rpb25JbXA6 OmNhbGxBc0Z1bmN0aW9uKEtKUzo6RXhlY1N0YXRlKiwgS0pTOjpKU09iamVjdCosIEtKUzo6TGlz dCBjb25zdCYpICsgNjg4IChmdW5jdGlvbi5jcHA6MTE0KQozNyAgY29tLmFwcGxlLkphdmFTY3Jp cHRDb3JlIAkweDAwNDRhNDdjIEtKUzo6SlNPYmplY3Q6OmNhbGwoS0pTOjpFeGVjU3RhdGUqLCBL SlM6OkpTT2JqZWN0KiwgS0pTOjpMaXN0IGNvbnN0JikgKyAyODggKG9iamVjdC5jcHA6OTYpCjM4 ICBjb20uYXBwbGUuSmF2YVNjcmlwdENvcmUgCTB4MDA0M2VlZjAgS0pTOjpGdW5jdGlvbkNhbGxS ZXNvbHZlTm9kZTo6ZXZhbHVhdGUoS0pTOjpFeGVjU3RhdGUqKSArIDg1NiAobm9kZXMuY3BwOjY3 OSkKMzkgIGNvbS5hcHBsZS5KYXZhU2NyaXB0Q29yZSAJMHgwMDQzYWEzOCBLSlM6OkV4cHJTdGF0 ZW1lbnROb2RlOjpleGVjdXRlKEtKUzo6RXhlY1N0YXRlKikgKyAyMjAgKG5vZGVzLmNwcDoxNjcy KQo0MCAgY29tLmFwcGxlLkphdmFTY3JpcHRDb3JlIAkweDAwNDM3ZTcwIEtKUzo6U291cmNlRWxl bWVudHNOb2RlOjpleGVjdXRlKEtKUzo6RXhlY1N0YXRlKikgKyAzMDAgKG5vZGVzLmNwcDoyNDUw KQo0MSAgY29tLmFwcGxlLkphdmFTY3JpcHRDb3JlIAkweDAwNDM1OTY4IEtKUzo6QmxvY2tOb2Rl OjpleGVjdXRlKEtKUzo6RXhlY1N0YXRlKikgKyAyMTYgKG5vZGVzLmNwcDoxNjQ5KQo0MiAgY29t LmFwcGxlLkphdmFTY3JpcHRDb3JlIAkweDAwNDIzNjEwIEtKUzo6RGVjbGFyZWRGdW5jdGlvbklt cDo6ZXhlY3V0ZShLSlM6OkV4ZWNTdGF0ZSopICsgOTIgKGZ1bmN0aW9uLmNwcDozNjQpCjQzICBj b20uYXBwbGUuSmF2YVNjcmlwdENvcmUgCTB4MDA0MjY4MTQgS0pTOjpGdW5jdGlvbkltcDo6Y2Fs bEFzRnVuY3Rpb24oS0pTOjpFeGVjU3RhdGUqLCBLSlM6OkpTT2JqZWN0KiwgS0pTOjpMaXN0IGNv bnN0JikgKyA2ODggKGZ1bmN0aW9uLmNwcDoxMTQpCjQ0ICBjb20uYXBwbGUuSmF2YVNjcmlwdENv cmUgCTB4MDA0NGE0N2MgS0pTOjpKU09iamVjdDo6Y2FsbChLSlM6OkV4ZWNTdGF0ZSosIEtKUzo6 SlNPYmplY3QqLCBLSlM6Okxpc3QgY29uc3QmKSArIDI4OCAob2JqZWN0LmNwcDo5NikKNDUgIGNv bS5hcHBsZS5KYXZhU2NyaXB0Q29yZSAJMHgwMDQzZWVmMCBLSlM6OkZ1bmN0aW9uQ2FsbFJlc29s dmVOb2RlOjpldmFsdWF0ZShLSlM6OkV4ZWNTdGF0ZSopICsgODU2IChub2Rlcy5jcHA6Njc5KQo0 NiAgY29tLmFwcGxlLkphdmFTY3JpcHRDb3JlIAkweDAwNDNhYTM4IEtKUzo6RXhwclN0YXRlbWVu dE5vZGU6OmV4ZWN1dGUoS0pTOjpFeGVjU3RhdGUqKSArIDIyMCAobm9kZXMuY3BwOjE2NzIpCjQ3 ICBjb20uYXBwbGUuSmF2YVNjcmlwdENvcmUgCTB4MDA0MzdlNzAgS0pTOjpTb3VyY2VFbGVtZW50 c05vZGU6OmV4ZWN1dGUoS0pTOjpFeGVjU3RhdGUqKSArIDMwMCAobm9kZXMuY3BwOjI0NTApCjQ4 ICBjb20uYXBwbGUuSmF2YVNjcmlwdENvcmUgCTB4MDA0MzU5NjggS0pTOjpCbG9ja05vZGU6OmV4 ZWN1dGUoS0pTOjpFeGVjU3RhdGUqKSArIDIxNiAobm9kZXMuY3BwOjE2NDkpCjQ5ICBjb20uYXBw bGUuSmF2YVNjcmlwdENvcmUgCTB4MDA0MjM2MTAgS0pTOjpEZWNsYXJlZEZ1bmN0aW9uSW1wOjpl eGVjdXRlKEtKUzo6RXhlY1N0YXRlKikgKyA5MiAoZnVuY3Rpb24uY3BwOjM2NCkKNTAgIGNvbS5h cHBsZS5KYXZhU2NyaXB0Q29yZSAJMHgwMDQyNjgxNCBLSlM6OkZ1bmN0aW9uSW1wOjpjYWxsQXNG dW5jdGlvbihLSlM6OkV4ZWNTdGF0ZSosIEtKUzo6SlNPYmplY3QqLCBLSlM6Okxpc3QgY29uc3Qm KSArIDY4OCAoZnVuY3Rpb24uY3BwOjExNCkKNTEgIGNvbS5hcHBsZS5KYXZhU2NyaXB0Q29yZSAJ MHgwMDQ0YTQ3YyBLSlM6OkpTT2JqZWN0OjpjYWxsKEtKUzo6RXhlY1N0YXRlKiwgS0pTOjpKU09i amVjdCosIEtKUzo6TGlzdCBjb25zdCYpICsgMjg4IChvYmplY3QuY3BwOjk2KQo1MiAgY29tLmFw cGxlLldlYkNvcmUgICAgICAgIAkweDAxMzE1ZGUwIEtKUzo6SlNBYnN0cmFjdEV2ZW50TGlzdGVu ZXI6OmhhbmRsZUV2ZW50KFdlYkNvcmU6OkV2ZW50KiwgYm9vbCkgKyA3MzYgKGtqc19ldmVudHMu Y3BwOjEyMSkKNTMgIGNvbS5hcHBsZS5XZWJDb3JlICAgICAgICAJMHgwMTEzNTgwNCBXZWJDb3Jl OjpEb2N1bWVudDo6aGFuZGxlV2luZG93RXZlbnQoV2ViQ29yZTo6RXZlbnQqLCBib29sKSArIDQx NiAoRG9jdW1lbnQuY3BwOjIxNTUpCjU0ICBjb20uYXBwbGUuV2ViQ29yZSAgICAgICAgCTB4MDEy ZDYxZDggV2ViQ29yZTo6RXZlbnRUYXJnZXROb2RlOjpkaXNwYXRjaFdpbmRvd0V2ZW50KFdlYkNv cmU6OkF0b21pY1N0cmluZyBjb25zdCYsIGJvb2wsIGJvb2wpICsgMzYwIChFdmVudFRhcmdldE5v ZGUuY3BwOjMyOCkKNTUgIGNvbS5hcHBsZS5XZWJDb3JlICAgICAgICAJMHgwMTEzODY5MCBXZWJD b3JlOjpEb2N1bWVudDo6aW1wbGljaXRDbG9zZSgpICsgNzk2IChEb2N1bWVudC5jcHA6MTMyMSkK NTYgIGNvbS5hcHBsZS5XZWJDb3JlICAgICAgICAJMHgwMTRiMDlhOCBXZWJDb3JlOjpGcmFtZUxv YWRlcjo6Y2hlY2tFbWl0TG9hZEV2ZW50KCkgKyA1OTYgKEZyYW1lTG9hZGVyLmNwcDoxMTAyKQo1 NyAgY29tLmFwcGxlLldlYkNvcmUgICAgICAgIAkweDAxNGJjYTg4IFdlYkNvcmU6OkZyYW1lTG9h ZGVyOjpjaGVja0NvbXBsZXRlZCgpICsgNDY4IChGcmFtZUxvYWRlci5jcHA6MTA3MykKNTggIGNv bS5hcHBsZS5XZWJDb3JlICAgICAgICAJMHgwMTRiYzg4YyBXZWJDb3JlOjpGcmFtZUxvYWRlcjo6 Y29tcGxldGVkKCkgKyAyMTYgKEZyYW1lTG9hZGVyLmNwcDoxNjM1KQo1OSAgY29tLmFwcGxlLldl YkNvcmUgICAgICAgIAkweDAxNGJjYjE0IFdlYkNvcmU6OkZyYW1lTG9hZGVyOjpjaGVja0NvbXBs ZXRlZCgpICsgNjA4IChGcmFtZUxvYWRlci5jcHA6MTA3NykKNjAgIGNvbS5hcHBsZS5XZWJDb3Jl ICAgICAgICAJMHgwMTRiZmE1OCBXZWJDb3JlOjpGcmFtZUxvYWRlcjo6c3RvcCgpICsgMjYwIChG cmFtZUxvYWRlci5jcHA6NTc3KQo2MSAgY29tLmFwcGxlLldlYkNvcmUgICAgICAgIAkweDAxNGJm YjQ0IFdlYkNvcmU6OkZyYW1lTG9hZGVyOjpyZWNlaXZlZE1haW5SZXNvdXJjZUVycm9yKFdlYkNv cmU6OlJlc291cmNlRXJyb3IgY29uc3QmLCBib29sKSArIDEwNCAoRnJhbWVMb2FkZXIuY3BwOjMx MDYpCjYyICBjb20uYXBwbGUuV2ViQ29yZSAgICAgICAgCTB4MDE0YzQ4MjQgV2ViQ29yZTo6TWFp blJlc291cmNlTG9hZGVyOjpyZWNlaXZlZEVycm9yKFdlYkNvcmU6OlJlc291cmNlRXJyb3IgY29u c3QmKSArIDIxNiAoTWFpblJlc291cmNlTG9hZGVyLmNwcDo3NSkKNjMgIGNvbS5hcHBsZS5XZWJD b3JlICAgICAgICAJMHgwMTRjNGE4MCBXZWJDb3JlOjpNYWluUmVzb3VyY2VMb2FkZXI6OmRpZEZh aWwoV2ViQ29yZTo6UmVzb3VyY2VFcnJvciBjb25zdCYpICsgMTIwIChNYWluUmVzb3VyY2VMb2Fk ZXIuY3BwOjMyNCkKNjQgIGNvbS5hcHBsZS5XZWJDb3JlICAgICAgICAJMHgwMTRjNjk0NCBXZWJD b3JlOjpSZXNvdXJjZUxvYWRlcjo6ZGlkRmFpbChXZWJDb3JlOjpSZXNvdXJjZUhhbmRsZSosIFdl YkNvcmU6OlJlc291cmNlRXJyb3IgY29uc3QmKSArIDY4CjY1ICBjb20uYXBwbGUuV2ViQ29yZSAg ICAgICAgCTB4MDE0OWUxMmMgLVtXZWJDb3JlUmVzb3VyY2VIYW5kbGVBc0RlbGVnYXRlIGNvbm5l Y3Rpb246ZGlkRmFpbFdpdGhFcnJvcjpdICsgMTY0IChSZXNvdXJjZUhhbmRsZU1hYy5tbTozNzYp CjY2ICBjb20uYXBwbGUuRm91bmRhdGlvbiAgICAgCTB4OTI5YmMxMTAgLVtOU1VSTENvbm5lY3Rp b24oTlNVUkxDb25uZWN0aW9uSW50ZXJuYWwpIF9zZW5kRGlkRmFpbENhbGxiYWNrXSArIDEwMAo2 NyAgY29tLmFwcGxlLkZvdW5kYXRpb24gICAgIAkweDkyOTkxYWI4IC1bTlNVUkxDb25uZWN0aW9u KE5TVVJMQ29ubmVjdGlvbkludGVybmFsKSBfc2VuZENhbGxiYWNrc10gKyA1NTYKNjggIGNvbS5h cHBsZS5Gb3VuZGF0aW9uICAgICAJMHg5Mjk5MTgxMCBfc2VuZENhbGxiYWNrcyArIDE1Ngo2OSAg Y29tLmFwcGxlLkNvcmVGb3VuZGF0aW9uIAkweDkwN2RkNGNjIF9fQ0ZSdW5Mb29wRG9Tb3VyY2Vz MCArIDM4NAo3MCAgY29tLmFwcGxlLkNvcmVGb3VuZGF0aW9uIAkweDkwN2RjOWZjIF9fQ0ZSdW5M b29wUnVuICsgNDUyCjcxICBjb20uYXBwbGUuQ29yZUZvdW5kYXRpb24gCTB4OTA3ZGM0N2MgQ0ZS dW5Mb29wUnVuU3BlY2lmaWMgKyAyNjgKNzIgIGNvbS5hcHBsZS5Gb3VuZGF0aW9uICAgICAJMHg5 Mjk3MDE2NCAtW05TUnVuTG9vcCBydW5Nb2RlOmJlZm9yZURhdGU6XSArIDE3Mgo3MyAgRHVtcFJl bmRlclRyZWUgICAgICAgICAgIAkweDAwMDBjZWYwIHJ1blRlc3QgKyAxNDYwIChEdW1wUmVuZGVy VHJlZS5tOjEwNDIpCjc0ICBEdW1wUmVuZGVyVHJlZSAgICAgICAgICAgCTB4MDAwMDhhNWMgZHVt cFJlbmRlclRyZWUgKyA0MDI4IChEdW1wUmVuZGVyVHJlZS5tOjM5OSkKNzUgIER1bXBSZW5kZXJU cmVlICAgICAgICAgICAJMHgwMDAwOGRhOCBtYWluICsgMTIwIChEdW1wUmVuZGVyVHJlZS5tOjQ1 MCkKNzYgIER1bXBSZW5kZXJUcmVlICAgICAgICAgICAJMHgwMDAwMjQyMCBfc3RhcnQgKyA3NjAK NzcgIER1bXBSZW5kZXJUcmVlICAgICAgICAgICAJMHgwMDAwMjEyNCBzdGFydCArIDQ4Cg== 12424 2007-01-14 05:06:45 -0800 2007-01-14 08:43:38 -0800 Patch v1 bug-12251-v1.diff text/plain 1697 ddkilzer SW5kZXg6IFdlYktpdC9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L0NoYW5nZUxvZwko cmV2aXNpb24gMTg4NDMpCisrKyBXZWJLaXQvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0x LDMgKzEsMTcgQEAKKzIwMDctMDEtMTQgIERhdmlkIEtpbHplciAgPGRka2lsemVyQGtpbHplci5u ZXQ+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgLSBm aXggaHR0cDovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTIyNTEKKyAgICAgICAg ICBSRUdSRVNTSU9OIChyMTg4MjItcjE4ODIzKTogQXNzZXJ0aW9uIGZhaWx1cmUgb3BlbmluZyBk b2N1bWVudCB3aXRoIG5vbi1leGlzdGVudCByZXNvdXJjZXMKKyAgICAgICAgICAoZG9tL3hodG1s L2xldmVsMi9odG1sL0hUTUxJRnJhbWVFbGVtZW50MTEueGh0bWwpCisKKyAgICAgICAgKiBXZWJW aWV3L1dlYlZpZXcubW06CisgICAgICAgICgtW1dlYlZpZXcgX29iamVjdEZvcklkZW50aWZpZXI6 XSk6IFJlbW92ZWQgYXNzZXJ0aW9uLiAgUmV0dXJuIG5pbCBpZiBpZGVudGlmaWVyIGlzCisgICAg ICAgIG5vdCBmb3VuZCBpbiB0aGUgaGFzaCBtYXAuCisgICAgICAgICgtW1dlYlZpZXcgX3JlbW92 ZU9iamVjdEZvcklkZW50aWZpZXI6XSk6IFJlbW92ZWQgYXNzZXJ0aW9uLiAgUmVtb3ZlIG9iamVj dCBvbmx5IGlmCisgICAgICAgIGlkZW50aWZpZXIgaXMgZm91bmQgaW4gdGhlIGhhc2ggbWFwLgor CiAyMDA3LTAxLTEyICBBbmRlcnMgQ2FybHNzb24gIDxhY2FybHNzb25AYXBwbGUuY29tPgogCiAg ICAgICAgIFJldmlld2VkIGJ5IERhcmluLgpJbmRleDogV2ViS2l0L1dlYlZpZXcvV2ViVmlldy5t bQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBXZWJLaXQvV2ViVmlldy9XZWJWaWV3Lm1tCShyZXZpc2lvbiAxODg0 MykKKysrIFdlYktpdC9XZWJWaWV3L1dlYlZpZXcubW0JKHdvcmtpbmcgY29weSkKQEAgLTM2OTMs MTQgKzM2OTMsMTUgQEAgc3RhdGljIFdlYkZyYW1lVmlldyAqY29udGFpbmluZ0ZyYW1lVmlldwog CiAtIChpZClfb2JqZWN0Rm9ySWRlbnRpZmllcjoodW5zaWduZWQgbG9uZylpZGVudGlmaWVyCiB7 Ci0gICAgQVNTRVJUKF9wcml2YXRlLT5pZGVudGlmaWVyTWFwLT5jb250YWlucyhpZGVudGlmaWVy KSk7CisgICAgaWYgKCFfcHJpdmF0ZS0+aWRlbnRpZmllck1hcC0+Y29udGFpbnMoaWRlbnRpZmll cikpCisgICAgICAgIHJldHVybiBuaWw7CiAgICAgcmV0dXJuIF9wcml2YXRlLT5pZGVudGlmaWVy TWFwLT5nZXQoaWRlbnRpZmllcikuZ2V0KCk7CiB9CiAKIC0gKHZvaWQpX3JlbW92ZU9iamVjdEZv cklkZW50aWZpZXI6KHVuc2lnbmVkIGxvbmcpaWRlbnRpZmllcgogewotICAgIEFTU0VSVChfcHJp dmF0ZS0+aWRlbnRpZmllck1hcC0+Y29udGFpbnMoaWRlbnRpZmllcikpOwotICAgIF9wcml2YXRl LT5pZGVudGlmaWVyTWFwLT5yZW1vdmUoaWRlbnRpZmllcik7CisgICAgaWYgKF9wcml2YXRlLT5p ZGVudGlmaWVyTWFwLT5jb250YWlucyhpZGVudGlmaWVyKSkKKyAgICAgICAgX3ByaXZhdGUtPmlk ZW50aWZpZXJNYXAtPnJlbW92ZShpZGVudGlmaWVyKTsKIH0KIAogQGVuZAo= 12428 2007-01-14 08:43:38 -0800 2007-01-14 13:56:54 -0800 Patch v2 bug-12251-v2.diff text/plain 1369 ddkilzer SW5kZXg6IFdlYktpdC9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L0NoYW5nZUxvZwko cmV2aXNpb24gMTg4NDMpCisrKyBXZWJLaXQvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0x LDMgKzEsMTUgQEAKKzIwMDctMDEtMTQgIERhdmlkIEtpbHplciAgPGRka2lsemVyQGtpbHplci5u ZXQ+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgLSBm aXggaHR0cDovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTIyNTEKKyAgICAgICAg ICBSRUdSRVNTSU9OIChyMTg4MjItcjE4ODIzKTogQXNzZXJ0aW9uIGZhaWx1cmUgb3BlbmluZyBk b2N1bWVudCB3aXRoIG5vbi1leGlzdGVudCByZXNvdXJjZXMKKyAgICAgICAgICAoZG9tL3hodG1s L2xldmVsMi9odG1sL0hUTUxJRnJhbWVFbGVtZW50MTEueGh0bWwpCisKKyAgICAgICAgKiBXZWJW aWV3L1dlYlZpZXcubW06CisgICAgICAgICgtW1dlYlZpZXcgX29iamVjdEZvcklkZW50aWZpZXI6 XSk6IFJlbW92ZWQgYXNzZXJ0aW9uLgorICAgICAgICAoLVtXZWJWaWV3IF9yZW1vdmVPYmplY3RG b3JJZGVudGlmaWVyOl0pOiBSZW1vdmVkIGFzc2VydGlvbi4KKwogMjAwNy0wMS0xMiAgQW5kZXJz IENhcmxzc29uICA8YWNhcmxzc29uQGFwcGxlLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBE YXJpbi4KSW5kZXg6IFdlYktpdC9XZWJWaWV3L1dlYlZpZXcubW0KPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2Vi S2l0L1dlYlZpZXcvV2ViVmlldy5tbQkocmV2aXNpb24gMTg4NDMpCisrKyBXZWJLaXQvV2ViVmll dy9XZWJWaWV3Lm1tCSh3b3JraW5nIGNvcHkpCkBAIC0zNjkzLDEzICszNjkzLDExIEBAIHN0YXRp YyBXZWJGcmFtZVZpZXcgKmNvbnRhaW5pbmdGcmFtZVZpZXcKIAogLSAoaWQpX29iamVjdEZvcklk ZW50aWZpZXI6KHVuc2lnbmVkIGxvbmcpaWRlbnRpZmllcgogewotICAgIEFTU0VSVChfcHJpdmF0 ZS0+aWRlbnRpZmllck1hcC0+Y29udGFpbnMoaWRlbnRpZmllcikpOwogICAgIHJldHVybiBfcHJp dmF0ZS0+aWRlbnRpZmllck1hcC0+Z2V0KGlkZW50aWZpZXIpLmdldCgpOwogfQogCiAtICh2b2lk KV9yZW1vdmVPYmplY3RGb3JJZGVudGlmaWVyOih1bnNpZ25lZCBsb25nKWlkZW50aWZpZXIKIHsK LSAgICBBU1NFUlQoX3ByaXZhdGUtPmlkZW50aWZpZXJNYXAtPmNvbnRhaW5zKGlkZW50aWZpZXIp KTsKICAgICBfcHJpdmF0ZS0+aWRlbnRpZmllck1hcC0+cmVtb3ZlKGlkZW50aWZpZXIpOwogfQog Cg==