12134 2007-01-05 18:08:40 -0800 REGRESSION: Assertion failure and crash when right clicking selection in forms 2007-01-29 23:18:25 -0800 1 1 1 Unclassified WebKit WebCore Misc. 420+ Mac OS X 10.4 RESOLVED FIXED Regression P1 Normal --- 1 dev+webkit aroben ap aroben bdakin ddkilzer eric oldest_to_newest 36767 0 dev+webkit 2007-01-05 18:08:40 -0800 In this bug report, select something in the Summary or Keywords fields and right click, you'll get the following assertion failure and crash: ASSERTION FAILED: [[newMenuItems objectAtIndex:1] isSeparatorItem] (/Users/matt/Code/WebKit/WebKit/WebCoreSupport/WebContextMenuClient.mm:76 getCustomMenuFromDefaultItems) 36752 1 12254 dev+webkit 2007-01-05 18:10:41 -0800 Created attachment 12254 Crashlog 35791 2 darin 2007-01-11 09:20:39 -0800 I tried and can't reproduce this. Maybe it's fixed already? 35804 3 bdakin 2007-01-11 10:49:25 -0800 I can't reproduce this either. It's possible that it has been fixed, but I am not sure which specific check-in would have addressed this. 35706 4 dev+webkit 2007-01-11 19:15:10 -0800 Sorry, I could have been clearer in my initial report. I can reliably reproduce this by double clicking on "REGRESSION" in the summary field and then right clicking with r18783. If that doesn't work, Command + A to select everything in the summary field also works - seems to be an issue with word boundaries as selecting only part of a word doesn't trigger the failure. 35456 5 bdakin 2007-01-12 10:43:13 -0800 Looks like this might be fixed, then, because I still cannot reproduce with the more specific instructions (I am at r18804). Matt, could you update and try again? Then if you cannot reproduce, we can close the bug. 35454 6 bdakin 2007-01-12 10:45:22 -0800 Wait never mind, I just realized that your revision number is actually very recent. I wonder why no one else can reproduce this? 35447 7 ddkilzer 2007-01-12 10:50:18 -0800 (In reply to comment #6) > Wait never mind, I just realized that your revision number is actually very > recent. I wonder why no one else can reproduce this? Assertion failures require a debug build to trip? 35445 8 ddkilzer 2007-01-12 10:56:20 -0800 (In reply to comment #6) > Wait never mind, I just realized that your revision number is actually very > recent. I wonder why no one else can reproduce this? Confirmed with locally-built DEBUG build of WebKit r18804 with Safari 2.0.4 (419.3) on Mac OS X 10.4.8 (8N1037). 35431 9 bdakin 2007-01-12 11:10:58 -0800 I am using a Debug build also. Dave, does your last comment mean that you *can* reproduce, or that you *cannot*? 35432 10 ap 2007-01-12 11:14:41 -0800 I'm also getting this assertion failure (not 100% reliably). 35435 11 ddkilzer 2007-01-12 11:40:24 -0800 (In reply to comment #9) > I am using a Debug build also. Dave, does your last comment mean that you *can* > reproduce, or that you *cannot*? Sorry, I *am* able to reproduce this assertion failure. I'm using a MBP Core 2 Duo with a Wireless Mighty Mouse (if that makes a difference). 35436 12 ap 2007-01-12 11:43:58 -0800 (In reply to comment #11) > I'm using a MBP Core 2 Duo with a Wireless Mighty Mouse (if that makes a difference). A G4 here. Some debug data: (gdb) po defaultMenuItems <NSCFArray 0x22fe6e0>( <MenuItem: 0x6a23b90 Search in Spotlight>, <MenuItem: 0x6a23c00 Search in Google>, <MenuItem: 0x6a30f10 >, <MenuItem: 0x6a23c90 Look Up in Dictionary>, <MenuItem: 0x6a30f80 >, <MenuItem: 0x6a242a0 Cut>, <MenuItem: 0x6a23d20 Copy>, <MenuItem: 0x6a24310 Paste>, <MenuItem: 0x6a30ff0 >, <MenuItem: 0x6a31410 Spelling, submenu: 0x6a30380 ()>, <MenuItem: 0x6a31870 Font, submenu: 0x6a24380 ()>, <MenuItem: 0x6a328b0 Speech, submenu: 0x6a31f30 ()>, <MenuItem: 0x6a330b0 Writing Direction, submenu: 0x6a32950 ()> ) (gdb) po newMenuItems <MenuItem: 0x22121f0 > <MenuItem: 0x6a25490 Spelling, submenu: 0x6a1e580 ()> <MenuItem: 0x6a1e090 > <MenuItem: 0x6a1dcf0 Copy> 35422 13 beidson 2007-01-12 11:47:57 -0800 I found a way to reproduce this pretty reliably and helped Beth with the steps :) 35421 14 bdakin 2007-01-12 11:55:29 -0800 Looks like this only happens with older version of the app. Boo. 34883 15 aroben 2007-01-14 22:52:23 -0800 I believe the problem is that we've made new tags that have the same values as old SPI tags used to have. See the change here: http://trac.webkit.org/projects/webkit/changeset/10008 I've got a fix on the way. 34871 16 12448 aroben 2007-01-14 23:59:18 -0800 Created attachment 12448 Proposed fix 34770 17 12448 darin 2007-01-15 08:49:43 -0800 Comment on attachment 12448 Proposed fix Looks good. Why is there a default case in the switch statement in ContextMenu.cpp. In gcc, all the default case does is turn off the often-useful warning for enum values that have no case. If the switch value's type is not an enum, then a "default: break" case does nothing. I think getCustomMenuFromDefaultItems would read better with an early exit rather than most of the function inside an if. I also think it might be best to have this code only trigger on applications compiled against the old WebKit. Tim Hatcher has the details about how we can check this. r=me 34780 18 aroben 2007-01-15 10:48:05 -0800 Landed as r18864 30575 19 aroben 2007-01-29 23:18:25 -0800 *** Bug 12433 has been marked as a duplicate of this bug. *** 12254 2007-01-05 18:10:41 -0800 2007-01-05 18:10:41 -0800 Crashlog wcmenuassert.txt text/plain 4940 dev+webkit RGF0ZS9UaW1lOiAgICAgIDIwMDctMDEtMDUgMTk6NDM6MjcuMDg1IC0wNjAwCk9TIFZlcnNpb246 ICAgICAxMC40LjggKEJ1aWxkIDhMMTI3KQpSZXBvcnQgVmVyc2lvbjogNAoKQ29tbWFuZDogU2Fm YXJpClBhdGg6ICAgIC9BcHBsaWNhdGlvbnMvU2FmYXJpLmFwcC9Db250ZW50cy9NYWNPUy9TYWZh cmkKUGFyZW50OiAgYmFzaCBbMTExMTFdCgpWZXJzaW9uOiAyLjAuNCAoNDE5LjMpCgpQSUQ6ICAg IDEzMTg0ClRocmVhZDogMAoKRXhjZXB0aW9uOiAgRVhDX0JBRF9BQ0NFU1MgKDB4MDAwMSkKQ29k ZXM6ICAgICAgS0VSTl9JTlZBTElEX0FERFJFU1MgKDB4MDAwMSkgYXQgMHhiYmFkYmVlZgoKVGhy ZWFkIDAgQ3Jhc2hlZDoKMCAgIGNvbS5hcHBsZS5XZWJLaXQgICAgICAgICAJMHgwMDNkMjY1OCBX ZWJDb250ZXh0TWVudUNsaWVudDo6Z2V0Q3VzdG9tTWVudUZyb21EZWZhdWx0SXRlbXMoV2ViQ29y ZTo6Q29udGV4dE1lbnUqKSArIDc2MCAoV2ViQ29udGV4dE1lbnVDbGllbnQubW06NzYpCjEgICBj b20uYXBwbGUuV2ViQ29yZSAgICAgICAgCTB4MDE0ZjRlZjQgV2ViQ29yZTo6Q29udGV4dE1lbnVD b250cm9sbGVyOjpoYW5kbGVDb250ZXh0TWVudUV2ZW50KFdlYkNvcmU6OkV2ZW50KikgKyA3MDgg KENvbnRleHRNZW51Q29udHJvbGxlci5jcHA6OTQpCjIgICBjb20uYXBwbGUuV2ViQ29yZSAgICAg ICAgCTB4MDEyZDIzMzggV2ViQ29yZTo6RXZlbnRUYXJnZXROb2RlOjpkZWZhdWx0RXZlbnRIYW5k bGVyKFdlYkNvcmU6OkV2ZW50KikgKyA2MjQgKEV2ZW50VGFyZ2V0Tm9kZS5jcHA6NTc4KQozICAg Y29tLmFwcGxlLldlYkNvcmUgICAgICAgIAkweDAxMmQwMGM0IFdlYkNvcmU6OkV2ZW50VGFyZ2V0 Tm9kZTo6ZGlzcGF0Y2hHZW5lcmljRXZlbnQoV1RGOjpQYXNzUmVmUHRyPFdlYkNvcmU6OkV2ZW50 PiwgaW50JiwgYm9vbCkgKyAyNDUyIChFdmVudFRhcmdldE5vZGUuY3BwOjI2MSkKNCAgIGNvbS5h cHBsZS5XZWJDb3JlICAgICAgICAJMHgwMTJkMWRmYyBXZWJDb3JlOjpFdmVudFRhcmdldE5vZGU6 OmRpc3BhdGNoRXZlbnQoV1RGOjpQYXNzUmVmUHRyPFdlYkNvcmU6OkV2ZW50PiwgaW50JiwgYm9v bCkgKyA0MDAgKEV2ZW50VGFyZ2V0Tm9kZS5jcHA6Mjk3KQo1ICAgY29tLmFwcGxlLldlYkNvcmUg ICAgICAgIAkweDAxMmQwOWI4IFdlYkNvcmU6OkV2ZW50VGFyZ2V0Tm9kZTo6ZGlzcGF0Y2hNb3Vz ZUV2ZW50KFdlYkNvcmU6OkF0b21pY1N0cmluZyBjb25zdCYsIGludCwgaW50LCBpbnQsIGludCwg aW50LCBpbnQsIGJvb2wsIGJvb2wsIGJvb2wsIGJvb2wsIGJvb2wsIFdlYkNvcmU6Ok5vZGUqLCBX VEY6OlBhc3NSZWZQdHI8V2ViQ29yZTo6RXZlbnQ+KSArIDcxNiAoRXZlbnRUYXJnZXROb2RlLmNw cDo0NTUpCjYgICBjb20uYXBwbGUuV2ViQ29yZSAgICAgICAgCTB4MDEyZDExNDQgV2ViQ29yZTo6 RXZlbnRUYXJnZXROb2RlOjpkaXNwYXRjaE1vdXNlRXZlbnQoV2ViQ29yZTo6UGxhdGZvcm1Nb3Vz ZUV2ZW50IGNvbnN0JiwgV2ViQ29yZTo6QXRvbWljU3RyaW5nIGNvbnN0JiwgaW50LCBXZWJDb3Jl OjpOb2RlKikgKyA0MjggKEV2ZW50VGFyZ2V0Tm9kZS5jcHA6MzgyKQo3ICAgY29tLmFwcGxlLldl YkNvcmUgICAgICAgIAkweDAxNGVlZjA0IFdlYkNvcmU6OkV2ZW50SGFuZGxlcjo6ZGlzcGF0Y2hN b3VzZUV2ZW50KFdlYkNvcmU6OkF0b21pY1N0cmluZyBjb25zdCYsIFdlYkNvcmU6Ok5vZGUqLCBi b29sLCBpbnQsIFdlYkNvcmU6OlBsYXRmb3JtTW91c2VFdmVudCBjb25zdCYsIGJvb2wpICsgODE2 IChFdmVudEhhbmRsZXIuY3BwOjEwMjgpCjggICBjb20uYXBwbGUuV2ViQ29yZSAgICAgICAgCTB4 MDE0ZWYyZDggV2ViQ29yZTo6RXZlbnRIYW5kbGVyOjpzZW5kQ29udGV4dE1lbnVFdmVudChXZWJD b3JlOjpQbGF0Zm9ybU1vdXNlRXZlbnQpICsgMzI0IChFdmVudEhhbmRsZXIuY3BwOjExMjYpCjkg ICBjb20uYXBwbGUuV2ViS2l0ICAgICAgICAgCTB4MDAzNTExMjggLVtXZWJIVE1MVmlldyBtZW51 Rm9yRXZlbnQ6XSArIDI1NiAoV2ViSFRNTFZpZXcubToyNTQ5KQoxMCAgY29tLmFwcGxlLkFwcEtp dCAgICAgICAgIAkweDkzYjRlYzVjIDB4OTM3MDAwMDAgKyA0NTE2OTU2CjExICBjb20uYXBwbGUu QXBwS2l0ICAgICAgICAgCTB4OTNhMjA0MDQgMHg5MzcwMDAwMCArIDMyNzc4MjgKMTIgIGNvbS5h cHBsZS5BcHBLaXQgICAgICAgICAJMHg5Mzc2NGZhMCAweDkzNzAwMDAwICsgNDEzNjAwCjEzICBj b20uYXBwbGUuU2FmYXJpICAgICAgICAgCTB4MDAwMjE3MzQgMHgxMDAwICsgMTMyOTE2CjE0ICBj b20uYXBwbGUuQXBwS2l0ICAgICAgICAgCTB4OTM3MGQ4ZDQgMHg5MzcwMDAwMCArIDU1NTA4CjE1 ICBjb20uYXBwbGUuU2FmYXJpICAgICAgICAgCTB4MDAwMjEyMzggMHgxMDAwICsgMTMxNjQwCjE2 ICBjb20uYXBwbGUuQXBwS2l0ICAgICAgICAgCTB4OTM3MDRkMTAgMHg5MzcwMDAwMCArIDE5NzI4 CjE3ICBjb20uYXBwbGUuQXBwS2l0ICAgICAgICAgCTB4OTM3ZjU4N2MgMHg5MzcwMDAwMCArIDEw MDU2OTIKMTggIGNvbS5hcHBsZS5TYWZhcmkgICAgICAgICAJMHgwMDA1Yzc3YyAweDEwMDAgKyAz NzQ2NTIKMTkgIGNvbS5hcHBsZS5TYWZhcmkgICAgICAgICAJMHgwMDA1YzYyNCAweDEwMDAgKyAz NzQzMDgKClRocmVhZCAxOgowICAgbGliU3lzdGVtLkIuZHlsaWIgICAgICAgIAkweDkwMDJiYmM4 IHNlbWFwaG9yZV93YWl0X3NpZ25hbF90cmFwICsgOAoxICAgbGliU3lzdGVtLkIuZHlsaWIgICAg ICAgIAkweDkwMDMwNmFjIHB0aHJlYWRfY29uZF93YWl0ICsgNDgwCjIgICBjb20uYXBwbGUuRm91 bmRhdGlvbiAgICAgCTB4OTI5NjYzMDAgMHg5MjkzOTAwMCArIDE4NTA4OAozICAgY29tLmFwcGxl LlN5bmRpY2F0aW9uICAgIAkweDliNWQxNDJjIDB4OWI1Y2UwMDAgKyAxMzM1Ngo0ICAgY29tLmFw cGxlLkZvdW5kYXRpb24gICAgIAkweDkyOTVmMTk0IDB4OTI5MzkwMDAgKyAxNTYwNTIKNSAgIGxp YlN5c3RlbS5CLmR5bGliICAgICAgICAJMHg5MDAyYjUwOCBfcHRocmVhZF9ib2R5ICsgOTYKClRo cmVhZCAyOgowICAgbGliU3lzdGVtLkIuZHlsaWIgICAgICAgIAkweDkwMDBhYjQ4IG1hY2hfbXNn X3RyYXAgKyA4CjEgICBsaWJTeXN0ZW0uQi5keWxpYiAgICAgICAgCTB4OTAwMGFhOWMgbWFjaF9t c2cgKyA2MAoyICAgY29tLmFwcGxlLkNvcmVGb3VuZGF0aW9uIAkweDkwN2RjYjc4IDB4OTA3YmEw MDAgKyAxNDIyMDAKMyAgIGNvbS5hcHBsZS5Db3JlRm91bmRhdGlvbiAJMHg5MDdkYzQ3YyAweDkw N2JhMDAwICsgMTQwNDEyCjQgICBjb20uYXBwbGUuRm91bmRhdGlvbiAgICAgCTB4OTI5ODY2OWMg MHg5MjkzOTAwMCArIDMxNzA4NAo1ICAgY29tLmFwcGxlLkZvdW5kYXRpb24gICAgIAkweDkyOTVm MTk0IDB4OTI5MzkwMDAgKyAxNTYwNTIKNiAgIGxpYlN5c3RlbS5CLmR5bGliICAgICAgICAJMHg5 MDAyYjUwOCBfcHRocmVhZF9ib2R5ICsgOTYKClRocmVhZCAzOgowICAgbGliU3lzdGVtLkIuZHls aWIgICAgICAgIAkweDkwMDBhYjQ4IG1hY2hfbXNnX3RyYXAgKyA4CjEgICBsaWJTeXN0ZW0uQi5k eWxpYiAgICAgICAgCTB4OTAwMGFhOWMgbWFjaF9tc2cgKyA2MAoyICAgY29tLmFwcGxlLkNvcmVG b3VuZGF0aW9uIAkweDkwN2RjYjc4IDB4OTA3YmEwMDAgKyAxNDIyMDAKMyAgIGNvbS5hcHBsZS5D b3JlRm91bmRhdGlvbiAJMHg5MDdkYzQ3YyAweDkwN2JhMDAwICsgMTQwNDEyCjQgICBjb20uYXBw bGUuRm91bmRhdGlvbiAgICAgCTB4OTI5ODc3ZGMgMHg5MjkzOTAwMCArIDMyMTUwMAo1ICAgY29t LmFwcGxlLkZvdW5kYXRpb24gICAgIAkweDkyOTVmMTk0IDB4OTI5MzkwMDAgKyAxNTYwNTIKNiAg IGxpYlN5c3RlbS5CLmR5bGliICAgICAgICAJMHg5MDAyYjUwOCBfcHRocmVhZF9ib2R5ICsgOTYK ClRocmVhZCAwIGNyYXNoZWQgd2l0aCBQUEMgVGhyZWFkIFN0YXRlIDY0OgogIHNycjA6IDB4MDAw MDAwMDAwMDNkMjY1OCBzcnIxOiAweDAwMDAwMDAwMDIwMGYwMzAgICAgICAgICAgICAgICAgICAg ICAgICB2cnNhdmU6IDB4MDAwMDAwMDAwMDAwMDAwMAogICAgY3I6IDB4MjQwMDA0MjQgICAgICAg ICAgeGVyOiAweDAwMDAwMDAwMDAwMDAwMDcgICBscjogMHgwMDAwMDAwMDAwM2QyNjRjICBjdHI6 IDB4MDAwMDAwMDA5MDAwMGRjOAogICAgcjA6IDB4MDAwMDAwMDAwMDAwMDAwMCAgIHIxOiAweDAw MDAwMDAwYmZmZmU1NjAgICByMjogMHgwMDAwMDAwMGJiYWRiZWVmICAgcjM6IDB4MDAwMDAwMDAw MDAwMDA2OQogICAgcjQ6IDB4MDAwMDAwMDAwMDAwMDAwMCAgIHI1OiAweDAwMDAwMDAwMDAwMDAw NjkgICByNjogMHgwMDAwMDAwMGZmZmZmZmZmICAgcjc6IDB4MDAwMDAwMDAwMDAwMDA2OQogICAg cjg6IDB4MDAwMDAwMDAwMDAwMDAwOCAgIHI5OiAweDAwMDAwMDAwMDAwMDAwMDAgIHIxMDogMHgw MDAwMDAwMDAwMDAwMDAyICByMTE6IDB4MDAwMDAwMDBhMDAwNjIwOAogICByMTI6IDB4MDAwMDAw MDA5MDAwMGRjOCAgcjEzOiAweDAwMDAwMDAwMDAwMDAwMDAgIHIxNDogMHgwMDAwMDAwMDAwMDAw MTAwICByMTU6IDB4MDAwMDAwMDAwMDAwMDAwMAogICByMTY6IDB4MDAwMDAwMDAwMDAwMDAwMCAg cjE3OiAweDAwMDAwMDAwMDAwMDAwMDAgIHIxODogMHgwMDAwMDAwMDAwMDAwMDAwICByMTk6IDB4 MDAwMDAwMDAwMDAwMDAwMAogICByMjA6IDB4MDAwMDAwMDAwMDAwMDAwMCAgcjIxOiAweDAwMDAw MDAwMDAwMDAwMDAgIHIyMjogMHgwMDAwMDAwMDAwMDAwMDAwICByMjM6IDB4MDAwMDAwMDAwMDAw MDA2YwogICByMjQ6IDB4MDAwMDAwMDAwMDAwMDAyYSAgcjI1OiAweDAwMDAwMDAwMDAwMDAwMjAg IHIyNjogMHgwMDAwMDAwMDAwMDAwMDI1ICByMjc6IDB4MDAwMDAwMDAwNWE1MDBmMAogICByMjg6 IDB4MDAwMDAwMDAwMDNmYjRmOCAgcjI5OiAweDAwMDAwMDAwMDVhNTQxYjAgIHIzMDogMHgwMDAw MDAwMGJmZmZlNTYwICByMzE6IDB4MDAwMDAwMDAwMDNkMjM3OAo= 12448 2007-01-14 23:59:18 -0800 2007-01-15 08:49:43 -0800 Proposed fix bugzilla-12134.diff.txt text/plain 8703 aroben SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiAxODg1NCkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTQgQEAKKzIwMDctMDEtMTQgIEFkYW0gUm9iZW4gIDxhcm9iZW5AYXBwbGUuY29t PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFNtYWxs IGNvbnRleHQgbWVudSBmaXhlcy4KKworICAgICAgICAqIHBsYXRmb3JtL0NvbnRleHRNZW51LmNw cDoKKyAgICAgICAgKFdlYkNvcmU6OkNvbnRleHRNZW51Ojpwb3B1bGF0ZSk6IEZpeCB0eXBvLgor ICAgICAgICAoV2ViQ29yZTo6Q29udGV4dE1lbnU6OmNoZWNrT3JFbmFibGVJZk5lZWRlZCk6ICJO byBHdWVzc2VzIEZvdW5kIgorICAgICAgICBzaG91bGQgYWx3YXlzIGJlIGRpc2FibGVkLgorCiAy MDA3LTAxLTE0ICBFcmljIFNlaWRlbCAgPGVyaWNAd2Via2l0Lm9yZz4KIAogICAgICAgICBSZXZp ZXdlZCBieSBoeWF0dC4KSW5kZXg6IFdlYkNvcmUvcGxhdGZvcm0vQ29udGV4dE1lbnUuY3BwCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIFdlYkNvcmUvcGxhdGZvcm0vQ29udGV4dE1lbnUuY3BwCShyZXZpc2lvbiAx ODg1MykKKysrIFdlYkNvcmUvcGxhdGZvcm0vQ29udGV4dE1lbnUuY3BwCSh3b3JraW5nIGNvcHkp CkBAIC0xODcsNyArMTg3LDcgQEAgdm9pZCBDb250ZXh0TWVudTo6cG9wdWxhdGUoKQogICAgIENv bnRleHRNZW51SXRlbSBSZWxvYWRJdGVtKEFjdGlvblR5cGUsIENvbnRleHRNZW51SXRlbVRhZ1Jl bG9hZCwgY29udGV4dE1lbnVJdGVtVGFnUmVsb2FkKCkpOwogICAgIENvbnRleHRNZW51SXRlbSBP cGVuRnJhbWVJdGVtKEFjdGlvblR5cGUsIENvbnRleHRNZW51SXRlbVRhZ09wZW5GcmFtZUluTmV3 V2luZG93LCAKICAgICAgICAgY29udGV4dE1lbnVJdGVtVGFnT3BlbkZyYW1lSW5OZXdXaW5kb3co KSk7Ci0gICAgQ29udGV4dE1lbnVJdGVtIE5vd0d1ZXNzZXNJdGVtKEFjdGlvblR5cGUsIENvbnRl eHRNZW51SXRlbVRhZ05vR3Vlc3Nlc0ZvdW5kLCAKKyAgICBDb250ZXh0TWVudUl0ZW0gTm9HdWVz c2VzSXRlbShBY3Rpb25UeXBlLCBDb250ZXh0TWVudUl0ZW1UYWdOb0d1ZXNzZXNGb3VuZCwgCiAg ICAgICAgIGNvbnRleHRNZW51SXRlbVRhZ05vR3Vlc3Nlc0ZvdW5kKCkpOwogICAgIENvbnRleHRN ZW51SXRlbSBJZ25vcmVTcGVsbGluZ0l0ZW0oQWN0aW9uVHlwZSwgQ29udGV4dE1lbnVJdGVtVGFn SWdub3JlU3BlbGxpbmcsIAogICAgICAgICBjb250ZXh0TWVudUl0ZW1UYWdJZ25vcmVTcGVsbGlu ZygpKTsKQEAgLTI3NCw3ICsyNzQsNyBAQCB2b2lkIENvbnRleHRNZW51Ojpwb3B1bGF0ZSgpCiAg ICAgICAgICAgICAgICAgICAgIC8vIElmIHRoZXJlJ3MgYmFkIGdyYW1tYXIgYnV0IG5vIHN1Z2dl c3Rpb25zIChlLmcuLCByZXBlYXRlZCB3b3JkKSwganVzdCBsZWF2ZSBvZmYgdGhlIHN1Z2dlc3Rp b25zCiAgICAgICAgICAgICAgICAgICAgIC8vIGxpc3QgYW5kIHRyYWlsaW5nIHNlcGFyYXRvciBy YXRoZXIgdGhhbiBhZGRpbmcgYSAiTm8gR3Vlc3NlcyBGb3VuZCIgaXRlbSAobWF0Y2hlcyBBcHBL aXQpCiAgICAgICAgICAgICAgICAgICAgIGlmIChtaXNzcGVsbGluZykgewotICAgICAgICAgICAg ICAgICAgICAgICAgYXBwZW5kSXRlbShOb3dHdWVzc2VzSXRlbSk7CisgICAgICAgICAgICAgICAg ICAgICAgICBhcHBlbmRJdGVtKE5vR3Vlc3Nlc0l0ZW0pOwogICAgICAgICAgICAgICAgICAgICAg ICAgYXBwZW5kSXRlbSgqc2VwYXJhdG9ySXRlbSgpKTsKICAgICAgICAgICAgICAgICAgICAgfQog ICAgICAgICAgICAgICAgIH0gZWxzZSB7CkBAIC00NDUsNiArNDQ1LDkgQEAgdm9pZCBDb250ZXh0 TWVudTo6Y2hlY2tPckVuYWJsZUlmTmVlZGVkKAogICAgICAgICAgICAgc2hvdWxkRW5hYmxlID0g ZnJhbWUtPmVkaXRvcigpLT5jYW5FZGl0KCk7CiAgICAgICAgICAgICBicmVhazsKICNlbmRpZgor ICAgICAgICBjYXNlIENvbnRleHRNZW51SXRlbVRhZ05vR3Vlc3Nlc0ZvdW5kOgorICAgICAgICAg ICAgc2hvdWxkRW5hYmxlID0gZmFsc2U7CisgICAgICAgICAgICBicmVhazsKICAgICAgICAgZGVm YXVsdDoKICAgICAgICAgICAgIGJyZWFrOwogICAgIH0KSW5kZXg6IFdlYktpdC9DaGFuZ2VMb2cK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gV2ViS2l0L0NoYW5nZUxvZwkocmV2aXNpb24gMTg4NTQpCisrKyBXZWJL aXQvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTggQEAKKzIwMDctMDEtMTQg IEFkYW0gUm9iZW4gIDxhcm9iZW5AYXBwbGUuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgIEZpeDogaHR0cDovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MTIxMzQKKyAgICAgICAgUkVHUkVTU0lPTjogQXNzZXJ0aW9uIGZhaWx1cmUg YW5kIGNyYXNoIHdoZW4gcmlnaHQgY2xpY2tpbmcgc2VsZWN0aW9uCisgICAgICAgIGluIGZvcm1z CisKKyAgICAgICAgKiBXZWJDb3JlU3VwcG9ydC9XZWJDb250ZXh0TWVudUNsaWVudC5tbToKKyAg ICAgICAgKGZpeE1lbnVzRnJvbU9sZEFwcHMpOiBTdGF0aWMgaGVscGVyIHRvIGZpeCB1cCBtZW51 cyBmcm9tIGFwcGxpY2F0aW9ucworICAgICAgICBjb21waWxlZCBhZ2FpbnN0IFRpZ2VyIFdlYktp dC4KKyAgICAgICAgKFdlYkNvbnRleHRNZW51Q2xpZW50OjpnZXRDdXN0b21NZW51RnJvbURlZmF1 bHRJdGVtcyk6IENhbGwgaGVscGVyIHRvCisgICAgICAgIGZpeCBtZW51cy4KKyAgICAgICAgKiBX ZWJWaWV3L1dlYlVJRGVsZWdhdGVQcml2YXRlLmg6IEZpeGVkIHR5cG8uCisKIDIwMDctMDEtMTQg IERhdmlkIEtpbHplciAgPGRka2lsemVyQGtpbHplci5uZXQ+CiAKICAgICAgICAgUmV2aWV3ZWQg YnkgRGFyaW4uCkluZGV4OiBXZWJLaXQvV2ViQ29yZVN1cHBvcnQvV2ViQ29udGV4dE1lbnVDbGll bnQubW0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L1dlYkNvcmVTdXBwb3J0L1dlYkNvbnRleHRNZW51 Q2xpZW50Lm1tCShyZXZpc2lvbiAxODg1MykKKysrIFdlYktpdC9XZWJDb3JlU3VwcG9ydC9XZWJD b250ZXh0TWVudUNsaWVudC5tbQkod29ya2luZyBjb3B5KQpAQCAtMSw1ICsxLDUgQEAKIC8qCi0g KiBDb3B5cmlnaHQgKEMpIDIwMDYgQXBwbGUgQ29tcHV0ZXIsIEluYy4gIEFsbCByaWdodHMgcmVz ZXJ2ZWQuCisgKiBDb3B5cmlnaHQgKEMpIDIwMDYsIDIwMDcgQXBwbGUgSW5jLiAgQWxsIHJpZ2h0 cyByZXNlcnZlZC4KICAqCiAgKiBSZWRpc3RyaWJ1dGlvbiBhbmQgdXNlIGluIHNvdXJjZSBhbmQg YmluYXJ5IGZvcm1zLCB3aXRoIG9yIHdpdGhvdXQKICAqIG1vZGlmaWNhdGlvbiwgYXJlIHBlcm1p dHRlZCBwcm92aWRlZCB0aGF0IHRoZSBmb2xsb3dpbmcgY29uZGl0aW9ucwpAQCAtNTcsMjIgKzU3 LDE4IEBAIHZvaWQgV2ViQ29udGV4dE1lbnVDbGllbnQ6OmNvbnRleHRNZW51RGUKICAgICBkZWxl dGUgdGhpczsKIH0KIAotTlNNdXRhYmxlQXJyYXkqIFdlYkNvbnRleHRNZW51Q2xpZW50OjpnZXRD dXN0b21NZW51RnJvbURlZmF1bHRJdGVtcyhDb250ZXh0TWVudSogZGVmYXVsdE1lbnUpCi17Ci0g ICAgaWQgZGVsZWdhdGUgPSBbbV93ZWJWaWV3IFVJRGVsZWdhdGVdOwotICAgIGlmIChbZGVsZWdh dGUgcmVzcG9uZHNUb1NlbGVjdG9yOkBzZWxlY3Rvcih3ZWJWaWV3OmNvbnRleHRNZW51SXRlbXNG b3JFbGVtZW50OmRlZmF1bHRNZW51SXRlbXM6KV0pIHsKLSAgICAgICAgTlNEaWN0aW9uYXJ5ICpl bGVtZW50ID0gW1tbV2ViRWxlbWVudERpY3Rpb25hcnkgYWxsb2NdIGluaXRXaXRoSGl0VGVzdFJl c3VsdDpkZWZhdWx0TWVudS0+aGl0VGVzdFJlc3VsdCgpXSBhdXRvcmVsZWFzZV07Ci0gICAgICAg IE5TTXV0YWJsZUFycmF5ICpkZWZhdWx0TWVudUl0ZW1zID0gZGVmYXVsdE1lbnUtPnBsYXRmb3Jt RGVzY3JpcHRpb24oKTsKLSAgICAgICAgTlNNdXRhYmxlQXJyYXkgKm5ld01lbnVJdGVtcyA9IFtb ZGVsZWdhdGUgd2ViVmlldzptX3dlYlZpZXcgY29udGV4dE1lbnVJdGVtc0ZvckVsZW1lbnQ6ZWxl bWVudCBkZWZhdWx0TWVudUl0ZW1zOmRlZmF1bHRNZW51SXRlbXNdIG11dGFibGVDb3B5XTsKLSAg ICAgICAgCi0gICAgICAgIC8vIFZlcnNpb25zIG9mIE1haWwgY29tcGlsZWQgd2l0aCBvbGRlciBX ZWJLaXRzIHdpbGwgZW5kIHVwIHdpdGhvdXQgdGhyZWUgY29udGV4dCBtZW51IGl0ZW1zLCAKLSAg ICAgICAgLy8gdGhvdWdoIHdpdGggdGhlIHNlcGFyYXRvcnMgYmV0d2VlbiB0aGVtLiBIZXJlIHdl IGNoZWNrIGZvciB0aGF0IHByb2JsZW0gYW5kIHJlaW5zZXJ0IHRoZSAKLSAgICAgICAgLy8gdGhy ZWUgbWlzc2luZyBpdGVtcy4gVGhpcyBzaG91bGRuJ3QgYWZmZWN0IGFueSBjbGllbnRzIG90aGVy IHRoYW4gTWFpbCBzaW5jZSB0aGUgdGFncyBmb3IgCi0gICAgICAgIC8vIHRoZSB0aHJlZSBpdGVt cyB3ZXJlIG5vdCBwdWJsaWMgQVBJLiBXZSBjYW4gcmVtb3ZlIHRoaXMgY29kZSB3aGVuIHdlIG5v IGxvbmdlciBzdXBwb3J0IAotICAgICAgICAvLyBwcmV2aW91c2x5LWJ1aWx0IHZlcnNpb25zIG9m IE1haWwgb24gVGlnZXIuIFNlZSA0NDk4NjA2IGZvciBtb3JlIGRldGFpbHMuCi0gICAgICAgIGlm IChbbmV3TWVudUl0ZW1zIGNvdW50XSAmJgotICAgICAgICAgICAgKFtbZGVmYXVsdE1lbnVJdGVt cyBvYmplY3RBdEluZGV4OjBdIHRhZ10gPT0gV2ViTWVudUl0ZW1UYWdTZWFyY2hJblNwb3RsaWdo dCkgJiYKLSAgICAgICAgICAgIChbW25ld01lbnVJdGVtcyBvYmplY3RBdEluZGV4OjBdIGlzU2Vw YXJhdG9ySXRlbV0pKSB7CitzdGF0aWMgTlNNdXRhYmxlQXJyYXkqIGZpeE1lbnVzRnJvbU9sZEFw cHMoTlNNdXRhYmxlQXJyYXkgKm5ld01lbnVJdGVtcywgTlNNdXRhYmxlQXJyYXkgKmRlZmF1bHRN ZW51SXRlbXMpCit7ICAgIAorICAgIC8vIFRoZSBXZWJNZW51SXRlbVRhZyBlbnVtIGhhcyBjaGFu Z2VkIHNpbmNlIFRpZ2VyLCBzbyBjbGllbnRzIGJ1aWx0IGFnYWluc3QgVGlnZXIgV2ViS2l0IG1p Z2h0IHJlZmVyZW5jZSBpbmNvcnJlY3QgdmFsdWVzIGZvciB0YWdzLgorICAgIC8vIEhlcmUgd2Ug Zml4IHVwIFRpZ2VyIE1haWwgYW5kIFRpZ2VyIFNhZmFyaS4KKyAgICAKKyAgICBpZiAoW25ld01l bnVJdGVtcyBjb3VudF0gJiYgW1tuZXdNZW51SXRlbXMgb2JqZWN0QXRJbmRleDowXSBpc1NlcGFy YXRvckl0ZW1dKSB7CisgICAgICAgIGlmIChbW25ld01lbnVJdGVtcyBvYmplY3RBdEluZGV4OjFd IGlzU2VwYXJhdG9ySXRlbV0pIHsKKyAgICAgICAgICAgIC8vIFZlcnNpb25zIG9mIE1haWwgY29t cGlsZWQgd2l0aCBvbGRlciBXZWJLaXRzIHdpbGwgZW5kIHVwIHdpdGhvdXQgdGhyZWUgY29udGV4 dCBtZW51IGl0ZW1zLCAKKyAgICAgICAgICAgIC8vIHRob3VnaCB3aXRoIHRoZSBzZXBhcmF0b3Jz IGJldHdlZW4gdGhlbS4gSGVyZSB3ZSBjaGVjayBmb3IgdGhhdCBwcm9ibGVtIGFuZCByZWluc2Vy dCB0aGUgCisgICAgICAgICAgICAvLyB0aHJlZSBtaXNzaW5nIGl0ZW1zLiBUaGlzIHNob3VsZG4n dCBhZmZlY3QgYW55IGNsaWVudHMgb3RoZXIgdGhhbiBNYWlsIHNpbmNlIHRoZSB0YWdzIGZvciAK KyAgICAgICAgICAgIC8vIHRoZSB0aHJlZSBpdGVtcyB3ZXJlIG5vdCBwdWJsaWMgQVBJLiBXZSBj YW4gcmVtb3ZlIHRoaXMgY29kZSB3aGVuIHdlIG5vIGxvbmdlciBzdXBwb3J0IAorICAgICAgICAg ICAgLy8gcHJldmlvdXNseS1idWlsdCB2ZXJzaW9ucyBvZiBNYWlsIG9uIFRpZ2VyLiBTZWUgNDQ5 ODYwNiBmb3IgbW9yZSBkZXRhaWxzLgogICAgICAgICAgICAgQVNTRVJUKFtbbmV3TWVudUl0ZW1z IG9iamVjdEF0SW5kZXg6MV0gaXNTZXBhcmF0b3JJdGVtXSk7CiAgICAgICAgICAgICBBU1NFUlQo W1tkZWZhdWx0TWVudUl0ZW1zIG9iamVjdEF0SW5kZXg6MV0gdGFnXSA9PSBXZWJNZW51SXRlbVRh Z1NlYXJjaFdlYik7CiAgICAgICAgICAgICBBU1NFUlQoW1tkZWZhdWx0TWVudUl0ZW1zIG9iamVj dEF0SW5kZXg6Ml0gaXNTZXBhcmF0b3JJdGVtXSk7CkBAIC04MSwxMCArNzcsMzQgQEAgTlNNdXRh YmxlQXJyYXkqIFdlYkNvbnRleHRNZW51Q2xpZW50OjpnZQogICAgICAgICAgICAgW25ld01lbnVJ dGVtcyBpbnNlcnRPYmplY3Q6W2RlZmF1bHRNZW51SXRlbXMgb2JqZWN0QXRJbmRleDowXSBhdElu ZGV4OjBdOwogICAgICAgICAgICAgW25ld01lbnVJdGVtcyBpbnNlcnRPYmplY3Q6W2RlZmF1bHRN ZW51SXRlbXMgb2JqZWN0QXRJbmRleDoxXSBhdEluZGV4OjFdOwogICAgICAgICAgICAgW25ld01l bnVJdGVtcyBpbnNlcnRPYmplY3Q6W2RlZmF1bHRNZW51SXRlbXMgb2JqZWN0QXRJbmRleDozXSBh dEluZGV4OjNdOworICAgICAgICAgICAgCisgICAgICAgICAgICByZXR1cm4gW25ld01lbnVJdGVt cyBhdXRvcmVsZWFzZV07CiAgICAgICAgIH0KICAgICAgICAgCi0gICAgICAgIHJldHVybiBbbmV3 TWVudUl0ZW1zIGF1dG9yZWxlYXNlXTsKKyAgICAgICAgdW5zaWduZWQgZGVmYXVsdEl0ZW1zQ291 bnQgPSBbZGVmYXVsdE1lbnVJdGVtcyBjb3VudF07CisgICAgICAgIGZvciAodW5zaWduZWQgaSA9 IDA7IGkgPCBkZWZhdWx0SXRlbXNDb3VudDsgKytpKQorICAgICAgICAgICAgaWYgKFtbZGVmYXVs dE1lbnVJdGVtcyBvYmplY3RBdEluZGV4OmldIHRhZ10gPT0gV2ViTWVudUl0ZW1UYWdTcGVsbGlu Z01lbnUpIHsKKyAgICAgICAgICAgICAgICAvLyBUaWdlciBTYWZhcmkgZG9lc24ndCByZWFsaXpl IHdlJ3JlIHBvcHBpbmcgdXAgYW4gZWRpdGluZyBtZW51CisgICAgICAgICAgICAgICAgW25ld01l bnVJdGVtcyByZWxlYXNlXTsKKyAgICAgICAgICAgICAgICByZXR1cm4gZGVmYXVsdE1lbnVJdGVt czsKKyAgICAgICAgICAgIH0KKyAgICB9CisgICAgCisgICAgLy8gTm90aGluZyBuZWVkcyB0byBi ZSBkb25lCisgICAgcmV0dXJuIFtuZXdNZW51SXRlbXMgYXV0b3JlbGVhc2VdOworfQorCitOU011 dGFibGVBcnJheSogV2ViQ29udGV4dE1lbnVDbGllbnQ6OmdldEN1c3RvbU1lbnVGcm9tRGVmYXVs dEl0ZW1zKENvbnRleHRNZW51KiBkZWZhdWx0TWVudSkKK3sKKyAgICBpZCBkZWxlZ2F0ZSA9IFtt X3dlYlZpZXcgVUlEZWxlZ2F0ZV07CisgICAgaWYgKFtkZWxlZ2F0ZSByZXNwb25kc1RvU2VsZWN0 b3I6QHNlbGVjdG9yKHdlYlZpZXc6Y29udGV4dE1lbnVJdGVtc0ZvckVsZW1lbnQ6ZGVmYXVsdE1l bnVJdGVtczopXSkgeworICAgICAgICBOU0RpY3Rpb25hcnkgKmVsZW1lbnQgPSBbW1tXZWJFbGVt ZW50RGljdGlvbmFyeSBhbGxvY10gaW5pdFdpdGhIaXRUZXN0UmVzdWx0OmRlZmF1bHRNZW51LT5o aXRUZXN0UmVzdWx0KCldIGF1dG9yZWxlYXNlXTsKKyAgICAgICAgTlNNdXRhYmxlQXJyYXkgKmRl ZmF1bHRNZW51SXRlbXMgPSBkZWZhdWx0TWVudS0+cGxhdGZvcm1EZXNjcmlwdGlvbigpOworICAg ICAgICBOU011dGFibGVBcnJheSAqbmV3TWVudUl0ZW1zID0gW1tkZWxlZ2F0ZSB3ZWJWaWV3Om1f d2ViVmlldyBjb250ZXh0TWVudUl0ZW1zRm9yRWxlbWVudDplbGVtZW50IGRlZmF1bHRNZW51SXRl bXM6ZGVmYXVsdE1lbnVJdGVtc10gbXV0YWJsZUNvcHldOworCisgICAgICAgIHJldHVybiBmaXhN ZW51c0Zyb21PbGRBcHBzKG5ld01lbnVJdGVtcywgZGVmYXVsdE1lbnVJdGVtcyk7CiAgICAgfQor ICAgIAogICAgIHJldHVybiBuaWw7CiB9CiAKSW5kZXg6IFdlYktpdC9XZWJWaWV3L1dlYlVJRGVs ZWdhdGVQcml2YXRlLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L1dlYlZpZXcvV2ViVUlEZWxlZ2F0 ZVByaXZhdGUuaAkocmV2aXNpb24gMTg4NTMpCisrKyBXZWJLaXQvV2ViVmlldy9XZWJVSURlbGVn YXRlUHJpdmF0ZS5oCSh3b3JraW5nIGNvcHkpCkBAIC0xLDUgKzEsNSBAQAogLyoKLSAqIENvcHly aWdodCAoQykgMjAwNSBBcHBsZSBDb21wdXRlciwgSW5jLiAgQWxsIHJpZ2h0cyByZXNlcnZlZC4K KyAqIENvcHlyaWdodCAoQykgMjAwNSwgMjAwNiwgMjAwNyBBcHBsZSBJbmMuICBBbGwgcmlnaHRz IHJlc2VydmVkLgogICoKICAqIFJlZGlzdHJpYnV0aW9uIGFuZCB1c2UgaW4gc291cmNlIGFuZCBi aW5hcnkgZm9ybXMsIHdpdGggb3Igd2l0aG91dAogICogbW9kaWZpY2F0aW9uLCBhcmUgcGVybWl0 dGVkIHByb3ZpZGVkIHRoYXQgdGhlIGZvbGxvd2luZyBjb25kaXRpb25zCkBAIC0zMiw3ICszMiw3 IEBACiBlbnVtIHsgCiAgICAgV2ViTWVudUl0ZW1UYWdPcGVuTGluayA9IDEwMDAsCiAgICAgV2Vi TWVudUl0ZW1UYWdJZ25vcmVHcmFtbWFyLAotICAgIFdlYnRNZW51SXRlbVRhZ1NwZWxsaW5nTWVu dSwKKyAgICBXZWJNZW51SXRlbVRhZ1NwZWxsaW5nTWVudSwKICAgICBXZWJNZW51SXRlbVRhZ1No b3dTcGVsbGluZ1BhbmVsLAogICAgIFdlYk1lbnVJdGVtVGFnQ2hlY2tTcGVsbGluZywKICAgICBX ZWJNZW51SXRlbVRhZ0NoZWNrU3BlbGxpbmdXaGlsZVR5cGluZywK