9689 2006-07-01 22:58:17 -0700 Nightly builds should warn a user about potential problems when using "Safari extensions" 2006-07-02 04:57:04 -0700 1 1 1 Unclassified WebKit WebKit Misc. 420+ Mac OS X 10.4 RESOLVED FIXED P2 Normal --- 1 mrowe mrowe webkit-bugs oldest_to_newest 47957 0 mrowe 2006-07-01 22:58:17 -0700 Nightly builds should detect whether "Safari extensions" (aka haxies) have been loaded into Safari, and warn the user about the potential they have for causing crashes or other problems when used with the nightlies. 47958 1 9135 mrowe 2006-07-01 23:04:15 -0700 Created attachment 9135 Implement as described 47961 2 9135 timothy 2006-07-01 23:09:35 -0700 Comment on attachment 9135 Implement as described I would check the path the bundle is loaded from, like if it is in the Input Managers or SIMBL folder. 47964 3 9139 mrowe 2006-07-01 23:57:47 -0700 Created attachment 9139 Update to explicitly check that bundle is in known extension paths 47965 4 9139 timothy 2006-07-02 00:05:28 -0700 Comment on attachment 9139 Update to explicitly check that bundle is in known extension paths This looks good now. 47988 5 ddkilzer 2006-07-02 04:57:04 -0700 Committed revision 15136. 9135 2006-07-01 23:04:15 -0700 2006-07-01 23:57:47 -0700 Implement as described webkit-bug-9689-v1.patch text/plain 5636 mrowe SW5kZXg6IFdlYktpdFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXRUb29scy9D aGFuZ2VMb2cJKHJldmlzaW9uIDE1MTMzKQorKysgV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCSh3b3Jr aW5nIGNvcHkpCkBAIC0xLDMgKzEsMTkgQEAKKzIwMDYtMDctMDIgIE1hcmsgUm93ZSAgPG9wZW5k YXJ3aW4ub3JnQGJkYXNoLm5ldC5uej4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICBCdWcgOTY4OTogTmlnaHRseSBidWlsZHMgc2hvdWxkIHdhcm4gYSB1 c2VyIGFib3V0IHBvdGVudGlhbCBwcm9ibGVtcyB3aGVuIHVzaW5nCisgICAgICAgICJTYWZhcmkg ZXh0ZW5zaW9ucyIKKyAgICAgICAgaHR0cDovL2J1Z3ppbGxhLm9wZW5kYXJ3aW4ub3JnL3Nob3df YnVnLmNnaT9pZD05Njg5CisKKyAgICAgICAgKiBXZWJLaXRMYXVuY2hlci9XZWJLaXRMYXVuY2hl ci54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qOgorICAgICAgICAqIFdlYktpdExhdW5jaGVyL1dl YktpdE5pZ2h0bHlFbmFibGVyLm06CisgICAgICAgIChteUJ1bmRsZURpZExvYWQpOiBLZWVwIHRy YWNrIG9mIGlmIGFueSBidW5kbGVzIHRoYXQgYXJlIGxvYWRlZC4KKyAgICAgICAgKG15QXBwbGlj YXRpb25XaWxsRmluaXNoTGF1bmNoaW5nKTogIE5vdGlmeSB1c2VyIGlmIGFueSBidW5kbGVzIGFy ZSBsb2FkZWQuCisgICAgICAgIChjbGVhblVwQWZ0ZXJPdXJzZWx2ZXMpOiBSZWdpc3RlciBmb3Ig TlNCdW5kbGVEaWRMb2FkTm90aWZpY2F0aW9uIGFuZAorICAgICAgICBOU0FwcGxpY2F0aW9uV2ls bEZpbmlzaExhdW5jaGluZ05vdGlmaWNhdGlvbiBub3RpZmljYXRpb25zIHNvIHRoYXQgd2UgY2Fu CisgICAgICAgIHRyYWNrIGJ1bmRsZSBsb2FkcyBhbmQgbm90aWZ5IHRoZSB1c2VyIGF0IGxhdW5j aCBjb21wbGV0aW9uLgorCiAyMDA2LTA2LTMwICBNaWtlIEVtbWVsICA8bWlrZS5lbW1lbEBnbWFp bC5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgRGFyaW4uCkluZGV4OiBXZWJLaXRUb29scy9X ZWJLaXRMYXVuY2hlci9XZWJLaXROaWdodGx5RW5hYmxlci5tCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktp dFRvb2xzL1dlYktpdExhdW5jaGVyL1dlYktpdE5pZ2h0bHlFbmFibGVyLm0JKHJldmlzaW9uIDE1 MTMxKQorKysgV2ViS2l0VG9vbHMvV2ViS2l0TGF1bmNoZXIvV2ViS2l0TmlnaHRseUVuYWJsZXIu bQkod29ya2luZyBjb3B5KQpAQCAtMzUsOCArMzUsMzEgQEAKICNpbmNsdWRlIDxzdHJpbmcuaD4K IAogc3RhdGljIHZvaWQgY2xlYW5VcEFmdGVyT3Vyc2VsdmVzKHZvaWQpIF9fYXR0cmlidXRlX18g KChjb25zdHJ1Y3RvcikpOworc3RhdGljIHZvaWQgKnN5bWJvbF9sb29rdXAoY2hhciAqc3ltYm9s KTsKIAotdm9pZCAqc3ltYm9sX2xvb2t1cChjaGFyICpzeW1ib2wpOworc3RhdGljIGJvb2wgZXh0 cmFCdW5kbGVzV2VyZUxvYWRlZCA9IE5POworCitzdGF0aWMgdm9pZCBteUJ1bmRsZURpZExvYWQo Q0ZOb3RpZmljYXRpb25DZW50ZXJSZWYgY2VudGVyLCB2b2lkICpvYnNlcnZlciwgQ0ZTdHJpbmdS ZWYgbmFtZSwgY29uc3Qgdm9pZCAqb2JqZWN0LCBDRkRpY3Rpb25hcnlSZWYgdXNlckluZm8pCit7 CisgICAgTlNCdW5kbGUgKmJ1bmRsZSA9IChOU0J1bmRsZSAqKW9iamVjdDsKKyAgICBOU1N0cmlu ZyAqYnVuZGxlRmlsZU5hbWUgPSBbW2J1bmRsZSBidW5kbGVQYXRoXSBsYXN0UGF0aENvbXBvbmVu dF07CisKKyAgICAvLyBFeHBsaWNpdGx5IGlnbm9yZSBTSU1CTC5idW5kbGUsIGFzIGl0cyBvbmx5 IHB1cnBvc2UgaXMgdG8gbG9hZCBleHRlbnNpb25zCisgICAgLy8gb24gYSBwZXItYXBwbGljYXRp b24gYmFzaXMuICBJdCdzIHByZXNlbmNlIGluZGljYXRlcyBhIHVzZXIgaGFzIGFwcGxpY2F0aW9u CisgICAgLy8gZXh0ZW5zaW9ucywgYnV0IG5vdCB0aGF0IGFueSB3aWxsIGJlIGxvYWRlZCBpbnRv IFNhZmFyaQorICAgIGlmICghW2J1bmRsZUZpbGVOYW1lIGlzRXF1YWxUb1N0cmluZzpAIlNJTUJM LmJ1bmRsZSJdKQorICAgICAgICBleHRyYUJ1bmRsZXNXZXJlTG9hZGVkID0gWUVTOworfQorCitz dGF0aWMgdm9pZCBteUFwcGxpY2F0aW9uV2lsbEZpbmlzaExhdW5jaGluZyhDRk5vdGlmaWNhdGlv bkNlbnRlclJlZiBjZW50ZXIsIHZvaWQgKm9ic2VydmVyLCBDRlN0cmluZ1JlZiBuYW1lLCBjb25z dCB2b2lkICpvYmplY3QsIENGRGljdGlvbmFyeVJlZiB1c2VySW5mbykKK3sKKyAgICBDRk5vdGlm aWNhdGlvbkNlbnRlclJlbW92ZU9ic2VydmVyKENGTm90aWZpY2F0aW9uQ2VudGVyR2V0TG9jYWxD ZW50ZXIoKSwgJm15QXBwbGljYXRpb25XaWxsRmluaXNoTGF1bmNoaW5nLCBOVUxMLCBOVUxMKTsK KyAgICBDRk5vdGlmaWNhdGlvbkNlbnRlclJlbW92ZU9ic2VydmVyKENGTm90aWZpY2F0aW9uQ2Vu dGVyR2V0TG9jYWxDZW50ZXIoKSwgJm15QnVuZGxlRGlkTG9hZCwgTlVMTCwgTlVMTCk7CisKKyAg ICBpZiAoZXh0cmFCdW5kbGVzV2VyZUxvYWRlZCkKKyAgICAgICAgTlNSdW5JbmZvcm1hdGlvbmFs QWxlcnRQYW5lbChAIlNhZmFyaSBleHRlbnNpb25zIGRldGVjdGVkIiwKKyAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICBAIlNhZmFyaSBleHRlbnNpb25zIHdlcmUgZGV0ZWN0ZWQg b24geW91ciBzeXN0ZW0uIFRoZXkgYXJlIGluY29tcGF0aWJsZSB3aXRoIG5pZ2h0bHkgYnVpbGRz IG9mIFdlYktpdCwgYW5kIG1heSBjYXVzZSBjcmFzaGVzIG9yIGluY29ycmVjdCBiZWhhdmlvci4g IFBsZWFzZSBkaXNhYmxlIHRoZW0gaWYgeW91IGV4cGVyaWVuY2Ugc3VjaCBiZWhhdmlvci4iLCBA IkNvbnRpbnVlIiwgbmlsLCBuaWwpOworfQogCiB2b2lkIGNsZWFuVXBBZnRlck91cnNlbHZlcyh2 b2lkKQogewpAQCAtNDgsNiArNzEsMTMgQEAgdm9pZCBjbGVhblVwQWZ0ZXJPdXJzZWx2ZXModm9p ZCkKICAgICAqcHJvY1BhdGggPSBwcm9jUGF0aEJhY2t1cDsKICAgICB1bnNldGVudigiRFlMRF9J TlNFUlRfTElCUkFSSUVTIik7CiAgICAgdW5zZXRlbnYoIkNGUHJvY2Vzc1BhdGgiKTsKKworICAg IENGTm90aWZpY2F0aW9uQ2VudGVyQWRkT2JzZXJ2ZXIoQ0ZOb3RpZmljYXRpb25DZW50ZXJHZXRM b2NhbENlbnRlcigpLCAmbXlCdW5kbGVEaWRMb2FkLAorICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgbXlCdW5kbGVEaWRMb2FkLCAoQ0ZTdHJpbmdSZWYpIE5TQnVuZGxlRGlkTG9h ZE5vdGlmaWNhdGlvbiwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIE5VTEws IENGTm90aWZpY2F0aW9uU3VzcGVuc2lvbkJlaGF2aW9yRGVsaXZlckltbWVkaWF0ZWx5KTsKKyAg ICBDRk5vdGlmaWNhdGlvbkNlbnRlckFkZE9ic2VydmVyKENGTm90aWZpY2F0aW9uQ2VudGVyR2V0 TG9jYWxDZW50ZXIoKSwgJm15QXBwbGljYXRpb25XaWxsRmluaXNoTGF1bmNoaW5nLAorICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgbXlBcHBsaWNhdGlvbldpbGxGaW5pc2hMYXVu Y2hpbmcsIChDRlN0cmluZ1JlZikgTlNBcHBsaWNhdGlvbldpbGxGaW5pc2hMYXVuY2hpbmdOb3Rp ZmljYXRpb24sCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBOVUxMLCBDRk5v dGlmaWNhdGlvblN1c3BlbnNpb25CZWhhdmlvckRlbGl2ZXJJbW1lZGlhdGVseSk7CiB9CiAKICNp ZiBfX0xQNjRfXwpJbmRleDogV2ViS2l0VG9vbHMvV2ViS2l0TGF1bmNoZXIvV2ViS2l0TGF1bmNo ZXIueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvago9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXRUb29scy9X ZWJLaXRMYXVuY2hlci9XZWJLaXRMYXVuY2hlci54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qCShy ZXZpc2lvbiAxNTEzMSkKKysrIFdlYktpdFRvb2xzL1dlYktpdExhdW5jaGVyL1dlYktpdExhdW5j aGVyLnhjb2RlcHJvai9wcm9qZWN0LnBieHByb2oJKHdvcmtpbmcgY29weSkKQEAgLTExLDcgKzEx LDcgQEAKIAkJNUQ0REY5ODIwOTdGODlGQjAwODNENUU1IC8qIHN0YXJ0Lmh0bWwgaW4gUmVzb3Vy Y2VzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IDVENERGOTgxMDk3Rjg5RkIw MDgzRDVFNSAvKiBzdGFydC5odG1sICovOyB9OwogCQk1RDY1MEYzNjA5REI4QjM3MDA3NUU5QTgg LyogV2ViS2l0TmlnaHRseUVuYWJsZXIubSBpbiBTb3VyY2VzICovID0ge2lzYSA9IFBCWEJ1aWxk RmlsZTsgZmlsZVJlZiA9IDVENjUwRjM1MDlEQjhCMzcwMDc1RTlBOCAvKiBXZWJLaXROaWdodGx5 RW5hYmxlci5tICovOyB9OwogCQk1RDY1MEYzQTA5REI4QjQxMDA3NUU5QTggLyogV2ViS2l0Tmln aHRseUVuYWJsZXIuZHlsaWIgaW4gUmVzb3VyY2VzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsg ZmlsZVJlZiA9IDVENjUwRjM0MDlEQjhCMjgwMDc1RTlBOCAvKiBXZWJLaXROaWdodGx5RW5hYmxl ci5keWxpYiAqLzsgfTsKLQkJNUQ2NTBGNzYwOURCOENCNDAwNzVFOUE4IC8qIENvcmVGb3VuZGF0 aW9uLmZyYW1ld29yayBpbiBGcmFtZXdvcmtzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmls ZVJlZiA9IDVENjUwRjc1MDlEQjhDQjQwMDc1RTlBOCAvKiBDb3JlRm91bmRhdGlvbi5mcmFtZXdv cmsgKi87IH07CisJCTVEODc3RkNEMEE1Nzk1RjIwMEQwQzY3QiAvKiBDb2NvYS5mcmFtZXdvcmsg aW4gRnJhbWV3b3JrcyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSAxMDU4QzdB MUZFQTU0RjAxMTFDQTJDQkIgLyogQ29jb2EuZnJhbWV3b3JrICovOyB9OwogCQk1REI3MDUyNTA5 N0I5NENEMDA5ODc1RUMgLyogd2Via2l0LmljbnMgaW4gUmVzb3VyY2VzICovID0ge2lzYSA9IFBC WEJ1aWxkRmlsZTsgZmlsZVJlZiA9IDVEQjcwNTI0MDk3Qjk0Q0QwMDk4NzVFQyAvKiB3ZWJraXQu aWNucyAqLzsgfTsKIAkJOEQxMTA3MkQwNDg2Q0VCODAwRTQ3MDkwIC8qIG1haW4ubSBpbiBTb3Vy Y2VzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IDI5Qjk3MzE2RkRDRkEzOTQx MUNBMkNFQSAvKiBtYWluLm0gKi87IHNldHRpbmdzID0ge0FUVFJJQlVURVMgPSAoKTsgfTsgfTsK IAkJOEQxMTA3MkYwNDg2Q0VCODAwRTQ3MDkwIC8qIENvY29hLmZyYW1ld29yayBpbiBGcmFtZXdv cmtzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IDEwNThDN0ExRkVBNTRGMDEx MUNBMkNCQiAvKiBDb2NvYS5mcmFtZXdvcmsgKi87IH07CkBAIC00OCw3ICs0OCw3IEBACiAJCQlp c2EgPSBQQlhGcmFtZXdvcmtzQnVpbGRQaGFzZTsKIAkJCWJ1aWxkQWN0aW9uTWFzayA9IDIxNDc0 ODM2NDc7CiAJCQlmaWxlcyA9ICgKLQkJCQk1RDY1MEY3NjA5REI4Q0I0MDA3NUU5QTggLyogQ29y ZUZvdW5kYXRpb24uZnJhbWV3b3JrIGluIEZyYW1ld29ya3MgKi8sCisJCQkJNUQ4NzdGQ0QwQTU3 OTVGMjAwRDBDNjdCIC8qIENvY29hLmZyYW1ld29yayBpbiBGcmFtZXdvcmtzICovLAogCQkJKTsK IAkJCXJ1bk9ubHlGb3JEZXBsb3ltZW50UG9zdHByb2Nlc3NpbmcgPSAwOwogCQl9Owo= 9139 2006-07-01 23:57:47 -0700 2006-07-02 00:05:28 -0700 Update to explicitly check that bundle is in known extension paths webkit-bug-9689-v2.patch text/plain 6812 mrowe SW5kZXg6IFdlYktpdFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXRUb29scy9D aGFuZ2VMb2cJKHJldmlzaW9uIDE1MTMzKQorKysgV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCSh3b3Jr aW5nIGNvcHkpCkBAIC0xLDMgKzEsMTkgQEAKKzIwMDYtMDctMDIgIE1hcmsgUm93ZSAgPG9wZW5k YXJ3aW4ub3JnQGJkYXNoLm5ldC5uej4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICBCdWcgOTY4OTogTmlnaHRseSBidWlsZHMgc2hvdWxkIHdhcm4gYSB1 c2VyIGFib3V0IHBvdGVudGlhbCBwcm9ibGVtcyB3aGVuIHVzaW5nCisgICAgICAgICJTYWZhcmkg ZXh0ZW5zaW9ucyIKKyAgICAgICAgaHR0cDovL2J1Z3ppbGxhLm9wZW5kYXJ3aW4ub3JnL3Nob3df YnVnLmNnaT9pZD05Njg5CisKKyAgICAgICAgKiBXZWJLaXRMYXVuY2hlci9XZWJLaXRMYXVuY2hl ci54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qOgorICAgICAgICAqIFdlYktpdExhdW5jaGVyL1dl YktpdE5pZ2h0bHlFbmFibGVyLm06CisgICAgICAgIChteUJ1bmRsZURpZExvYWQpOiBLZWVwIHRy YWNrIG9mIGlmIGFueSBidW5kbGVzIHRoYXQgYXJlIGxvYWRlZC4KKyAgICAgICAgKG15QXBwbGlj YXRpb25XaWxsRmluaXNoTGF1bmNoaW5nKTogIE5vdGlmeSB1c2VyIGlmIGFueSBidW5kbGVzIGFy ZSBsb2FkZWQuCisgICAgICAgIChjbGVhblVwQWZ0ZXJPdXJzZWx2ZXMpOiBSZWdpc3RlciBmb3Ig TlNCdW5kbGVEaWRMb2FkTm90aWZpY2F0aW9uIGFuZAorICAgICAgICBOU0FwcGxpY2F0aW9uV2ls bEZpbmlzaExhdW5jaGluZ05vdGlmaWNhdGlvbiBub3RpZmljYXRpb25zIHNvIHRoYXQgd2UgY2Fu CisgICAgICAgIHRyYWNrIGJ1bmRsZSBsb2FkcyBhbmQgbm90aWZ5IHRoZSB1c2VyIGF0IGxhdW5j aCBjb21wbGV0aW9uLgorCiAyMDA2LTA2LTMwICBNaWtlIEVtbWVsICA8bWlrZS5lbW1lbEBnbWFp bC5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgRGFyaW4uCkluZGV4OiBXZWJLaXRUb29scy9X ZWJLaXRMYXVuY2hlci9XZWJLaXROaWdodGx5RW5hYmxlci5tCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktp dFRvb2xzL1dlYktpdExhdW5jaGVyL1dlYktpdE5pZ2h0bHlFbmFibGVyLm0JKHJldmlzaW9uIDE1 MTMxKQorKysgV2ViS2l0VG9vbHMvV2ViS2l0TGF1bmNoZXIvV2ViS2l0TmlnaHRseUVuYWJsZXIu bQkod29ya2luZyBjb3B5KQpAQCAtMzUsOCArMzUsNTIgQEAKICNpbmNsdWRlIDxzdHJpbmcuaD4K IAogc3RhdGljIHZvaWQgY2xlYW5VcEFmdGVyT3Vyc2VsdmVzKHZvaWQpIF9fYXR0cmlidXRlX18g KChjb25zdHJ1Y3RvcikpOworc3RhdGljIHZvaWQgKnN5bWJvbF9sb29rdXAoY2hhciAqc3ltYm9s KTsKIAotdm9pZCAqc3ltYm9sX2xvb2t1cChjaGFyICpzeW1ib2wpOworc3RhdGljIGJvb2wgZXh0 ZW5zaW9uQnVuZGxlc1dlcmVMb2FkZWQgPSBOTzsKK3N0YXRpYyBOU1NldCAqZXh0ZW5zaW9uUGF0 aHMgPSBuaWw7CisKK3N0YXRpYyB2b2lkIG15QnVuZGxlRGlkTG9hZChDRk5vdGlmaWNhdGlvbkNl bnRlclJlZiBjZW50ZXIsIHZvaWQgKm9ic2VydmVyLCBDRlN0cmluZ1JlZiBuYW1lLCBjb25zdCB2 b2lkICpvYmplY3QsIENGRGljdGlvbmFyeVJlZiB1c2VySW5mbykKK3sKKyAgICAvLyBCcmVhayBv dXQgZWFybHkgaWYgd2UgaGF2ZSBhbHJlYWR5IGRldGVjdGVkIGFuIGV4dGVuc2lvbgorICAgIGlm IChleHRlbnNpb25CdW5kbGVzV2VyZUxvYWRlZCkKKyAgICAgICAgcmV0dXJuOworCisgICAgTlNC dW5kbGUgKmJ1bmRsZSA9IChOU0J1bmRsZSAqKW9iamVjdDsKKyAgICBOU1N0cmluZyAqYnVuZGxl UGF0aCA9IFtbYnVuZGxlIGJ1bmRsZVBhdGhdIHN0cmluZ0J5QWJicmV2aWF0aW5nV2l0aFRpbGRl SW5QYXRoXTsKKyAgICBOU1N0cmluZyAqYnVuZGxlRmlsZU5hbWUgPSBbYnVuZGxlUGF0aCBsYXN0 UGF0aENvbXBvbmVudF07CisKKyAgICAvLyBFeHBsaWNpdGx5IGlnbm9yZSBTSU1CTC5idW5kbGUs IGFzIGl0cyBvbmx5IHB1cnBvc2UgaXMgdG8gbG9hZCBleHRlbnNpb25zCisgICAgLy8gb24gYSBw ZXItYXBwbGljYXRpb24gYmFzaXMuICBJdCdzIHByZXNlbmNlIGluZGljYXRlcyBhIHVzZXIgaGFz IGFwcGxpY2F0aW9uCisgICAgLy8gZXh0ZW5zaW9ucywgYnV0IG5vdCB0aGF0IGFueSB3aWxsIGJl IGxvYWRlZCBpbnRvIFNhZmFyaQorICAgIGlmIChbYnVuZGxlRmlsZU5hbWUgaXNFcXVhbFRvU3Ry aW5nOkAiU0lNQkwuYnVuZGxlIl0pCisgICAgICAgIHJldHVybjsKKworICAgIC8vIElmIHRoZSBi dW5kbGUgbGl2ZXMgaW5zaWRlIGEga25vd24gZXh0ZW5zaW9uIHBhdGgsIGZsYWcgaXQgYXMgYW4g ZXh0ZW5zaW9uCisgICAgTlNFbnVtZXJhdG9yICplID0gW2V4dGVuc2lvblBhdGhzIG9iamVjdEVu dW1lcmF0b3JdOworICAgIE5TU3RyaW5nICpwYXRoID0gbmlsOworICAgIHdoaWxlIChwYXRoID0g W2UgbmV4dE9iamVjdF0pIHsKKyAgICAgICAgaWYgKFtidW5kbGVQYXRoIGxlbmd0aF0gPCBbcGF0 aCBsZW5ndGhdKQorICAgICAgICAgICAgY29udGludWU7CisKKyAgICAgICAgaWYgKFtbYnVuZGxl UGF0aCBzdWJzdHJpbmdUb0luZGV4OltwYXRoIGxlbmd0aF1dIGlzRXF1YWxUb1N0cmluZzpwYXRo XSkgeworICAgICAgICAgICAgZXh0ZW5zaW9uQnVuZGxlc1dlcmVMb2FkZWQgPSBZRVM7CisgICAg ICAgICAgICBicmVhazsKKyAgICAgICAgfQorICAgIH0KK30KKworc3RhdGljIHZvaWQgbXlBcHBs aWNhdGlvbldpbGxGaW5pc2hMYXVuY2hpbmcoQ0ZOb3RpZmljYXRpb25DZW50ZXJSZWYgY2VudGVy LCB2b2lkICpvYnNlcnZlciwgQ0ZTdHJpbmdSZWYgbmFtZSwgY29uc3Qgdm9pZCAqb2JqZWN0LCBD RkRpY3Rpb25hcnlSZWYgdXNlckluZm8pCit7CisgICAgQ0ZOb3RpZmljYXRpb25DZW50ZXJSZW1v dmVPYnNlcnZlcihDRk5vdGlmaWNhdGlvbkNlbnRlckdldExvY2FsQ2VudGVyKCksICZteUFwcGxp Y2F0aW9uV2lsbEZpbmlzaExhdW5jaGluZywgTlVMTCwgTlVMTCk7CisgICAgQ0ZOb3RpZmljYXRp b25DZW50ZXJSZW1vdmVPYnNlcnZlcihDRk5vdGlmaWNhdGlvbkNlbnRlckdldExvY2FsQ2VudGVy KCksICZteUJ1bmRsZURpZExvYWQsIE5VTEwsIE5VTEwpOworICAgIFtleHRlbnNpb25QYXRocyBy ZWxlYXNlXTsKKyAgICBleHRlbnNpb25QYXRocyA9IG5pbDsKKworICAgIGlmIChleHRlbnNpb25C dW5kbGVzV2VyZUxvYWRlZCkKKyAgICAgICAgTlNSdW5JbmZvcm1hdGlvbmFsQWxlcnRQYW5lbChA IlNhZmFyaSBleHRlbnNpb25zIGRldGVjdGVkIiwKKyAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICBAIlNhZmFyaSBleHRlbnNpb25zIHdlcmUgZGV0ZWN0ZWQgb24geW91ciBzeXN0 ZW0uIFRoZXkgYXJlIGluY29tcGF0aWJsZSB3aXRoIG5pZ2h0bHkgYnVpbGRzIG9mIFdlYktpdCwg YW5kIG1heSBjYXVzZSBjcmFzaGVzIG9yIGluY29ycmVjdCBiZWhhdmlvci4gIFBsZWFzZSBkaXNh YmxlIHRoZW0gaWYgeW91IGV4cGVyaWVuY2Ugc3VjaCBiZWhhdmlvci4iLCBAIkNvbnRpbnVlIiwg bmlsLCBuaWwpOworfQogCiB2b2lkIGNsZWFuVXBBZnRlck91cnNlbHZlcyh2b2lkKQogewpAQCAt NDgsNiArOTIsMTggQEAgdm9pZCBjbGVhblVwQWZ0ZXJPdXJzZWx2ZXModm9pZCkKICAgICAqcHJv Y1BhdGggPSBwcm9jUGF0aEJhY2t1cDsKICAgICB1bnNldGVudigiRFlMRF9JTlNFUlRfTElCUkFS SUVTIik7CiAgICAgdW5zZXRlbnYoIkNGUHJvY2Vzc1BhdGgiKTsKKworICAgIGV4dGVuc2lvblBh dGhzID0gW1tOU1NldCBhbGxvY10gaW5pdFdpdGhPYmplY3RzOkAifi9MaWJyYXJ5L0lucHV0TWFu YWdlcnMvIiwgQCIvTGlicmFyeS9JbnB1dE1hbmFnZXJzLyIsCisgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgQCJ+L0xpYnJhcnkvQXBwbGljYXRpb24g U3VwcG9ydC9TSU1CTC9QbHVnaW5zLyIsIEAiL0xpYnJhcnkvQXBwbGljYXRpb24gU3VwcG9ydC9T SU1CTC9QbHVnaW5zLyIsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgQCJ+L0xpYnJhcnkvQXBwbGljYXRpb24gRW5oYW5jZXJzLyIsIEAiL0xpYnJh cnkvQXBwbGljYXRpb24gRW5oYW5jZXJzLyIsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgbmlsXTsKKworICAgIENGTm90aWZpY2F0aW9uQ2VudGVy QWRkT2JzZXJ2ZXIoQ0ZOb3RpZmljYXRpb25DZW50ZXJHZXRMb2NhbENlbnRlcigpLCAmbXlCdW5k bGVEaWRMb2FkLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgbXlCdW5kbGVE aWRMb2FkLCAoQ0ZTdHJpbmdSZWYpIE5TQnVuZGxlRGlkTG9hZE5vdGlmaWNhdGlvbiwKKyAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIE5VTEwsIENGTm90aWZpY2F0aW9uU3VzcGVu c2lvbkJlaGF2aW9yRGVsaXZlckltbWVkaWF0ZWx5KTsKKyAgICBDRk5vdGlmaWNhdGlvbkNlbnRl ckFkZE9ic2VydmVyKENGTm90aWZpY2F0aW9uQ2VudGVyR2V0TG9jYWxDZW50ZXIoKSwgJm15QXBw bGljYXRpb25XaWxsRmluaXNoTGF1bmNoaW5nLAorICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgbXlBcHBsaWNhdGlvbldpbGxGaW5pc2hMYXVuY2hpbmcsIChDRlN0cmluZ1JlZikg TlNBcHBsaWNhdGlvbldpbGxGaW5pc2hMYXVuY2hpbmdOb3RpZmljYXRpb24sCisgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICBOVUxMLCBDRk5vdGlmaWNhdGlvblN1c3BlbnNpb25C ZWhhdmlvckRlbGl2ZXJJbW1lZGlhdGVseSk7CiB9CiAKICNpZiBfX0xQNjRfXwpJbmRleDogV2Vi S2l0VG9vbHMvV2ViS2l0TGF1bmNoZXIvV2ViS2l0TGF1bmNoZXIueGNvZGVwcm9qL3Byb2plY3Qu cGJ4cHJvago9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXRUb29scy9XZWJLaXRMYXVuY2hlci9XZWJLaXRM YXVuY2hlci54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qCShyZXZpc2lvbiAxNTEzMSkKKysrIFdl YktpdFRvb2xzL1dlYktpdExhdW5jaGVyL1dlYktpdExhdW5jaGVyLnhjb2RlcHJvai9wcm9qZWN0 LnBieHByb2oJKHdvcmtpbmcgY29weSkKQEAgLTExLDcgKzExLDcgQEAKIAkJNUQ0REY5ODIwOTdG ODlGQjAwODNENUU1IC8qIHN0YXJ0Lmh0bWwgaW4gUmVzb3VyY2VzICovID0ge2lzYSA9IFBCWEJ1 aWxkRmlsZTsgZmlsZVJlZiA9IDVENERGOTgxMDk3Rjg5RkIwMDgzRDVFNSAvKiBzdGFydC5odG1s ICovOyB9OwogCQk1RDY1MEYzNjA5REI4QjM3MDA3NUU5QTggLyogV2ViS2l0TmlnaHRseUVuYWJs ZXIubSBpbiBTb3VyY2VzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IDVENjUw RjM1MDlEQjhCMzcwMDc1RTlBOCAvKiBXZWJLaXROaWdodGx5RW5hYmxlci5tICovOyB9OwogCQk1 RDY1MEYzQTA5REI4QjQxMDA3NUU5QTggLyogV2ViS2l0TmlnaHRseUVuYWJsZXIuZHlsaWIgaW4g UmVzb3VyY2VzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IDVENjUwRjM0MDlE QjhCMjgwMDc1RTlBOCAvKiBXZWJLaXROaWdodGx5RW5hYmxlci5keWxpYiAqLzsgfTsKLQkJNUQ2 NTBGNzYwOURCOENCNDAwNzVFOUE4IC8qIENvcmVGb3VuZGF0aW9uLmZyYW1ld29yayBpbiBGcmFt ZXdvcmtzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IDVENjUwRjc1MDlEQjhD QjQwMDc1RTlBOCAvKiBDb3JlRm91bmRhdGlvbi5mcmFtZXdvcmsgKi87IH07CisJCTVEODc3RkNE MEE1Nzk1RjIwMEQwQzY3QiAvKiBDb2NvYS5mcmFtZXdvcmsgaW4gRnJhbWV3b3JrcyAqLyA9IHtp c2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSAxMDU4QzdBMUZFQTU0RjAxMTFDQTJDQkIgLyog Q29jb2EuZnJhbWV3b3JrICovOyB9OwogCQk1REI3MDUyNTA5N0I5NENEMDA5ODc1RUMgLyogd2Vi a2l0LmljbnMgaW4gUmVzb3VyY2VzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9 IDVEQjcwNTI0MDk3Qjk0Q0QwMDk4NzVFQyAvKiB3ZWJraXQuaWNucyAqLzsgfTsKIAkJOEQxMTA3 MkQwNDg2Q0VCODAwRTQ3MDkwIC8qIG1haW4ubSBpbiBTb3VyY2VzICovID0ge2lzYSA9IFBCWEJ1 aWxkRmlsZTsgZmlsZVJlZiA9IDI5Qjk3MzE2RkRDRkEzOTQxMUNBMkNFQSAvKiBtYWluLm0gKi87 IHNldHRpbmdzID0ge0FUVFJJQlVURVMgPSAoKTsgfTsgfTsKIAkJOEQxMTA3MkYwNDg2Q0VCODAw RTQ3MDkwIC8qIENvY29hLmZyYW1ld29yayBpbiBGcmFtZXdvcmtzICovID0ge2lzYSA9IFBCWEJ1 aWxkRmlsZTsgZmlsZVJlZiA9IDEwNThDN0ExRkVBNTRGMDExMUNBMkNCQiAvKiBDb2NvYS5mcmFt ZXdvcmsgKi87IH07CkBAIC00OCw3ICs0OCw3IEBACiAJCQlpc2EgPSBQQlhGcmFtZXdvcmtzQnVp bGRQaGFzZTsKIAkJCWJ1aWxkQWN0aW9uTWFzayA9IDIxNDc0ODM2NDc7CiAJCQlmaWxlcyA9ICgK LQkJCQk1RDY1MEY3NjA5REI4Q0I0MDA3NUU5QTggLyogQ29yZUZvdW5kYXRpb24uZnJhbWV3b3Jr IGluIEZyYW1ld29ya3MgKi8sCisJCQkJNUQ4NzdGQ0QwQTU3OTVGMjAwRDBDNjdCIC8qIENvY29h LmZyYW1ld29yayBpbiBGcmFtZXdvcmtzICovLAogCQkJKTsKIAkJCXJ1bk9ubHlGb3JEZXBsb3lt ZW50UG9zdHByb2Nlc3NpbmcgPSAwOwogCQl9Owo=