9839 2006-07-10 18:44:14 -0700 Nightly launcher fails to detect extensions when extension causes crash on load 2006-07-10 21:30:25 -0700 1 1 1 Unclassified WebKit WebKit Misc. 420+ Mac OS X 10.4 RESOLVED FIXED P2 Normal --- 1 mrowe webkit-unassigned oldest_to_newest 49143 0 mrowe 2006-07-10 18:44:14 -0700 When the loading of an extension bundle causes the WebKit nightly to exit, either due to a crash or an assertion failure, the dialog warning about Safari extensions is never displayed to the user. This is because the dialog is only displayed once Safari has finished initializing, which will be after the extensions have loaded and thus crashed Safari. 49144 1 9349 mrowe 2006-07-10 18:59:48 -0700 Created attachment 9349 Patch - track intialization so we can tell if a crash occurrs prior to the conclusion of extension loading 49154 2 ddkilzer 2006-07-10 21:30:25 -0700 Committed revision 15327. 9349 2006-07-10 18:59:48 -0700 2006-07-10 19:51:43 -0700 Patch - track intialization so we can tell if a crash occurrs prior to the conclusion of extension loading webkit-bug-9839-v1.patch text/plain 12415 mrowe SW5kZXg6IFdlYktpdFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXRUb29scy9D aGFuZ2VMb2cJKHJldmlzaW9uIDE1MzE5KQorKysgV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCSh3b3Jr aW5nIGNvcHkpCkBAIC0xLDMgKzEsMjEgQEAKKzIwMDYtMDctMTEgIE1hcmsgUm93ZSAgPG9wZW5k YXJ3aW4ub3JnQGJkYXNoLm5ldC5uej4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICAtIGh0dHA6Ly9idWd6aWxsYS5vcGVuZGFyd2luLm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9OTgzOQorICAgICAgICAgIEJ1ZyA5ODM5OiBOaWdodGx5IGxhdW5jaGVyIGZhaWxz IHRvIGRldGVjdCBleHRlbnNpb25zIHdoZW4gZXh0ZW5zaW9uIGNhdXNlcyBjcmFzaCBvbiBsb2Fk CisKKyAgICAgICAgTm93IHRyYWNrIHRocmVlIHN0YXRlczogaW5pdGlhbGl6aW5nLCBydW5uaW5n LCBhbmQgY2xvc2VkLiAgSWYgd2UgYXJlIGxhdW5jaGVkIGFuZCB0aGUgcHJldmlvdXMKKyAgICAg ICAgc3RhdGUgd2FzIGluaXRpYWxpemluZyB0aGVuIHdlIGxpa2VseSBqdXN0IGV4cGVyaWVuY2Vk IGEgY3Jhc2ggb24gbGF1bmNoLgorCisgICAgICAgICogV2ViS2l0TGF1bmNoZXIvV2ViS2l0Tmln aHRseUVuYWJsZXIubToKKyAgICAgICAgKG15QXBwbGljYXRpb25XaWxsRmluaXNoTGF1bmNoaW5n KTogSW1wcm92ZSB3b3JkaW5nIG9mIGRpYWxvZy4gIFVwZGF0ZSB0byBzZXQgbmV3IHJ1bm5pbmcg c3RhdGUuCisgICAgICAgIChteUFwcGxpY2F0aW9uV2lsbFRlcm1pbmF0ZSk6IFVwZGF0ZSB0byB1 c2UgbmV3IHN0YXRlcy4KKyAgICAgICAgKGNsZWFuVXBBZnRlck91cnNlbHZlcyk6IERpc3BsYXkg YWxlcnQgaWYgcHJldmlvdXMgc3RhdGUgd2FzIGluaXRpYWxpemluZy4gIFNldCBzdGF0ZSBhcwor ICAgICAgICBpbml0aWFsaXppbmcgYXMgZWFybHkgYXMgcHJhY3RpY2FsLgorICAgICAgICAoc3lt Ym9sX2xvb2t1cCk6IEJyaW5nIGNvZGUgdXAgdG8gc3BlZWQgd2l0aCBmb3JtYXR0aW5nIGd1aWRl bGluZXMuCisgICAgICAgIChHRFN5bWJvbExvb2t1cCk6IERpdHRvLgorCiAyMDA2LTA3LTEwICBE YXJpbiBBZGxlciAgPGRhcmluQGFwcGxlLmNvbT4KIAogICAgICAgICAtIHRyeSB0byBmaXggV2lu ZG93cyBidWlsZApJbmRleDogV2ViS2l0VG9vbHMvV2ViS2l0TGF1bmNoZXIvV2ViS2l0TmlnaHRs eUVuYWJsZXIubQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXRUb29scy9XZWJLaXRMYXVuY2hlci9XZWJL aXROaWdodGx5RW5hYmxlci5tCShyZXZpc2lvbiAxNTMwOSkKKysrIFdlYktpdFRvb2xzL1dlYktp dExhdW5jaGVyL1dlYktpdE5pZ2h0bHlFbmFibGVyLm0JKHdvcmtpbmcgY29weSkKQEAgLTM3LDkg KzM3LDE1IEBACiBzdGF0aWMgdm9pZCBjbGVhblVwQWZ0ZXJPdXJzZWx2ZXModm9pZCkgX19hdHRy aWJ1dGVfXyAoKGNvbnN0cnVjdG9yKSk7CiBzdGF0aWMgdm9pZCAqc3ltYm9sX2xvb2t1cChjaGFy ICpzeW1ib2wpOwogCi1zdGF0aWMgTlNTdHJpbmcgKldLTkVEaWRTaHV0RG93bkNsZWFubHkgPSBA IldLTkVEaWRTaHV0RG93bkNsZWFubHkiOworc3RhdGljIE5TU3RyaW5nICpXS05FUnVuU3RhdGUg PSBAIldLTkVSdW5TdGF0ZSI7CiBzdGF0aWMgTlNTdHJpbmcgKldLTkVTaG91bGRNb25pdG9yU2h1 dGRvd25zID0gQCJXS05FU2hvdWxkTW9uaXRvclNodXRkb3ducyI7CiAKK3R5cGVkZWYgZW51bSB7 CisgICAgUnVuU3RhdGVTaHV0RG93biwKKyAgICBSdW5TdGF0ZUluaXRpYWxpemluZywKKyAgICBS dW5TdGF0ZVJ1bm5pbmcKK30gV0tORVJ1blN0YXRlczsKKwogc3RhdGljIGJvb2wgZXh0ZW5zaW9u QnVuZGxlc1dlcmVMb2FkZWQgPSBOTzsKIHN0YXRpYyBOU1NldCAqZXh0ZW5zaW9uUGF0aHMgPSBu aWw7CiAKQEAgLTgwLDE1ICs4NiwyMCBAQCBzdGF0aWMgdm9pZCBteUFwcGxpY2F0aW9uV2lsbEZp bmlzaExhdW5jCiAgICAgW2V4dGVuc2lvblBhdGhzIHJlbGVhc2VdOwogICAgIGV4dGVuc2lvblBh dGhzID0gbmlsOwogCisgICAgTlNVc2VyRGVmYXVsdHMgKnVzZXJEZWZhdWx0cyA9IFtOU1VzZXJE ZWZhdWx0cyBzdGFuZGFyZFVzZXJEZWZhdWx0c107CisgICAgW3VzZXJEZWZhdWx0cyBzZXRJbnRl Z2VyOlJ1blN0YXRlUnVubmluZyBmb3JLZXk6V0tORVJ1blN0YXRlXTsKKyAgICBbdXNlckRlZmF1 bHRzIHN5bmNocm9uaXplXTsKKwogICAgIGlmIChleHRlbnNpb25CdW5kbGVzV2VyZUxvYWRlZCkK ICAgICAgICAgTlNSdW5JbmZvcm1hdGlvbmFsQWxlcnRQYW5lbChAIlNhZmFyaSBleHRlbnNpb25z IGRldGVjdGVkIiwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBAIlNhZmFy aSBleHRlbnNpb25zIHdlcmUgZGV0ZWN0ZWQgb24geW91ciBzeXN0ZW0uIFRoZXkgYXJlIGluY29t cGF0aWJsZSB3aXRoIG5pZ2h0bHkgYnVpbGRzIG9mIFdlYktpdCwgYW5kIG1heSBjYXVzZSBjcmFz aGVzIG9yIGluY29ycmVjdCBiZWhhdmlvci4gIFBsZWFzZSBkaXNhYmxlIHRoZW0gaWYgeW91IGV4 cGVyaWVuY2Ugc3VjaCBiZWhhdmlvci4iLCBAIkNvbnRpbnVlIiwgbmlsLCBuaWwpOworICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIEAiU2FmYXJpIGV4dGVuc2lvbnMgd2VyZSBk ZXRlY3RlZCBvbiB5b3VyIHN5c3RlbS4gIEV4dGVuc2lvbnMgYXJlIGluY29tcGF0aWJsZSB3aXRo IG5pZ2h0bHkgYnVpbGRzIG9mIFdlYktpdCwgYW5kIG1heSBjYXVzZSBjcmFzaGVzIG9yIGluY29y cmVjdCBiZWhhdmlvci4gIFBsZWFzZSBkaXNhYmxlIHRoZW0gaWYgeW91IGV4cGVyaWVuY2Ugc3Vj aCBiZWhhdmlvci4iLCBAIkNvbnRpbnVlIiwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICBuaWwsIG5pbCk7CiB9CiAKIHN0YXRpYyB2b2lkIG15QXBwbGljYXRpb25XaWxsVGVy bWluYXRlKENGTm90aWZpY2F0aW9uQ2VudGVyUmVmIGNlbnRlciwgdm9pZCAqb2JzZXJ2ZXIsIENG U3RyaW5nUmVmIG5hbWUsIGNvbnN0IHZvaWQgKm9iamVjdCwgQ0ZEaWN0aW9uYXJ5UmVmIHVzZXJJ bmZvKQogewogICAgIE5TVXNlckRlZmF1bHRzICp1c2VyRGVmYXVsdHMgPSBbTlNVc2VyRGVmYXVs dHMgc3RhbmRhcmRVc2VyRGVmYXVsdHNdOwotICAgIFt1c2VyRGVmYXVsdHMgc2V0Qm9vbDpZRVMg Zm9yS2V5OldLTkVEaWRTaHV0RG93bkNsZWFubHldOworICAgIFt1c2VyRGVmYXVsdHMgc2V0SW50 ZWdlcjpSdW5TdGF0ZVNodXREb3duIGZvcktleTpXS05FUnVuU3RhdGVdOwogICAgIFt1c2VyRGVm YXVsdHMgc3luY2hyb25pemVdOwogfQogCkBAIC0xMTAsMjIgKzEyMSwzMyBAQCB2b2lkIGNsZWFu VXBBZnRlck91cnNlbHZlcyh2b2lkKQogCiAgICAgTlNBdXRvcmVsZWFzZVBvb2wgKnBvb2wgPSBb W05TQXV0b3JlbGVhc2VQb29sIGFsbG9jXSBpbml0XTsKICAgICBOU1VzZXJEZWZhdWx0cyAqdXNl ckRlZmF1bHRzID0gW05TVXNlckRlZmF1bHRzIHN0YW5kYXJkVXNlckRlZmF1bHRzXTsKLSAgICBO U0RpY3Rpb25hcnkgKmRlZmF1bHRQcmVmcyA9IFtOU0RpY3Rpb25hcnkgZGljdGlvbmFyeVdpdGhP YmplY3RzQW5kS2V5czpbTlNOdW1iZXIgbnVtYmVyV2l0aEJvb2w6WUVTXSwgV0tORURpZFNodXRE b3duQ2xlYW5seSwKKyAgICBOU0RpY3Rpb25hcnkgKmRlZmF1bHRQcmVmcyA9IFtOU0RpY3Rpb25h cnkgZGljdGlvbmFyeVdpdGhPYmplY3RzQW5kS2V5czpbTlNOdW1iZXIgbnVtYmVyV2l0aEJvb2w6 UnVuU3RhdGVTaHV0RG93bl0sIFdLTkVSdW5TdGF0ZSwKICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBbTlNO dW1iZXIgbnVtYmVyV2l0aEJvb2w6WUVTXSwgV0tORVNob3VsZE1vbml0b3JTaHV0ZG93bnMsIG5p bF07CiAgICAgW3VzZXJEZWZhdWx0cyByZWdpc3RlckRlZmF1bHRzOmRlZmF1bHRQcmVmc107Ci0g ICAgaWYgKFt1c2VyRGVmYXVsdHMgYm9vbEZvcktleTpXS05FU2hvdWxkTW9uaXRvclNodXRkb3du c10gJiYgIVt1c2VyRGVmYXVsdHMgYm9vbEZvcktleTpXS05FRGlkU2h1dERvd25DbGVhbmx5XSkK LSAgICB7Ci0gICAgICAgIE5TTG9nKEAiV2ViS2l0IGZhaWxlZCB0byBzaHV0IGRvd24gY2xlYW5s eS4gIENoZWNraW5nIGZvciBTYWZhcmkgZXh0ZW5zaW9ucy4iKTsKLSAgICAgICAgQ0ZOb3RpZmlj YXRpb25DZW50ZXJBZGRPYnNlcnZlcihDRk5vdGlmaWNhdGlvbkNlbnRlckdldExvY2FsQ2VudGVy KCksICZteUJ1bmRsZURpZExvYWQsCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgbXlCdW5kbGVEaWRMb2FkLCAoQ0ZTdHJpbmdSZWYpIE5TQnVuZGxlRGlkTG9hZE5vdGlm aWNhdGlvbiwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBOVUxMLCBD Rk5vdGlmaWNhdGlvblN1c3BlbnNpb25CZWhhdmlvckRlbGl2ZXJJbW1lZGlhdGVseSk7Ci0gICAg ICAgIENGTm90aWZpY2F0aW9uQ2VudGVyQWRkT2JzZXJ2ZXIoQ0ZOb3RpZmljYXRpb25DZW50ZXJH ZXRMb2NhbENlbnRlcigpLCAmbXlBcHBsaWNhdGlvbldpbGxGaW5pc2hMYXVuY2hpbmcsCi0gICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgbXlBcHBsaWNhdGlvbldpbGxGaW5p c2hMYXVuY2hpbmcsIChDRlN0cmluZ1JlZikgTlNBcHBsaWNhdGlvbldpbGxGaW5pc2hMYXVuY2hp bmdOb3RpZmljYXRpb24sCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg TlVMTCwgQ0ZOb3RpZmljYXRpb25TdXNwZW5zaW9uQmVoYXZpb3JEZWxpdmVySW1tZWRpYXRlbHkp OworICAgIGlmIChbdXNlckRlZmF1bHRzIGJvb2xGb3JLZXk6V0tORVNob3VsZE1vbml0b3JTaHV0 ZG93bnNdKSB7CisgICAgICAgIFdLTkVSdW5TdGF0ZXMgc2F2ZWRTdGF0ZSA9IChXS05FUnVuU3Rh dGVzKVt1c2VyRGVmYXVsdHMgaW50ZWdlckZvcktleTpXS05FUnVuU3RhdGVdOworICAgICAgICBp ZiAoc2F2ZWRTdGF0ZSA9PSBSdW5TdGF0ZUluaXRpYWxpemluZykgeworICAgICAgICAgICAgLy8g VXNlIENvcmVGb3VuZGF0aW9uIGhlcmUgYXMgQXBwS2l0IGhhc24ndCBiZWVuIGluaXRpYWxpemVk IGF0IHRoaXMgc3RhZ2Ugb2YgU2FmYXJpJ3MgbGlmZXRpbWUKKyAgICAgICAgICAgIENGT3B0aW9u RmxhZ3MgcmVzcG9uc2VGbGFnczsKKyAgICAgICAgICAgIENGVXNlck5vdGlmaWNhdGlvbkRpc3Bs YXlBbGVydCgwLCBrQ0ZVc2VyTm90aWZpY2F0aW9uQ2F1dGlvbkFsZXJ0TGV2ZWwsCisgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgTlVMTCwgTlVMTCwgTlVMTCwKKyAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBDRlNUUigiV2ViS2l0IGZh aWxlZCB0byBvcGVuIGNvcnJlY3RseSIpLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgIENGU1RSKCJXZWJLaXQgZmFpbGVkIHRvIG9wZW4gY29ycmVjdGx5IG9uIHlv dXIgcHJldmlvdXMgYXR0ZW1wdC4gUGxlYXNlIGRpc2FibGUgYW55IFNhZmFyaSBleHRlbnNpb25z IHRoYXQgeW91IG1heSBoYXZlIGluc3RhbGxlZC4gIElmIHRoZSBwcm9ibGVtIGNvbnRpbnVlcyB0 byBvY2N1ciwgcGxlYXNlIGZpbGUgYSBidWcgcmVwb3J0IGF0IGh0dHA6Ly93ZWJraXQub3BlbmRh cndpbi5vcmcvcXVhbGl0eS9yZXBvcnRpbmcuaHRtbCIpLCAKKyAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICBDRlNUUigiQ29udGludWUiKSwgTlVMTCwgTlVMTCwgJnJl c3BvbnNlRmxhZ3MpOworICAgICAgICB9CisgICAgICAgIGVsc2UgaWYgKHNhdmVkU3RhdGUgPT0g UnVuU3RhdGVSdW5uaW5nKSB7CisgICAgICAgICAgICBOU0xvZyhAIldlYktpdCBmYWlsZWQgdG8g c2h1dCBkb3duIGNsZWFubHkuICBDaGVja2luZyBmb3IgU2FmYXJpIGV4dGVuc2lvbnMuIik7Cisg ICAgICAgICAgICBDRk5vdGlmaWNhdGlvbkNlbnRlckFkZE9ic2VydmVyKENGTm90aWZpY2F0aW9u Q2VudGVyR2V0TG9jYWxDZW50ZXIoKSwgJm15QnVuZGxlRGlkTG9hZCwKKyAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgbXlCdW5kbGVEaWRMb2FkLCAoQ0ZTdHJpbmdS ZWYpIE5TQnVuZGxlRGlkTG9hZE5vdGlmaWNhdGlvbiwKKyAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgTlVMTCwgQ0ZOb3RpZmljYXRpb25TdXNwZW5zaW9uQmVoYXZp b3JEZWxpdmVySW1tZWRpYXRlbHkpOworICAgICAgICB9CiAgICAgfQotICAgIFt1c2VyRGVmYXVs dHMgc2V0Qm9vbDpOTyBmb3JLZXk6V0tORURpZFNodXREb3duQ2xlYW5seV07CisgICAgW3VzZXJE ZWZhdWx0cyBzZXRJbnRlZ2VyOlJ1blN0YXRlSW5pdGlhbGl6aW5nIGZvcktleTpXS05FUnVuU3Rh dGVdOwogICAgIFt1c2VyRGVmYXVsdHMgc3luY2hyb25pemVdOwogCisgICAgQ0ZOb3RpZmljYXRp b25DZW50ZXJBZGRPYnNlcnZlcihDRk5vdGlmaWNhdGlvbkNlbnRlckdldExvY2FsQ2VudGVyKCks ICZteUFwcGxpY2F0aW9uV2lsbEZpbmlzaExhdW5jaGluZywKKyAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgIG15QXBwbGljYXRpb25XaWxsRmluaXNoTGF1bmNoaW5nLCAoQ0ZTdHJp bmdSZWYpIE5TQXBwbGljYXRpb25XaWxsRmluaXNoTGF1bmNoaW5nTm90aWZpY2F0aW9uLAorICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgTlVMTCwgQ0ZOb3RpZmljYXRpb25TdXNw ZW5zaW9uQmVoYXZpb3JEZWxpdmVySW1tZWRpYXRlbHkpOwogICAgIENGTm90aWZpY2F0aW9uQ2Vu dGVyQWRkT2JzZXJ2ZXIoQ0ZOb3RpZmljYXRpb25DZW50ZXJHZXRMb2NhbENlbnRlcigpLCAmbXlB cHBsaWNhdGlvbldpbGxUZXJtaW5hdGUsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICBteUFwcGxpY2F0aW9uV2lsbFRlcm1pbmF0ZSwgKENGU3RyaW5nUmVmKSBOU0FwcGxpY2F0 aW9uV2lsbFRlcm1pbmF0ZU5vdGlmaWNhdGlvbiwKICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgIE5VTEwsIENGTm90aWZpY2F0aW9uU3VzcGVuc2lvbkJlaGF2aW9yRGVsaXZlcklt bWVkaWF0ZWx5KTsKQEAgLTE0NywxMyArMTY5LDEyIEBAIHZvaWQgY2xlYW5VcEFmdGVyT3Vyc2Vs dmVzKHZvaWQpCiAjZGVmaW5lIG1hY2hvX25saXN0IG5saXN0CiAjZW5kaWYKIAotdm9pZCAqR0RT eW1ib2xMb29rdXAoY29uc3Qgc3RydWN0IG1hY2hvX2hlYWRlciAqaGVhZGVyLCBjb25zdCBjaGFy ICpzeW1ib2wpOworc3RhdGljIHZvaWQgKkdEU3ltYm9sTG9va3VwKGNvbnN0IHN0cnVjdCBtYWNo b19oZWFkZXIgKmhlYWRlciwgY29uc3QgY2hhciAqc3ltYm9sKTsKIAotdm9pZCAqc3ltYm9sX2xv b2t1cChjaGFyICpzeW1ib2wpCitzdGF0aWMgdm9pZCAqc3ltYm9sX2xvb2t1cChjaGFyICpzeW1i b2wpCiB7CiAgICAgaW50IGk7Ci0gICAgZm9yKGk9MDtpPF9keWxkX2ltYWdlX2NvdW50KCk7aSsr KQotICAgIHsgICAgCisgICAgZm9yIChpID0gMDsgaSA8IF9keWxkX2ltYWdlX2NvdW50KCk7IGkr KykgewogICAgICAgICB2b2lkICpzeW1ib2xSZXN1bHQgPSBHRFN5bWJvbExvb2t1cCgoY29uc3Qg c3RydWN0IG1hY2hvX2hlYWRlciopX2R5bGRfZ2V0X2ltYWdlX2hlYWRlcihpKSwgc3ltYm9sKTsK ICAgICAgICAgaWYgKHN5bWJvbFJlc3VsdCkKICAgICAgICAgICAgIHJldHVybiBzeW1ib2xSZXN1 bHQ7CkBAIC0xNjEsOTAgKzE4Miw4NCBAQCB2b2lkICpzeW1ib2xfbG9va3VwKGNoYXIgKnN5bWJv bCkKICAgICByZXR1cm4gTlVMTDsKIH0KIAotdm9pZCAqR0RTeW1ib2xMb29rdXAoY29uc3Qgc3Ry dWN0IG1hY2hvX2hlYWRlciAqaGVhZGVyLCBjb25zdCBjaGFyICpzeW1ib2wpCitzdGF0aWMgdm9p ZCAqR0RTeW1ib2xMb29rdXAoY29uc3Qgc3RydWN0IG1hY2hvX2hlYWRlciAqaGVhZGVyLCBjb25z dCBjaGFyICpzeW1ib2wpCiB7CiAgICAgaWYgKCFoZWFkZXIgfHwgIXN5bWJvbCkKICAgICAgICAg cmV0dXJuIE5VTEw7Ci0gICAgaWYgKChoZWFkZXItPm1hZ2ljICE9IE1IX01BR0lDKSAmJiAoaGVh ZGVyLT5tYWdpYyAhPSBNSF9NQUdJQ182NCkpCisKKyAgICBpZiAoaGVhZGVyLT5tYWdpYyAhPSBN SF9NQUdJQyAmJiBoZWFkZXItPm1hZ2ljICE9IE1IX01BR0lDXzY0KQogICAgICAgICByZXR1cm4g TlVMTDsKLSAgICAKKwogICAgIHVpbnQzMl90IGN1cnJDb21tYW5kOwogICAgIGNvbnN0IHN0cnVj dCBsb2FkX2NvbW1hbmQgKmxvYWRDb21tYW5kID0gKGNvbnN0IHN0cnVjdCBsb2FkX2NvbW1hbmQg KikoICgodm9pZCAqKWhlYWRlcikgKyBzaXplb2Yoc3RydWN0IG1hY2hvX2hlYWRlcikpOwogICAg IGNvbnN0IHN0cnVjdCBtYWNob19zZWdtZW50X2NvbW1hbmQgKnNlZ0NvbW1hbmQ7Ci0gICAgCisK ICAgICBjb25zdCBzdHJ1Y3Qgc3ltdGFiX2NvbW1hbmQgKnN5bXRhYkNvbW1hbmQgPSBOVUxMOwog ICAgIGNvbnN0IHN0cnVjdCBkeXN5bXRhYl9jb21tYW5kICpkeXN5bXRhYkNvbW1hbmQgPSBOVUxM OwogICAgIGNvbnN0IHN0cnVjdCBtYWNob19zZWdtZW50X2NvbW1hbmQgKnRleHRTZWdtZW50ID0g TlVMTDsKICAgICBjb25zdCBzdHJ1Y3QgbWFjaG9fc2VnbWVudF9jb21tYW5kICpsaW5rRWRpdFNl Z21lbnQgPSBOVUxMOwotICAgIAotICAgIGZvciAoY3VyckNvbW1hbmQgPSAwOyBjdXJyQ29tbWFu ZCA8IGhlYWRlci0+bmNtZHM7IGN1cnJDb21tYW5kKyspCi0gICAgewotICAgICAgICBzd2l0Y2gg KGxvYWRDb21tYW5kLT5jbWQpCi0gICAgICAgIHsKKworICAgIGZvciAoY3VyckNvbW1hbmQgPSAw OyBjdXJyQ29tbWFuZCA8IGhlYWRlci0+bmNtZHM7IGN1cnJDb21tYW5kKyspIHsKKyAgICAgICAg c3dpdGNoIChsb2FkQ29tbWFuZC0+Y21kKSB7CiAgICAgICAgICAgICBjYXNlIExDX1NFR01FTlRf Q09NTUFORDoKICAgICAgICAgICAgICAgICBzZWdDb21tYW5kID0gKGNvbnN0IHN0cnVjdCBtYWNo b19zZWdtZW50X2NvbW1hbmQgKilsb2FkQ29tbWFuZDsKLSAgICAgICAgICAgICAgICBpZiAoc3Ry Y21wKHNlZ0NvbW1hbmQtPnNlZ25hbWUsICJfX1RFWFQiKT09MCkKKyAgICAgICAgICAgICAgICBp ZiAoIXN0cmNtcChzZWdDb21tYW5kLT5zZWduYW1lLCAiX19URVhUIikpCiAgICAgICAgICAgICAg ICAgICAgIHRleHRTZWdtZW50ID0gc2VnQ29tbWFuZDsKLSAgICAgICAgICAgICAgICBlbHNlIGlm IChzdHJjbXAoc2VnQ29tbWFuZC0+c2VnbmFtZSwgIl9fTElOS0VESVQiKT09MCkKKyAgICAgICAg ICAgICAgICBlbHNlIGlmICghc3RyY21wKHNlZ0NvbW1hbmQtPnNlZ25hbWUsICJfX0xJTktFRElU IikpCiAgICAgICAgICAgICAgICAgICAgIGxpbmtFZGl0U2VnbWVudCA9IHNlZ0NvbW1hbmQ7CiAg ICAgICAgICAgICAgICAgICAgIGJyZWFrOwotICAgICAgICAgICAgICAgIAorCiAgICAgICAgICAg ICBjYXNlIExDX1NZTVRBQjoKICAgICAgICAgICAgICAgICBzeW10YWJDb21tYW5kID0gKGNvbnN0 IHN0cnVjdCBzeW10YWJfY29tbWFuZCAqKWxvYWRDb21tYW5kOwogICAgICAgICAgICAgICAgIGJy ZWFrOwotICAgICAgICAgICAgICAgIAorCiAgICAgICAgICAgICBjYXNlIExDX0RZU1lNVEFCOgog ICAgICAgICAgICAgICAgIGR5c3ltdGFiQ29tbWFuZCA9IChjb25zdCBzdHJ1Y3QgZHlzeW10YWJf Y29tbWFuZCAqKWxvYWRDb21tYW5kOwogICAgICAgICAgICAgICAgIGJyZWFrOwogICAgICAgICB9 Ci0gICAgICAgIAorCiAgICAgICAgIGxvYWRDb21tYW5kID0gKGNvbnN0IHN0cnVjdCBsb2FkX2Nv bW1hbmQgKikoKCh2b2lkKilsb2FkQ29tbWFuZCkgKyBsb2FkQ29tbWFuZC0+Y21kc2l6ZSk7CiAg ICAgfQotICAgIGlmICh0ZXh0U2VnbWVudD09TlVMTCB8fCBsaW5rRWRpdFNlZ21lbnQ9PU5VTEwg fHwgc3ltdGFiQ29tbWFuZD09TlVMTCB8fCBkeXN5bXRhYkNvbW1hbmQ9PU5VTEwpIHsKKyAgICBp ZiAoIXRleHRTZWdtZW50IHx8ICFsaW5rRWRpdFNlZ21lbnQgfHwgIXN5bXRhYkNvbW1hbmQgfHwg IWR5c3ltdGFiQ29tbWFuZCkKICAgICAgICAgcmV0dXJuIE5VTEw7Ci0gICAgfQotICAgIAorCiAg ICAgdHlwZWRlZiBlbnVtIHsgU3RhcnQgPSAwLCBMb2NhbFN5bWJvbHMsIEV4dGVybmFsU3ltYm9s cywgRG9uZSB9IFN5bWJvbFNlYXJjaFN0YXRlOwogICAgIHVpbnQzMl90IGN1cnJlbnRTeW1ib2xJ bmRleDsKICAgICB1aW50MzJfdCBtYXhpbXVtU3ltYm9sSW5kZXg7CiAgICAgU3ltYm9sU2VhcmNo U3RhdGUgc3RhdGU7Ci0gICAgCi0gICAgZm9yIChzdGF0ZSA9IFN0YXJ0ICsgMTsgc3RhdGUgPCBE b25lOyBzdGF0ZSsrKQotICAgIHsKLSAgICAgICAgc3dpdGNoKHN0YXRlKSB7CisKKyAgICBmb3Ig KHN0YXRlID0gU3RhcnQgKyAxOyBzdGF0ZSA8IERvbmU7IHN0YXRlKyspIHsKKyAgICAgICAgc3dp dGNoIChzdGF0ZSkgewogICAgICAgICAgICAgY2FzZSBMb2NhbFN5bWJvbHM6CiAgICAgICAgICAg ICAgICAgY3VycmVudFN5bWJvbEluZGV4ID0gZHlzeW10YWJDb21tYW5kLT5pbG9jYWxzeW07CiAg ICAgICAgICAgICAgICAgbWF4aW11bVN5bWJvbEluZGV4ID0gZHlzeW10YWJDb21tYW5kLT5pbG9j YWxzeW0gKyBkeXN5bXRhYkNvbW1hbmQtPm5sb2NhbHN5bTsKICAgICAgICAgICAgICAgICBicmVh azsKLSAgICAgICAgICAgICAgICAKKwogICAgICAgICAgICAgY2FzZSBFeHRlcm5hbFN5bWJvbHM6 CiAgICAgICAgICAgICAgICAgY3VycmVudFN5bWJvbEluZGV4ID0gZHlzeW10YWJDb21tYW5kLT5p ZXh0ZGVmc3ltOwogICAgICAgICAgICAgICAgIG1heGltdW1TeW1ib2xJbmRleCA9IGR5c3ltdGFi Q29tbWFuZC0+bmV4dGRlZnN5bTsKICAgICAgICAgICAgICAgICBicmVhazsKLSAgICAgICAgICAg ICAgICAKKwogICAgICAgICAgICAgZGVmYXVsdDoKICAgICAgICAgICAgICAgICByZXR1cm4gTlVM TDsKICAgICAgICAgfQotICAgICAgICBmb3IgKDsgY3VycmVudFN5bWJvbEluZGV4IDwgbWF4aW11 bVN5bWJvbEluZGV4OyBjdXJyZW50U3ltYm9sSW5kZXgrKykKLSAgICAgICAgeworICAgICAgICBm b3IgKDsgY3VycmVudFN5bWJvbEluZGV4IDwgbWF4aW11bVN5bWJvbEluZGV4OyBjdXJyZW50U3lt Ym9sSW5kZXgrKykgewogICAgICAgICAgICAgY29uc3Qgc3RydWN0IG1hY2hvX25saXN0ICpzeW1i b2xUYWJsZUVudHJ5OwogICAgICAgICAgICAgc3ltYm9sVGFibGVFbnRyeSA9IChjb25zdCBzdHJ1 Y3QgbWFjaG9fbmxpc3QgKikoY3VycmVudFN5bWJvbEluZGV4KnNpemVvZihzdHJ1Y3QgbWFjaG9f bmxpc3QpCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICArIChwdHJkaWZmX3QpaGVhZGVyICsgc3ltdGFiQ29tbWFuZC0+c3ltb2ZmCiAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICArIGxpbmtFZGl0U2VnbWVudC0+dm1hZGRyIC0gbGlua0VkaXRTZWdtZW50LT5maWxlb2ZmCiAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAtIHRleHRTZWdtZW50LT52bWFkZHIpOwogICAgICAgICAgICAgaW50MzJfdCBzdHJpbmdUYWJs ZUluZGV4ID0gc3ltYm9sVGFibGVFbnRyeS0+bl91bi5uX3N0cng7Ci0gICAgICAgICAgICBpZiAo c3RyaW5nVGFibGVJbmRleDwwKQorICAgICAgICAgICAgaWYgKHN0cmluZ1RhYmxlSW5kZXggPCAw KQogICAgICAgICAgICAgICAgIGNvbnRpbnVlOwogICAgICAgICAgICAgY29uc3QgY2hhciAqc3Ry aW5nVGFibGVFbnRyeSA9IChjb25zdCBjaGFyKikoc3RyaW5nVGFibGVJbmRleCArIChwdHJkaWZm X3QpaGVhZGVyICsgc3ltdGFiQ29tbWFuZC0+c3Ryb2ZmCiAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICArIGxpbmtFZGl0U2VnbWVudC0+dm1h ZGRyIC0gbGlua0VkaXRTZWdtZW50LT5maWxlb2ZmCiAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAtIHRleHRTZWdtZW50LT52bWFkZHIpOwot ICAgICAgICAgICAgaWYgKHN0cmNtcChzeW1ib2wsIHN0cmluZ1RhYmxlRW50cnkpPT0wKSB7Cisg ICAgICAgICAgICBpZiAoIXN0cmNtcChzeW1ib2wsIHN0cmluZ1RhYmxlRW50cnkpKQogICAgICAg ICAgICAgICAgIHJldHVybiAoKHZvaWQqKWhlYWRlcikgLSB0ZXh0U2VnbWVudC0+dm1hZGRyICsg c3ltYm9sVGFibGVFbnRyeS0+bl92YWx1ZTsKLSAgICAgICAgICAgIH0KICAgICAgICAgfQogICAg ICAgICBzdGF0ZSsrOwogICAgIH0KICAgICByZXR1cm4gTlVMTDsKIH0KIAotCg==