141264 2015-02-04 14:45:08 -0800 Add API::HistoryClient and split some things out of API::NavigationClient 2015-02-07 15:47:01 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 thorton thorton andersca ap mitz sam simon.fraser oldest_to_newest 1066934 0 thorton 2015-02-04 14:45:08 -0800 Add API::HistoryClient and split some things out of API::NavigationClient 1066935 1 246054 thorton 2015-02-04 14:46:31 -0800 Created attachment 246054 Patch 1067584 2 thorton 2015-02-07 15:47:01 -0800 http://trac.webkit.org/changeset/179786 246054 2015-02-04 14:46:31 -0800 2015-02-07 08:05:37 -0800 Patch bug-141264-20150204144631.patch text/plain 23587 thorton U3VidmVyc2lvbiBSZXZpc2lvbjogMTc5NjE2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggNzVkNTRkNWRkZjk4NDYx NDVlNDJjZjBmYTNiN2Y5NGFiYmJjNjg2NS4uZTMxMWI0M2Q3MzhiY2JkNTU0NGMwYTY0MTU2NTZh YzBkYzA0NjIxZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDU1IEBACisyMDE1LTAyLTA0ICBUaW0g SG9ydG9uICA8dGltb3RoeV9ob3J0b25AYXBwbGUuY29tPgorCisgICAgICAgIEFkZCBBUEk6Okhp c3RvcnlDbGllbnQgYW5kIHNwbGl0IHNvbWUgdGhpbmdzIG91dCBvZiBBUEk6Ok5hdmlnYXRpb25D bGllbnQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE0 MTI2NAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICog VUlQcm9jZXNzL0FQSS9BUElIaXN0b3J5Q2xpZW50Lmg6IEFkZGVkLgorICAgICAgICAoQVBJOjpI aXN0b3J5Q2xpZW50Ojp+SGlzdG9yeUNsaWVudCk6CisgICAgICAgIChBUEk6Okhpc3RvcnlDbGll bnQ6OmRpZE5hdmlnYXRlV2l0aE5hdmlnYXRpb25EYXRhKToKKyAgICAgICAgKEFQSTo6SGlzdG9y eUNsaWVudDo6ZGlkUGVyZm9ybUNsaWVudFJlZGlyZWN0KToKKyAgICAgICAgKEFQSTo6SGlzdG9y eUNsaWVudDo6ZGlkUGVyZm9ybVNlcnZlclJlZGlyZWN0KToKKyAgICAgICAgKEFQSTo6SGlzdG9y eUNsaWVudDo6ZGlkVXBkYXRlSGlzdG9yeVRpdGxlKToKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJ L0FQSU5hdmlnYXRpb25DbGllbnQuaDoKKyAgICAgICAgKEFQSTo6TmF2aWdhdGlvbkNsaWVudDo6 ZGlkTmF2aWdhdGVXaXRoTmF2aWdhdGlvbkRhdGEpOiBEZWxldGVkLgorICAgICAgICAoQVBJOjpO YXZpZ2F0aW9uQ2xpZW50OjpkaWRQZXJmb3JtQ2xpZW50UmVkaXJlY3QpOiBEZWxldGVkLgorICAg ICAgICAoQVBJOjpOYXZpZ2F0aW9uQ2xpZW50OjpkaWRQZXJmb3JtU2VydmVyUmVkaXJlY3QpOiBE ZWxldGVkLgorICAgICAgICAoQVBJOjpOYXZpZ2F0aW9uQ2xpZW50OjpkaWRVcGRhdGVIaXN0b3J5 VGl0bGUpOiBEZWxldGVkLgorICAgICAgICAqIFVJUHJvY2Vzcy9Db2NvYS9OYXZpZ2F0aW9uU3Rh dGUuaDoKKyAgICAgICAgKiBVSVByb2Nlc3MvQ29jb2EvTmF2aWdhdGlvblN0YXRlLm1tOgorICAg ICAgICAoV2ViS2l0OjpOYXZpZ2F0aW9uU3RhdGU6OmNyZWF0ZUhpc3RvcnlDbGllbnQpOgorICAg ICAgICAoV2ViS2l0OjpOYXZpZ2F0aW9uU3RhdGU6Okhpc3RvcnlDbGllbnQ6Okhpc3RvcnlDbGll bnQpOgorICAgICAgICAoV2ViS2l0OjpOYXZpZ2F0aW9uU3RhdGU6Okhpc3RvcnlDbGllbnQ6On5I aXN0b3J5Q2xpZW50KToKKyAgICAgICAgKFdlYktpdDo6TmF2aWdhdGlvblN0YXRlOjpIaXN0b3J5 Q2xpZW50OjpkaWROYXZpZ2F0ZVdpdGhOYXZpZ2F0aW9uRGF0YSk6CisgICAgICAgIChXZWJLaXQ6 Ok5hdmlnYXRpb25TdGF0ZTo6SGlzdG9yeUNsaWVudDo6ZGlkUGVyZm9ybUNsaWVudFJlZGlyZWN0 KToKKyAgICAgICAgKFdlYktpdDo6TmF2aWdhdGlvblN0YXRlOjpIaXN0b3J5Q2xpZW50OjpkaWRQ ZXJmb3JtU2VydmVyUmVkaXJlY3QpOgorICAgICAgICAoV2ViS2l0OjpOYXZpZ2F0aW9uU3RhdGU6 Okhpc3RvcnlDbGllbnQ6OmRpZFVwZGF0ZUhpc3RvcnlUaXRsZSk6CisgICAgICAgIChXZWJLaXQ6 Ok5hdmlnYXRpb25TdGF0ZTo6TmF2aWdhdGlvbkNsaWVudDo6ZGlkTmF2aWdhdGVXaXRoTmF2aWdh dGlvbkRhdGEpOiBEZWxldGVkLgorICAgICAgICAoV2ViS2l0OjpOYXZpZ2F0aW9uU3RhdGU6Ok5h dmlnYXRpb25DbGllbnQ6OmRpZFBlcmZvcm1DbGllbnRSZWRpcmVjdCk6IERlbGV0ZWQuCisgICAg ICAgIChXZWJLaXQ6Ok5hdmlnYXRpb25TdGF0ZTo6TmF2aWdhdGlvbkNsaWVudDo6ZGlkUGVyZm9y bVNlcnZlclJlZGlyZWN0KTogRGVsZXRlZC4KKyAgICAgICAgKFdlYktpdDo6TmF2aWdhdGlvblN0 YXRlOjpOYXZpZ2F0aW9uQ2xpZW50OjpkaWRVcGRhdGVIaXN0b3J5VGl0bGUpOiBEZWxldGVkLgor ICAgICAgICAqIFVJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwOgorICAgICAgICAoV2ViS2l0OjpX ZWJQYWdlUHJveHk6OnNldEhpc3RvcnlDbGllbnQpOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdl UHJveHk6OmRpZE5hdmlnYXRlV2l0aE5hdmlnYXRpb25EYXRhKToKKyAgICAgICAgKFdlYktpdDo6 V2ViUGFnZVByb3h5OjpkaWRQZXJmb3JtQ2xpZW50UmVkaXJlY3QpOgorICAgICAgICAoV2ViS2l0 OjpXZWJQYWdlUHJveHk6OmRpZFBlcmZvcm1TZXJ2ZXJSZWRpcmVjdCk6CisgICAgICAgIChXZWJL aXQ6OldlYlBhZ2VQcm94eTo6ZGlkVXBkYXRlSGlzdG9yeVRpdGxlKToKKyAgICAgICAgKiBVSVBy b2Nlc3MvV2ViUGFnZVByb3h5Lmg6CisgICAgICAgIEFkZCBhIEFQSTo6SGlzdG9yeUNsaWVudCBh bmQgbW92ZSB0aGUgZmV3IHRoaW5ncyB0aGF0IGJlbG9uZyBvbiBpdCBvdXQgb2YgQVBJOjpOYXZp Z2F0aW9uQ2xpZW50LgorICAgICAgICBBZGp1c3QgYWNjb3JkaW5nbHkgaW4gV2ViUGFnZVByb3h5 IGFuZCBOYXZpZ2F0aW9uU3RhdGUuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL0NvY29hL1dL V2ViVmlldy5tbToKKyAgICAgICAgKC1bV0tXZWJWaWV3IGluaXRXaXRoRnJhbWU6Y29uZmlndXJh dGlvbjpdKToKKyAgICAgICAgKC1bV0tXZWJWaWV3IHNldE5hdmlnYXRpb25EZWxlZ2F0ZTpdKToK KyAgICAgICAgKC1bV0tXZWJWaWV3IHNldFVJRGVsZWdhdGU6XSk6CisgICAgICAgICgtW1dLV2Vi VmlldyBfc2V0SGlzdG9yeURlbGVnYXRlOl0pOgorICAgICAgICBMYXppbHkgcHVzaCB0aGUgTmF2 aWdhdGlvblN0YXRlL1VJRGVsZWdhdGUgY2xpZW50cyBkb3duIHRvIFdlYlBhZ2VQcm94eSB1cG9u CisgICAgICAgIGluc3RhbGxhdGlvbiBvZiBhIGRlbGVnYXRlLCBzbyB0aGF0IGFsdGVybmF0aXZl IChDIFNQSSkgZGVsZWdhdGUgc2V0dGVycyBjYW4KKyAgICAgICAgYmUgc2VwYXJhdGVseSBjcmVh dGVkLgorCisgICAgICAgICogV2ViS2l0Mi54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qOgorCiAy MDE1LTAyLTA0ICBNaWNoYWVsIENhdGFuemFybyAgPG1jYXRhbnphcm9AaWdhbGlhLmNvbT4KIAog ICAgICAgICBCdWlsZCB3aXRoIHNlY2NvbXAgZmlsdGVycyBicm9rZW4gc2luY2UgcjE3OTQwOQpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9BUElIaXN0b3J5Q2xpZW50 LmggYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0FQSUhpc3RvcnlDbGllbnQuaApuZXcg ZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwLi43N2ZjYTI2NTYyOTIxYTkzZDkxYjhjNjAzMmU5N2Q5YTcwMTM4YWQ5Ci0tLSAvZGV2 L251bGwKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9BUElIaXN0b3J5Q2xpZW50 LmgKQEAgLTAsMCArMSw1MCBAQAorLyoKKyAqIENvcHlyaWdodCAoQykgMjAxNCwgMjAxNSBBcHBs ZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCisgKgorICogUmVkaXN0cmlidXRpb24gYW5kIHVz ZSBpbiBzb3VyY2UgYW5kIGJpbmFyeSBmb3Jtcywgd2l0aCBvciB3aXRob3V0CisgKiBtb2RpZmlj YXRpb24sIGFyZSBwZXJtaXR0ZWQgcHJvdmlkZWQgdGhhdCB0aGUgZm9sbG93aW5nIGNvbmRpdGlv bnMKKyAqIGFyZSBtZXQ6CisgKiAxLiBSZWRpc3RyaWJ1dGlvbnMgb2Ygc291cmNlIGNvZGUgbXVz dCByZXRhaW4gdGhlIGFib3ZlIGNvcHlyaWdodAorICogICAgbm90aWNlLCB0aGlzIGxpc3Qgb2Yg Y29uZGl0aW9ucyBhbmQgdGhlIGZvbGxvd2luZyBkaXNjbGFpbWVyLgorICogMi4gUmVkaXN0cmli dXRpb25zIGluIGJpbmFyeSBmb3JtIG11c3QgcmVwcm9kdWNlIHRoZSBhYm92ZSBjb3B5cmlnaHQK KyAqICAgIG5vdGljZSwgdGhpcyBsaXN0IG9mIGNvbmRpdGlvbnMgYW5kIHRoZSBmb2xsb3dpbmcg ZGlzY2xhaW1lciBpbiB0aGUKKyAqICAgIGRvY3VtZW50YXRpb24gYW5kL29yIG90aGVyIG1hdGVy aWFscyBwcm92aWRlZCB3aXRoIHRoZSBkaXN0cmlidXRpb24uCisgKgorICogVEhJUyBTT0ZUV0FS RSBJUyBQUk9WSURFRCBCWSBBUFBMRSBJTkMuIEFORCBJVFMgQ09OVFJJQlVUT1JTIGBgQVMgSVMn JworICogQU5EIEFOWSBFWFBSRVNTIE9SIElNUExJRUQgV0FSUkFOVElFUywgSU5DTFVESU5HLCBC VVQgTk9UIExJTUlURUQgVE8sCisgKiBUSEUgSU1QTElFRCBXQVJSQU5USUVTIE9GIE1FUkNIQU5U QUJJTElUWSBBTkQgRklUTkVTUyBGT1IgQSBQQVJUSUNVTEFSCisgKiBQVVJQT1NFIEFSRSBESVND TEFJTUVELiBJTiBOTyBFVkVOVCBTSEFMTCBBUFBMRSBJTkMuIE9SIElUUyBDT05UUklCVVRPUlMK KyAqIEJFIExJQUJMRSBGT1IgQU5ZIERJUkVDVCwgSU5ESVJFQ1QsIElOQ0lERU5UQUwsIFNQRUNJ QUwsIEVYRU1QTEFSWSwgT1IKKyAqIENPTlNFUVVFTlRJQUwgREFNQUdFUyAoSU5DTFVESU5HLCBC VVQgTk9UIExJTUlURUQgVE8sIFBST0NVUkVNRU5UIE9GCisgKiBTVUJTVElUVVRFIEdPT0RTIE9S IFNFUlZJQ0VTOyBMT1NTIE9GIFVTRSwgREFUQSwgT1IgUFJPRklUUzsgT1IgQlVTSU5FU1MKKyAq IElOVEVSUlVQVElPTikgSE9XRVZFUiBDQVVTRUQgQU5EIE9OIEFOWSBUSEVPUlkgT0YgTElBQklM SVRZLCBXSEVUSEVSIElOCisgKiBDT05UUkFDVCwgU1RSSUNUIExJQUJJTElUWSwgT1IgVE9SVCAo SU5DTFVESU5HIE5FR0xJR0VOQ0UgT1IgT1RIRVJXSVNFKQorICogQVJJU0lORyBJTiBBTlkgV0FZ IE9VVCBPRiBUSEUgVVNFIE9GIFRISVMgU09GVFdBUkUsIEVWRU4gSUYgQURWSVNFRCBPRgorICog VEhFIFBPU1NJQklMSVRZIE9GIFNVQ0ggREFNQUdFLgorICovCisKKyNpZm5kZWYgQVBJSGlzdG9y eUNsaWVudF9oCisjZGVmaW5lIEFQSUhpc3RvcnlDbGllbnRfaAorCisjaW5jbHVkZSA8d3RmL0Zv cndhcmQuaD4KKworbmFtZXNwYWNlIFdlYktpdCB7CitjbGFzcyBXZWJQYWdlUHJveHk7CitzdHJ1 Y3QgV2ViTmF2aWdhdGlvbkRhdGFTdG9yZTsKK30KKworbmFtZXNwYWNlIEFQSSB7CisKK2NsYXNz IEhpc3RvcnlDbGllbnQgeworcHVibGljOgorICAgIHZpcnR1YWwgfkhpc3RvcnlDbGllbnQoKSB7 IH0KKworICAgIHZpcnR1YWwgdm9pZCBkaWROYXZpZ2F0ZVdpdGhOYXZpZ2F0aW9uRGF0YShXZWJL aXQ6OldlYlBhZ2VQcm94eSYsIGNvbnN0IFdlYktpdDo6V2ViTmF2aWdhdGlvbkRhdGFTdG9yZSYp IHsgfQorICAgIHZpcnR1YWwgdm9pZCBkaWRQZXJmb3JtQ2xpZW50UmVkaXJlY3QoV2ViS2l0OjpX ZWJQYWdlUHJveHkmLCBjb25zdCBXVEY6OlN0cmluZyYsIGNvbnN0IFdURjo6U3RyaW5nJikgeyB9 CisgICAgdmlydHVhbCB2b2lkIGRpZFBlcmZvcm1TZXJ2ZXJSZWRpcmVjdChXZWJLaXQ6OldlYlBh Z2VQcm94eSYsIGNvbnN0IFdURjo6U3RyaW5nJiwgY29uc3QgV1RGOjpTdHJpbmcmKSB7IH0KKyAg ICB2aXJ0dWFsIHZvaWQgZGlkVXBkYXRlSGlzdG9yeVRpdGxlKFdlYktpdDo6V2ViUGFnZVByb3h5 JiwgY29uc3QgV1RGOjpTdHJpbmcmLCBjb25zdCBXVEY6OlN0cmluZyYpIHsgfQorfTsKKworfSAv LyBuYW1lc3BhY2UgQVBJCisKKyNlbmRpZiAvLyBBUElIaXN0b3J5Q2xpZW50X2gKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQVBJTmF2aWdhdGlvbkNsaWVudC5oIGIv U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9BUElOYXZpZ2F0aW9uQ2xpZW50LmgKaW5kZXgg ODc1ZThjYzBkOTE4N2FlMTQ3NjRkYzQ1Nzg1MjlkMGEzMmM5MjYyYS4uZmNkM2EzNmZhNzM1NjQw NDUwMGYyZmEwOGQ5MGM5OGFkYWEyNjJiMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQ cm9jZXNzL0FQSS9BUElOYXZpZ2F0aW9uQ2xpZW50LmgKKysrIGIvU291cmNlL1dlYktpdDIvVUlQ cm9jZXNzL0FQSS9BUElOYXZpZ2F0aW9uQ2xpZW50LmgKQEAgLTg1LDExICs4NSw2IEBAIHB1Ymxp YzoKIAogICAgIHZpcnR1YWwgUGFzc1JlZlB0cjxEYXRhPiB3ZWJDcnlwdG9NYXN0ZXJLZXkoV2Vi S2l0OjpXZWJQYWdlUHJveHkmKSB7IHJldHVybiBudWxscHRyOyB9CiAKLSAgICB2aXJ0dWFsIHZv aWQgZGlkTmF2aWdhdGVXaXRoTmF2aWdhdGlvbkRhdGEoV2ViS2l0OjpXZWJQYWdlUHJveHkmLCBj b25zdCBXZWJLaXQ6OldlYk5hdmlnYXRpb25EYXRhU3RvcmUmKSB7IH0KLSAgICB2aXJ0dWFsIHZv aWQgZGlkUGVyZm9ybUNsaWVudFJlZGlyZWN0KFdlYktpdDo6V2ViUGFnZVByb3h5JiwgY29uc3Qg V1RGOjpTdHJpbmcmLCBjb25zdCBXVEY6OlN0cmluZyYpIHsgfQotICAgIHZpcnR1YWwgdm9pZCBk aWRQZXJmb3JtU2VydmVyUmVkaXJlY3QoV2ViS2l0OjpXZWJQYWdlUHJveHkmLCBjb25zdCBXVEY6 OlN0cmluZyYsIGNvbnN0IFdURjo6U3RyaW5nJikgeyB9Ci0gICAgdmlydHVhbCB2b2lkIGRpZFVw ZGF0ZUhpc3RvcnlUaXRsZShXZWJLaXQ6OldlYlBhZ2VQcm94eSYsIGNvbnN0IFdURjo6U3RyaW5n JiwgY29uc3QgV1RGOjpTdHJpbmcmKSB7IH0KLQogI2lmIFVTRShRVUlDS19MT09LKQogICAgIHZp cnR1YWwgdm9pZCBkaWRTdGFydExvYWRGb3JRdWlja0xvb2tEb2N1bWVudEluTWFpbkZyYW1lKGNv bnN0IFdURjo6U3RyaW5nJiBmaWxlTmFtZSwgY29uc3QgV1RGOjpTdHJpbmcmIHV0aSkgeyB9CiAg ICAgdmlydHVhbCB2b2lkIGRpZEZpbmlzaExvYWRGb3JRdWlja0xvb2tEb2N1bWVudEluTWFpbkZy YW1lKGNvbnN0IFdlYktpdDo6UXVpY2tMb29rRG9jdW1lbnREYXRhJikgeyB9CmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0NvY29hL1dLV2ViVmlldy5tbSBiL1NvdXJj ZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJWaWV3Lm1tCmluZGV4IGJhMTIyNTIw MDg5YjE3YzE5OTI0ZWIyM2UxYzIzNTQ5ZmEwODRhZjMuLjkyODk4MGIyMTQzMGY1OThlOGFjODQz MjllMTZhMTJhODRlODMzNGUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9B UEkvQ29jb2EvV0tXZWJWaWV3Lm1tCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkv Q29jb2EvV0tXZWJWaWV3Lm1tCkBAIC0zNTcsMTEgKzM1Nyw3IEBAIHN0YXRpYyBpbnQzMl90IGRl dmljZU9yaWVudGF0aW9uKCkKICAgICAgICAgX3BhZ2UtPnNldEFwcGxpY2F0aW9uTmFtZUZvclVz ZXJBZ2VudChhcHBsaWNhdGlvbk5hbWVGb3JVc2VyQWdlbnQpOwogCiAgICAgX25hdmlnYXRpb25T dGF0ZSA9IHN0ZDo6bWFrZV91bmlxdWU8V2ViS2l0OjpOYXZpZ2F0aW9uU3RhdGU+KHNlbGYpOwot ICAgIF9wYWdlLT5zZXROYXZpZ2F0aW9uQ2xpZW50KF9uYXZpZ2F0aW9uU3RhdGUtPmNyZWF0ZU5h dmlnYXRpb25DbGllbnQoKSk7Ci0KICAgICBfdWlEZWxlZ2F0ZSA9IHN0ZDo6bWFrZV91bmlxdWU8 V2ViS2l0OjpVSURlbGVnYXRlPihzZWxmKTsKLSAgICBfcGFnZS0+c2V0VUlDbGllbnQoX3VpRGVs ZWdhdGUtPmNyZWF0ZVVJQ2xpZW50KCkpOwotCiAgICAgX3BhZ2UtPnNldEZpbmRDbGllbnQoc3Rk OjptYWtlX3VuaXF1ZTxXZWJLaXQ6OkZpbmRDbGllbnQ+KHNlbGYpKTsKICAgICBfcGFnZS0+c2V0 RGlhZ25vc3RpY0xvZ2dpbmdDbGllbnQoc3RkOjptYWtlX3VuaXF1ZTxXZWJLaXQ6OkRpYWdub3N0 aWNMb2dnaW5nQ2xpZW50PihzZWxmKSk7CiAKQEAgLTQxMiw2ICs0MDgsNyBAQCBzdGF0aWMgaW50 MzJfdCBkZXZpY2VPcmllbnRhdGlvbigpCiAKIC0gKHZvaWQpc2V0TmF2aWdhdGlvbkRlbGVnYXRl OihpZCA8V0tOYXZpZ2F0aW9uRGVsZWdhdGU+KW5hdmlnYXRpb25EZWxlZ2F0ZQogeworICAgIF9w YWdlLT5zZXROYXZpZ2F0aW9uQ2xpZW50KF9uYXZpZ2F0aW9uU3RhdGUtPmNyZWF0ZU5hdmlnYXRp b25DbGllbnQoKSk7CiAgICAgX25hdmlnYXRpb25TdGF0ZS0+c2V0TmF2aWdhdGlvbkRlbGVnYXRl KG5hdmlnYXRpb25EZWxlZ2F0ZSk7CiB9CiAKQEAgLTQyMiw2ICs0MTksNyBAQCBzdGF0aWMgaW50 MzJfdCBkZXZpY2VPcmllbnRhdGlvbigpCiAKIC0gKHZvaWQpc2V0VUlEZWxlZ2F0ZTooaWQ8V0tV SURlbGVnYXRlPilVSURlbGVnYXRlCiB7CisgICAgX3BhZ2UtPnNldFVJQ2xpZW50KF91aURlbGVn YXRlLT5jcmVhdGVVSUNsaWVudCgpKTsKICAgICBfdWlEZWxlZ2F0ZS0+c2V0RGVsZWdhdGUoVUlE ZWxlZ2F0ZSk7CiB9CiAKQEAgLTE2NjAsNiArMTY1OCw3IEBAIHN0YXRpYyBXZWJDb3JlOjpGbG9h dFBvaW50IGNvbnN0cmFpbkNvbnRlbnRPZmZzZXQoV2ViQ29yZTo6RmxvYXRQb2ludCBjb250ZW50 T2ZmCiAKIC0gKHZvaWQpX3NldEhpc3RvcnlEZWxlZ2F0ZTooaWQgPFdLSGlzdG9yeURlbGVnYXRl UHJpdmF0ZT4paGlzdG9yeURlbGVnYXRlCiB7CisgICAgX3BhZ2UtPnNldEhpc3RvcnlDbGllbnQo X25hdmlnYXRpb25TdGF0ZS0+Y3JlYXRlSGlzdG9yeUNsaWVudCgpKTsKICAgICBfbmF2aWdhdGlv blN0YXRlLT5zZXRIaXN0b3J5RGVsZWdhdGUoaGlzdG9yeURlbGVnYXRlKTsKIH0KIApkaWZmIC0t Z2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0NvY29hL05hdmlnYXRpb25TdGF0ZS5oIGIv U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0NvY29hL05hdmlnYXRpb25TdGF0ZS5oCmluZGV4IGY5 ZWYzNTgzNDMwMGQ0YWQyYWJmMmNhOWExNmY5YzUwMDE4ZWYzNWEuLjE5NDQ3NzViZDY2ZDU5OTJl NjMwZmFkOGNjY2RmNmVkZDRhYmFmMGMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJv Y2Vzcy9Db2NvYS9OYXZpZ2F0aW9uU3RhdGUuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nl c3MvQ29jb2EvTmF2aWdhdGlvblN0YXRlLmgKQEAgLTMwLDYgKzMwLDcgQEAKIAogI2lmIFdLX0FQ SV9FTkFCTEVECiAKKyNpbXBvcnQgIkFQSUhpc3RvcnlDbGllbnQuaCIKICNpbXBvcnQgIkFQSU5h dmlnYXRpb25DbGllbnQuaCIKICNpbXBvcnQgIlBhZ2VMb2FkU3RhdGUuaCIKICNpbXBvcnQgIlBy b2Nlc3NUaHJvdHRsZXIuaCIKQEAgLTU3LDYgKzU4LDcgQEAgcHVibGljOgogICAgIHN0YXRpYyBO YXZpZ2F0aW9uU3RhdGUmIGZyb21XZWJQYWdlKFdlYlBhZ2VQcm94eSYpOwogCiAgICAgc3RkOjp1 bmlxdWVfcHRyPEFQSTo6TmF2aWdhdGlvbkNsaWVudD4gY3JlYXRlTmF2aWdhdGlvbkNsaWVudCgp OworICAgIHN0ZDo6dW5pcXVlX3B0cjxBUEk6Okhpc3RvcnlDbGllbnQ+IGNyZWF0ZUhpc3RvcnlD bGllbnQoKTsKIAogICAgIFJldGFpblB0cjxpZCA8V0tOYXZpZ2F0aW9uRGVsZWdhdGU+ID4gbmF2 aWdhdGlvbkRlbGVnYXRlKCk7CiAgICAgdm9pZCBzZXROYXZpZ2F0aW9uRGVsZWdhdGUoaWQgPFdL TmF2aWdhdGlvbkRlbGVnYXRlPik7CkBAIC05NCwxMSArOTYsNiBAQCBwcml2YXRlOgogICAgICAg ICB2aXJ0dWFsIHZvaWQgcHJvY2Vzc0RpZENyYXNoKFdlYlBhZ2VQcm94eSYpIG92ZXJyaWRlOwog ICAgICAgICB2aXJ0dWFsIFBhc3NSZWZQdHI8QVBJOjpEYXRhPiB3ZWJDcnlwdG9NYXN0ZXJLZXko V2ViUGFnZVByb3h5Jikgb3ZlcnJpZGU7CiAKLSAgICAgICAgdmlydHVhbCB2b2lkIGRpZE5hdmln YXRlV2l0aE5hdmlnYXRpb25EYXRhKFdlYlBhZ2VQcm94eSYsIGNvbnN0IFdlYk5hdmlnYXRpb25E YXRhU3RvcmUmKSBvdmVycmlkZTsKLSAgICAgICAgdmlydHVhbCB2b2lkIGRpZFBlcmZvcm1DbGll bnRSZWRpcmVjdChXZWJQYWdlUHJveHkmLCBjb25zdCBXVEY6OlN0cmluZyYsIGNvbnN0IFdURjo6 U3RyaW5nJikgb3ZlcnJpZGU7Ci0gICAgICAgIHZpcnR1YWwgdm9pZCBkaWRQZXJmb3JtU2VydmVy UmVkaXJlY3QoV2ViUGFnZVByb3h5JiwgY29uc3QgV1RGOjpTdHJpbmcmLCBjb25zdCBXVEY6OlN0 cmluZyYpIG92ZXJyaWRlOwotICAgICAgICB2aXJ0dWFsIHZvaWQgZGlkVXBkYXRlSGlzdG9yeVRp dGxlKFdlYlBhZ2VQcm94eSYsIGNvbnN0IFdURjo6U3RyaW5nJiwgY29uc3QgV1RGOjpTdHJpbmcm KSBvdmVycmlkZTsKLQogI2lmIFVTRShRVUlDS19MT09LKQogICAgICAgICB2aXJ0dWFsIHZvaWQg ZGlkU3RhcnRMb2FkRm9yUXVpY2tMb29rRG9jdW1lbnRJbk1haW5GcmFtZShjb25zdCBXVEY6OlN0 cmluZyYgZmlsZU5hbWUsIGNvbnN0IFdURjo6U3RyaW5nJiB1dGkpIG92ZXJyaWRlOwogICAgICAg ICB2aXJ0dWFsIHZvaWQgZGlkRmluaXNoTG9hZEZvclF1aWNrTG9va0RvY3VtZW50SW5NYWluRnJh bWUoY29uc3QgUXVpY2tMb29rRG9jdW1lbnREYXRhJikgb3ZlcnJpZGU7CkBAIC0xMDksNiArMTA2 LDIwIEBAIHByaXZhdGU6CiAKICAgICAgICAgTmF2aWdhdGlvblN0YXRlJiBtX25hdmlnYXRpb25T dGF0ZTsKICAgICB9OworICAgIAorICAgIGNsYXNzIEhpc3RvcnlDbGllbnQgZmluYWwgOiBwdWJs aWMgQVBJOjpIaXN0b3J5Q2xpZW50IHsKKyAgICBwdWJsaWM6CisgICAgICAgIGV4cGxpY2l0IEhp c3RvcnlDbGllbnQoTmF2aWdhdGlvblN0YXRlJik7CisgICAgICAgIH5IaXN0b3J5Q2xpZW50KCk7 CisgICAgICAgIAorICAgIHByaXZhdGU6CisgICAgICAgIHZpcnR1YWwgdm9pZCBkaWROYXZpZ2F0 ZVdpdGhOYXZpZ2F0aW9uRGF0YShXZWJQYWdlUHJveHkmLCBjb25zdCBXZWJOYXZpZ2F0aW9uRGF0 YVN0b3JlJikgb3ZlcnJpZGU7CisgICAgICAgIHZpcnR1YWwgdm9pZCBkaWRQZXJmb3JtQ2xpZW50 UmVkaXJlY3QoV2ViUGFnZVByb3h5JiwgY29uc3QgV1RGOjpTdHJpbmcmLCBjb25zdCBXVEY6OlN0 cmluZyYpIG92ZXJyaWRlOworICAgICAgICB2aXJ0dWFsIHZvaWQgZGlkUGVyZm9ybVNlcnZlclJl ZGlyZWN0KFdlYlBhZ2VQcm94eSYsIGNvbnN0IFdURjo6U3RyaW5nJiwgY29uc3QgV1RGOjpTdHJp bmcmKSBvdmVycmlkZTsKKyAgICAgICAgdmlydHVhbCB2b2lkIGRpZFVwZGF0ZUhpc3RvcnlUaXRs ZShXZWJQYWdlUHJveHkmLCBjb25zdCBXVEY6OlN0cmluZyYsIGNvbnN0IFdURjo6U3RyaW5nJikg b3ZlcnJpZGU7CisgICAgICAgIAorICAgICAgICBOYXZpZ2F0aW9uU3RhdGUmIG1fbmF2aWdhdGlv blN0YXRlOworICAgIH07CiAKICAgICAvLyBQYWdlTG9hZFN0YXRlOjpPYnNlcnZlcgogICAgIHZp cnR1YWwgdm9pZCB3aWxsQ2hhbmdlSXNMb2FkaW5nKCkgb3ZlcnJpZGU7CmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQ29jb2EvTmF2aWdhdGlvblN0YXRlLm1tIGIvU291cmNl L1dlYktpdDIvVUlQcm9jZXNzL0NvY29hL05hdmlnYXRpb25TdGF0ZS5tbQppbmRleCBkYWRlOGQ4 MTNiOTAxYTE1N2QyMzZkM2JkNmE5YjkwYTE0ZDU4MjQxLi5mMGM4MzYzMmIwNTZlMWZjOWNiN2U4 NTgwMTY3Yjk3ZThlNDM5NTI1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mv Q29jb2EvTmF2aWdhdGlvblN0YXRlLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9D b2NvYS9OYXZpZ2F0aW9uU3RhdGUubW0KQEAgLTEwOCw2ICsxMDgsMTEgQEAgc3RkOjp1bmlxdWVf cHRyPEFQSTo6TmF2aWdhdGlvbkNsaWVudD4gTmF2aWdhdGlvblN0YXRlOjpjcmVhdGVOYXZpZ2F0 aW9uQ2xpZW50KCkKIHsKICAgICByZXR1cm4gc3RkOjptYWtlX3VuaXF1ZTxOYXZpZ2F0aW9uQ2xp ZW50PigqdGhpcyk7CiB9CisgICAgCitzdGQ6OnVuaXF1ZV9wdHI8QVBJOjpIaXN0b3J5Q2xpZW50 PiBOYXZpZ2F0aW9uU3RhdGU6OmNyZWF0ZUhpc3RvcnlDbGllbnQoKQoreworICAgIHJldHVybiBz dGQ6Om1ha2VfdW5pcXVlPEhpc3RvcnlDbGllbnQ+KCp0aGlzKTsKK30KIAogUmV0YWluUHRyPGlk IDxXS05hdmlnYXRpb25EZWxlZ2F0ZT4gPiBOYXZpZ2F0aW9uU3RhdGU6Om5hdmlnYXRpb25EZWxl Z2F0ZSgpCiB7CkBAIC02MzQsOCArNjM5LDE3IEBAIHZvaWQgTmF2aWdhdGlvblN0YXRlOjpOYXZp Z2F0aW9uQ2xpZW50OjpkaWRGaW5pc2hMb2FkRm9yUXVpY2tMb29rRG9jdW1lbnRJbk1haW5GCiAj ZW5kaWYKIAogLy8gSGlzdG9yeURlbGVnYXRlUHJpdmF0ZSBzdXBwb3J0CisgICAgCitOYXZpZ2F0 aW9uU3RhdGU6Okhpc3RvcnlDbGllbnQ6Okhpc3RvcnlDbGllbnQoTmF2aWdhdGlvblN0YXRlJiBu YXZpZ2F0aW9uU3RhdGUpCisgICAgOiBtX25hdmlnYXRpb25TdGF0ZShuYXZpZ2F0aW9uU3RhdGUp Cit7Cit9CisKK05hdmlnYXRpb25TdGF0ZTo6SGlzdG9yeUNsaWVudDo6fkhpc3RvcnlDbGllbnQo KQoreworfQogCi12b2lkIE5hdmlnYXRpb25TdGF0ZTo6TmF2aWdhdGlvbkNsaWVudDo6ZGlkTmF2 aWdhdGVXaXRoTmF2aWdhdGlvbkRhdGEoV2ViS2l0OjpXZWJQYWdlUHJveHkmLCBjb25zdCBXZWJL aXQ6OldlYk5hdmlnYXRpb25EYXRhU3RvcmUmIG5hdmlnYXRpb25EYXRhU3RvcmUpCit2b2lkIE5h dmlnYXRpb25TdGF0ZTo6SGlzdG9yeUNsaWVudDo6ZGlkTmF2aWdhdGVXaXRoTmF2aWdhdGlvbkRh dGEoV2ViS2l0OjpXZWJQYWdlUHJveHkmLCBjb25zdCBXZWJLaXQ6OldlYk5hdmlnYXRpb25EYXRh U3RvcmUmIG5hdmlnYXRpb25EYXRhU3RvcmUpCiB7CiAgICAgaWYgKCFtX25hdmlnYXRpb25TdGF0 ZS5tX2hpc3RvcnlEZWxlZ2F0ZU1ldGhvZHMud2ViVmlld0RpZE5hdmlnYXRlV2l0aE5hdmlnYXRp b25EYXRhKQogICAgICAgICByZXR1cm47CkBAIC02NDcsNyArNjYxLDcgQEAgdm9pZCBOYXZpZ2F0 aW9uU3RhdGU6Ok5hdmlnYXRpb25DbGllbnQ6OmRpZE5hdmlnYXRlV2l0aE5hdmlnYXRpb25EYXRh KFdlYktpdDo6V2UKICAgICBbaGlzdG9yeURlbGVnYXRlIF93ZWJWaWV3Om1fbmF2aWdhdGlvblN0 YXRlLm1fd2ViVmlldyBkaWROYXZpZ2F0ZVdpdGhOYXZpZ2F0aW9uRGF0YTp3cmFwcGVyKCpBUEk6 Ok5hdmlnYXRpb25EYXRhOjpjcmVhdGUobmF2aWdhdGlvbkRhdGFTdG9yZSkpXTsKIH0KIAotdm9p ZCBOYXZpZ2F0aW9uU3RhdGU6Ok5hdmlnYXRpb25DbGllbnQ6OmRpZFBlcmZvcm1DbGllbnRSZWRp cmVjdChXZWJLaXQ6OldlYlBhZ2VQcm94eSYsIGNvbnN0IFdURjo6U3RyaW5nJiBzb3VyY2VVUkws IGNvbnN0IFdURjo6U3RyaW5nJiBkZXN0aW5hdGlvblVSTCkKK3ZvaWQgTmF2aWdhdGlvblN0YXRl OjpIaXN0b3J5Q2xpZW50OjpkaWRQZXJmb3JtQ2xpZW50UmVkaXJlY3QoV2ViS2l0OjpXZWJQYWdl UHJveHkmLCBjb25zdCBXVEY6OlN0cmluZyYgc291cmNlVVJMLCBjb25zdCBXVEY6OlN0cmluZyYg ZGVzdGluYXRpb25VUkwpCiB7CiAgICAgaWYgKCFtX25hdmlnYXRpb25TdGF0ZS5tX2hpc3RvcnlE ZWxlZ2F0ZU1ldGhvZHMud2ViVmlld0RpZFBlcmZvcm1DbGllbnRSZWRpcmVjdEZyb21VUkxUb1VS TCkKICAgICAgICAgcmV0dXJuOwpAQCAtNjU5LDcgKzY3Myw3IEBAIHZvaWQgTmF2aWdhdGlvblN0 YXRlOjpOYXZpZ2F0aW9uQ2xpZW50OjpkaWRQZXJmb3JtQ2xpZW50UmVkaXJlY3QoV2ViS2l0OjpX ZWJQYWdlCiAgICAgW2hpc3RvcnlEZWxlZ2F0ZSBfd2ViVmlldzptX25hdmlnYXRpb25TdGF0ZS5t X3dlYlZpZXcgZGlkUGVyZm9ybUNsaWVudFJlZGlyZWN0RnJvbVVSTDpbTlNVUkwgX3dlYl9VUkxX aXRoV1RGU3RyaW5nOnNvdXJjZVVSTF0gdG9VUkw6W05TVVJMIF93ZWJfVVJMV2l0aFdURlN0cmlu ZzpkZXN0aW5hdGlvblVSTF1dOwogfQogCi12b2lkIE5hdmlnYXRpb25TdGF0ZTo6TmF2aWdhdGlv bkNsaWVudDo6ZGlkUGVyZm9ybVNlcnZlclJlZGlyZWN0KFdlYktpdDo6V2ViUGFnZVByb3h5Jiwg Y29uc3QgV1RGOjpTdHJpbmcmIHNvdXJjZVVSTCwgY29uc3QgV1RGOjpTdHJpbmcmIGRlc3RpbmF0 aW9uVVJMKQordm9pZCBOYXZpZ2F0aW9uU3RhdGU6Okhpc3RvcnlDbGllbnQ6OmRpZFBlcmZvcm1T ZXJ2ZXJSZWRpcmVjdChXZWJLaXQ6OldlYlBhZ2VQcm94eSYsIGNvbnN0IFdURjo6U3RyaW5nJiBz b3VyY2VVUkwsIGNvbnN0IFdURjo6U3RyaW5nJiBkZXN0aW5hdGlvblVSTCkKIHsKICAgICBpZiAo IW1fbmF2aWdhdGlvblN0YXRlLm1faGlzdG9yeURlbGVnYXRlTWV0aG9kcy53ZWJWaWV3RGlkUGVy Zm9ybVNlcnZlclJlZGlyZWN0RnJvbVVSTFRvVVJMKQogICAgICAgICByZXR1cm47CkBAIC02NzEs NyArNjg1LDcgQEAgdm9pZCBOYXZpZ2F0aW9uU3RhdGU6Ok5hdmlnYXRpb25DbGllbnQ6OmRpZFBl cmZvcm1TZXJ2ZXJSZWRpcmVjdChXZWJLaXQ6OldlYlBhZ2UKICAgICBbaGlzdG9yeURlbGVnYXRl IF93ZWJWaWV3Om1fbmF2aWdhdGlvblN0YXRlLm1fd2ViVmlldyBkaWRQZXJmb3JtU2VydmVyUmVk aXJlY3RGcm9tVVJMOltOU1VSTCBfd2ViX1VSTFdpdGhXVEZTdHJpbmc6c291cmNlVVJMXSB0b1VS TDpbTlNVUkwgX3dlYl9VUkxXaXRoV1RGU3RyaW5nOmRlc3RpbmF0aW9uVVJMXV07CiB9CiAKLXZv aWQgTmF2aWdhdGlvblN0YXRlOjpOYXZpZ2F0aW9uQ2xpZW50OjpkaWRVcGRhdGVIaXN0b3J5VGl0 bGUoV2ViS2l0OjpXZWJQYWdlUHJveHkmLCBjb25zdCBXVEY6OlN0cmluZyYgdGl0bGUsIGNvbnN0 IFdURjo6U3RyaW5nJiB1cmwpCit2b2lkIE5hdmlnYXRpb25TdGF0ZTo6SGlzdG9yeUNsaWVudDo6 ZGlkVXBkYXRlSGlzdG9yeVRpdGxlKFdlYktpdDo6V2ViUGFnZVByb3h5JiwgY29uc3QgV1RGOjpT dHJpbmcmIHRpdGxlLCBjb25zdCBXVEY6OlN0cmluZyYgdXJsKQogewogICAgIGlmICghbV9uYXZp Z2F0aW9uU3RhdGUubV9oaXN0b3J5RGVsZWdhdGVNZXRob2RzLndlYlZpZXdEaWRVcGRhdGVIaXN0 b3J5VGl0bGVGb3JVUkwpCiAgICAgICAgIHJldHVybjsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJL aXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNz L1dlYlBhZ2VQcm94eS5jcHAKaW5kZXggMTliZjA1ZmQxMzdmOWIyMDE0N2QzYjc5MzVlZmRhZGQz MWE5NDM4My4uYTg0YTNmYTIyMmVhYjg4MDBkMDMzYThkNzI0MTE4MTQ4NjkxZjM2YyAxMDA2NDQK LS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAKKysrIGIvU291 cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAKQEAgLTMzLDYgKzMzLDcgQEAK ICNpbmNsdWRlICJBUElGb3JtQ2xpZW50LmgiCiAjaW5jbHVkZSAiQVBJRnJhbWVJbmZvLmgiCiAj aW5jbHVkZSAiQVBJR2VvbWV0cnkuaCIKKyNpbmNsdWRlICJBUElIaXN0b3J5Q2xpZW50LmgiCiAj aW5jbHVkZSAiQVBJTGVnYWN5Q29udGV4dEhpc3RvcnlDbGllbnQuaCIKICNpbmNsdWRlICJBUElM b2FkZXJDbGllbnQuaCIKICNpbmNsdWRlICJBUElOYXZpZ2F0aW9uLmgiCkBAIC01MDgsNiArNTA5 LDExIEBAIHZvaWQgV2ViUGFnZVByb3h5OjpzZXRQcmVmZXJlbmNlcyhXZWJQcmVmZXJlbmNlcyYg cHJlZmVyZW5jZXMpCiAKICAgICBwcmVmZXJlbmNlc0RpZENoYW5nZSgpOwogfQorICAgIAordm9p ZCBXZWJQYWdlUHJveHk6OnNldEhpc3RvcnlDbGllbnQoc3RkOjp1bmlxdWVfcHRyPEFQSTo6SGlz dG9yeUNsaWVudD4gaGlzdG9yeUNsaWVudCkKK3sKKyAgICBtX2hpc3RvcnlDbGllbnQgPSBXVEY6 Om1vdmUoaGlzdG9yeUNsaWVudCk7Cit9CiAKIHZvaWQgV2ViUGFnZVByb3h5OjpzZXROYXZpZ2F0 aW9uQ2xpZW50KHN0ZDo6dW5pcXVlX3B0cjxBUEk6Ok5hdmlnYXRpb25DbGllbnQ+IG5hdmlnYXRp b25DbGllbnQpCiB7CkBAIC0zMTU1LDkgKzMxNjEsOSBAQCB2b2lkIFdlYlBhZ2VQcm94eTo6ZGlk TmF2aWdhdGVXaXRoTmF2aWdhdGlvbkRhdGEoY29uc3QgV2ViTmF2aWdhdGlvbkRhdGFTdG9yZSYg cwogICAgIE1FU1NBR0VfQ0hFQ0soZnJhbWUpOwogICAgIE1FU1NBR0VfQ0hFQ0soZnJhbWUtPnBh Z2UoKSA9PSB0aGlzKTsKIAotICAgIGlmIChtX25hdmlnYXRpb25DbGllbnQpIHsKKyAgICBpZiAo bV9oaXN0b3J5Q2xpZW50KSB7CiAgICAgICAgIGlmIChmcmFtZS0+aXNNYWluRnJhbWUoKSkKLSAg ICAgICAgICAgIG1fbmF2aWdhdGlvbkNsaWVudC0+ZGlkTmF2aWdhdGVXaXRoTmF2aWdhdGlvbkRh dGEoKnRoaXMsIHN0b3JlKTsKKyAgICAgICAgICAgIG1faGlzdG9yeUNsaWVudC0+ZGlkTmF2aWdh dGVXaXRoTmF2aWdhdGlvbkRhdGEoKnRoaXMsIHN0b3JlKTsKICAgICB9IGVsc2UKICAgICAgICAg bV9sb2FkZXJDbGllbnQtPmRpZE5hdmlnYXRlV2l0aE5hdmlnYXRpb25EYXRhKCp0aGlzLCBzdG9y ZSwgKmZyYW1lKTsKICAgICBwcm9jZXNzKCkucHJvY2Vzc1Bvb2woKS5oaXN0b3J5Q2xpZW50KCku ZGlkTmF2aWdhdGVXaXRoTmF2aWdhdGlvbkRhdGEocHJvY2VzcygpLnByb2Nlc3NQb29sKCksICp0 aGlzLCBzdG9yZSwgKmZyYW1lKTsKQEAgLTMxNzUsOSArMzE4MSw5IEBAIHZvaWQgV2ViUGFnZVBy b3h5OjpkaWRQZXJmb3JtQ2xpZW50UmVkaXJlY3QoY29uc3QgU3RyaW5nJiBzb3VyY2VVUkxTdHJp bmcsIGNvbnN0CiAgICAgTUVTU0FHRV9DSEVDS19VUkwoc291cmNlVVJMU3RyaW5nKTsKICAgICBN RVNTQUdFX0NIRUNLX1VSTChkZXN0aW5hdGlvblVSTFN0cmluZyk7CiAKLSAgICBpZiAobV9uYXZp Z2F0aW9uQ2xpZW50KSB7CisgICAgaWYgKG1faGlzdG9yeUNsaWVudCkgewogICAgICAgICBpZiAo ZnJhbWUtPmlzTWFpbkZyYW1lKCkpCi0gICAgICAgICAgICBtX25hdmlnYXRpb25DbGllbnQtPmRp ZFBlcmZvcm1DbGllbnRSZWRpcmVjdCgqdGhpcywgc291cmNlVVJMU3RyaW5nLCBkZXN0aW5hdGlv blVSTFN0cmluZyk7CisgICAgICAgICAgICBtX2hpc3RvcnlDbGllbnQtPmRpZFBlcmZvcm1DbGll bnRSZWRpcmVjdCgqdGhpcywgc291cmNlVVJMU3RyaW5nLCBkZXN0aW5hdGlvblVSTFN0cmluZyk7 CiAgICAgfSBlbHNlCiAgICAgICAgIG1fbG9hZGVyQ2xpZW50LT5kaWRQZXJmb3JtQ2xpZW50UmVk aXJlY3QoKnRoaXMsIHNvdXJjZVVSTFN0cmluZywgZGVzdGluYXRpb25VUkxTdHJpbmcsICpmcmFt ZSk7CiAgICAgcHJvY2VzcygpLnByb2Nlc3NQb29sKCkuaGlzdG9yeUNsaWVudCgpLmRpZFBlcmZv cm1DbGllbnRSZWRpcmVjdChwcm9jZXNzKCkucHJvY2Vzc1Bvb2woKSwgKnRoaXMsIHNvdXJjZVVS TFN0cmluZywgZGVzdGluYXRpb25VUkxTdHJpbmcsICpmcmFtZSk7CkBAIC0zMTk1LDkgKzMyMDEs OSBAQCB2b2lkIFdlYlBhZ2VQcm94eTo6ZGlkUGVyZm9ybVNlcnZlclJlZGlyZWN0KGNvbnN0IFN0 cmluZyYgc291cmNlVVJMU3RyaW5nLCBjb25zdAogICAgIE1FU1NBR0VfQ0hFQ0tfVVJMKHNvdXJj ZVVSTFN0cmluZyk7CiAgICAgTUVTU0FHRV9DSEVDS19VUkwoZGVzdGluYXRpb25VUkxTdHJpbmcp OwogCi0gICAgaWYgKG1fbmF2aWdhdGlvbkNsaWVudCkgeworICAgIGlmIChtX2hpc3RvcnlDbGll bnQpIHsKICAgICAgICAgaWYgKGZyYW1lLT5pc01haW5GcmFtZSgpKQotICAgICAgICAgICAgbV9u YXZpZ2F0aW9uQ2xpZW50LT5kaWRQZXJmb3JtU2VydmVyUmVkaXJlY3QoKnRoaXMsIHNvdXJjZVVS TFN0cmluZywgZGVzdGluYXRpb25VUkxTdHJpbmcpOworICAgICAgICAgICAgbV9oaXN0b3J5Q2xp ZW50LT5kaWRQZXJmb3JtU2VydmVyUmVkaXJlY3QoKnRoaXMsIHNvdXJjZVVSTFN0cmluZywgZGVz dGluYXRpb25VUkxTdHJpbmcpOwogICAgIH0gZWxzZQogICAgICAgICBtX2xvYWRlckNsaWVudC0+ ZGlkUGVyZm9ybVNlcnZlclJlZGlyZWN0KCp0aGlzLCBzb3VyY2VVUkxTdHJpbmcsIGRlc3RpbmF0 aW9uVVJMU3RyaW5nLCAqZnJhbWUpOwogICAgIHByb2Nlc3MoKS5wcm9jZXNzUG9vbCgpLmhpc3Rv cnlDbGllbnQoKS5kaWRQZXJmb3JtU2VydmVyUmVkaXJlY3QocHJvY2VzcygpLnByb2Nlc3NQb29s KCksICp0aGlzLCBzb3VyY2VVUkxTdHJpbmcsIGRlc3RpbmF0aW9uVVJMU3RyaW5nLCAqZnJhbWUp OwpAQCAtMzIxMSw5ICszMjE3LDkgQEAgdm9pZCBXZWJQYWdlUHJveHk6OmRpZFVwZGF0ZUhpc3Rv cnlUaXRsZShjb25zdCBTdHJpbmcmIHRpdGxlLCBjb25zdCBTdHJpbmcmIHVybCwKIAogICAgIE1F U1NBR0VfQ0hFQ0tfVVJMKHVybCk7CiAKLSAgICBpZiAobV9uYXZpZ2F0aW9uQ2xpZW50KSB7Cisg ICAgaWYgKG1faGlzdG9yeUNsaWVudCkgewogICAgICAgICBpZiAoZnJhbWUtPmlzTWFpbkZyYW1l KCkpCi0gICAgICAgICAgICBtX25hdmlnYXRpb25DbGllbnQtPmRpZFVwZGF0ZUhpc3RvcnlUaXRs ZSgqdGhpcywgdGl0bGUsIHVybCk7CisgICAgICAgICAgICBtX2hpc3RvcnlDbGllbnQtPmRpZFVw ZGF0ZUhpc3RvcnlUaXRsZSgqdGhpcywgdGl0bGUsIHVybCk7CiAgICAgfSBlbHNlCiAgICAgICAg IG1fbG9hZGVyQ2xpZW50LT5kaWRVcGRhdGVIaXN0b3J5VGl0bGUoKnRoaXMsIHRpdGxlLCB1cmws ICpmcmFtZSk7CiAgICAgcHJvY2VzcygpLnByb2Nlc3NQb29sKCkuaGlzdG9yeUNsaWVudCgpLmRp ZFVwZGF0ZUhpc3RvcnlUaXRsZShwcm9jZXNzKCkucHJvY2Vzc1Bvb2woKSwgKnRoaXMsIHRpdGxl LCB1cmwsICpmcmFtZSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2Vi UGFnZVByb3h5LmggYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmgKaW5k ZXggZjM0ZWVlN2Y3N2U4MDJkZTkzMmI5MzgwZDRkMWYxMDFiODQ5YTVhZi4uMjRkOWUyZjc4Mjdk NjdmNjI5Nzc5MjAyNWJiMjhjMGNmMjgwYTFiNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIv VUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9X ZWJQYWdlUHJveHkuaApAQCAtMTE1LDYgKzExNSw3IEBAIG5hbWVzcGFjZSBBUEkgewogY2xhc3Mg Q29udGV4dE1lbnVDbGllbnQ7CiBjbGFzcyBGaW5kQ2xpZW50OwogY2xhc3MgRm9ybUNsaWVudDsK K2NsYXNzIEhpc3RvcnlDbGllbnQ7CiBjbGFzcyBMb2FkZXJDbGllbnQ7CiBjbGFzcyBOYXZpZ2F0 aW9uOwogY2xhc3MgTmF2aWdhdGlvbkNsaWVudDsKQEAgLTMxNiw2ICszMTcsNyBAQCBwdWJsaWM6 CiAgICAgdm9pZCBpbml0aWFsaXplRmluZE1hdGNoZXNDbGllbnQoY29uc3QgV0tQYWdlRmluZE1h dGNoZXNDbGllbnRCYXNlKik7CiAgICAgdm9pZCBzZXRGb3JtQ2xpZW50KHN0ZDo6dW5pcXVlX3B0 cjxBUEk6OkZvcm1DbGllbnQ+KTsKICAgICB2b2lkIHNldE5hdmlnYXRpb25DbGllbnQoc3RkOjp1 bmlxdWVfcHRyPEFQSTo6TmF2aWdhdGlvbkNsaWVudD4pOworICAgIHZvaWQgc2V0SGlzdG9yeUNs aWVudChzdGQ6OnVuaXF1ZV9wdHI8QVBJOjpIaXN0b3J5Q2xpZW50Pik7CiAgICAgdm9pZCBzZXRM b2FkZXJDbGllbnQoc3RkOjp1bmlxdWVfcHRyPEFQSTo6TG9hZGVyQ2xpZW50Pik7CiAgICAgdm9p ZCBzZXRQb2xpY3lDbGllbnQoc3RkOjp1bmlxdWVfcHRyPEFQSTo6UG9saWN5Q2xpZW50Pik7CiAK QEAgLTEzNzQsNiArMTM3Niw3IEBAIHByaXZhdGU6CiAgICAgc3RkOjp1bmlxdWVfcHRyPEFQSTo6 TG9hZGVyQ2xpZW50PiBtX2xvYWRlckNsaWVudDsKICAgICBzdGQ6OnVuaXF1ZV9wdHI8QVBJOjpQ b2xpY3lDbGllbnQ+IG1fcG9saWN5Q2xpZW50OwogICAgIHN0ZDo6dW5pcXVlX3B0cjxBUEk6Ok5h dmlnYXRpb25DbGllbnQ+IG1fbmF2aWdhdGlvbkNsaWVudDsKKyAgICBzdGQ6OnVuaXF1ZV9wdHI8 QVBJOjpIaXN0b3J5Q2xpZW50PiBtX2hpc3RvcnlDbGllbnQ7CiAgICAgc3RkOjp1bmlxdWVfcHRy PEFQSTo6Rm9ybUNsaWVudD4gbV9mb3JtQ2xpZW50OwogICAgIHN0ZDo6dW5pcXVlX3B0cjxBUEk6 OlVJQ2xpZW50PiBtX3VpQ2xpZW50OwogI2lmIFBMQVRGT1JNKEVGTCkKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJLaXQyL1dlYktpdDIueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvaiBiL1NvdXJjZS9X ZWJLaXQyL1dlYktpdDIueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvagppbmRleCA4ZDU1ODA3YWM4 ZDRlNGNkNjFiMDk0MGE5NDhmODNhYjFjMTFkMDg5Li42ZGQ4YTI5ZmM5ZjBlMzNjNzczZjg2NDE3 MzEzYTVhZmZhOTUxYWRiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9XZWJLaXQyLnhjb2Rl cHJvai9wcm9qZWN0LnBieHByb2oKKysrIGIvU291cmNlL1dlYktpdDIvV2ViS2l0Mi54Y29kZXBy b2ovcHJvamVjdC5wYnhwcm9qCkBAIC02NDksNiArNjQ5LDcgQEAKIAkJMkRBOTQ0QkQxODg1MTFF NzAwRUQ4NkRCIC8qIE5ldHdvcmtQcm9jZXNzSU9TLm1tIGluIFNvdXJjZXMgKi8gPSB7aXNhID0g UEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gMkRBOTQ0QkMxODg1MTFFNzAwRUQ4NkRCIC8qIE5ldHdv cmtQcm9jZXNzSU9TLm1tICovOyB9OwogCQkyREFCQTc3MjFBODE3QjE3MDBFRjBGMUEgLyogV0tQ YWdlUmVuZGVyaW5nUHJvZ3Jlc3NFdmVudHNJbnRlcm5hbC5oIGluIEhlYWRlcnMgKi8gPSB7aXNh ID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gMkRBQkE3NzExQTgxN0IxNzAwRUYwRjFBIC8qIFdL UGFnZVJlbmRlcmluZ1Byb2dyZXNzRXZlbnRzSW50ZXJuYWwuaCAqLzsgfTsKIAkJMkRBQkE3NzQx QTgxN0VFNjAwRUYwRjFBIC8qIFdLUGx1Z2luTG9hZFBvbGljeS5oIGluIEhlYWRlcnMgKi8gPSB7 aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gMkRBQkE3NzMxQTgxN0VFNjAwRUYwRjFBIC8q IFdLUGx1Z2luTG9hZFBvbGljeS5oICovOyBzZXR0aW5ncyA9IHtBVFRSSUJVVEVTID0gKFByaXZh dGUsICk7IH07IH07CisJCTJEQUJBNzc2MUE4MkI0MjEwMEVGMEYxQSAvKiBBUElIaXN0b3J5Q2xp ZW50LmggaW4gSGVhZGVycyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSAyREFC QTc3NTFBODJCNDIxMDBFRjBGMUEgLyogQVBJSGlzdG9yeUNsaWVudC5oICovOyB9OwogCQkyREFD RTY0RTE4QURCRkYwMDBFNENBNzYgLyogX1dLVGh1bWJuYWlsVmlld0ludGVybmFsLmggaW4gSGVh ZGVycyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSAyREFDRTY0RDE4QURCRkYw MDBFNENBNzYgLyogX1dLVGh1bWJuYWlsVmlld0ludGVybmFsLmggKi87IH07CiAJCTJEQUYwNkQ2 MThCRDFBNDcwMDgxQ0VCMSAvKiBTbWFydE1hZ25pZmljYXRpb25Db250cm9sbGVyLmggaW4gSGVh ZGVycyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSAyREFGMDZENDE4QkQxQTQ3 MDA4MUNFQjEgLyogU21hcnRNYWduaWZpY2F0aW9uQ29udHJvbGxlci5oICovOyB9OwogCQkyREFG MDZENzE4QkQxQTQ3MDA4MUNFQjEgLyogU21hcnRNYWduaWZpY2F0aW9uQ29udHJvbGxlci5tbSBp biBTb3VyY2VzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IDJEQUYwNkQ1MThC RDFBNDcwMDgxQ0VCMSAvKiBTbWFydE1hZ25pZmljYXRpb25Db250cm9sbGVyLm1tICovOyB9OwpA QCAtMjc3MSw2ICsyNzcyLDcgQEAKIAkJMkRBOTQ0QkMxODg1MTFFNzAwRUQ4NkRCIC8qIE5ldHdv cmtQcm9jZXNzSU9TLm1tICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGlu ZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jcHAub2JqY3BwOyBuYW1lID0g TmV0d29ya1Byb2Nlc3NJT1MubW07IHBhdGggPSBOZXR3b3JrUHJvY2Vzcy9pb3MvTmV0d29ya1By b2Nlc3NJT1MubW07IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CiAJCTJEQUJBNzcxMUE4MTdC MTcwMEVGMEYxQSAvKiBXS1BhZ2VSZW5kZXJpbmdQcm9ncmVzc0V2ZW50c0ludGVybmFsLmggKi8g PSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmls ZVR5cGUgPSBzb3VyY2Vjb2RlLmMuaDsgcGF0aCA9IFdLUGFnZVJlbmRlcmluZ1Byb2dyZXNzRXZl bnRzSW50ZXJuYWwuaDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKIAkJMkRBQkE3NzMxQTgx N0VFNjAwRUYwRjFBIC8qIFdLUGx1Z2luTG9hZFBvbGljeS5oICovID0ge2lzYSA9IFBCWEZpbGVS ZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29k ZS5jLmg7IHBhdGggPSBXS1BsdWdpbkxvYWRQb2xpY3kuaDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+ IjsgfTsKKwkJMkRBQkE3NzUxQTgyQjQyMTAwRUYwRjFBIC8qIEFQSUhpc3RvcnlDbGllbnQuaCAq LyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25G aWxlVHlwZSA9IHNvdXJjZWNvZGUuYy5oOyBwYXRoID0gQVBJSGlzdG9yeUNsaWVudC5oOyBzb3Vy Y2VUcmVlID0gIjxncm91cD4iOyB9OwogCQkyREFDRTY0RDE4QURCRkYwMDBFNENBNzYgLyogX1dL VGh1bWJuYWlsVmlld0ludGVybmFsLmggKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmls ZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmMuaDsgcGF0aCA9 IF9XS1RodW1ibmFpbFZpZXdJbnRlcm5hbC5oOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9Owog CQkyREFGMDZENDE4QkQxQTQ3MDA4MUNFQjEgLyogU21hcnRNYWduaWZpY2F0aW9uQ29udHJvbGxl ci5oICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RL bm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jLmg7IG5hbWUgPSBTbWFydE1hZ25pZmljYXRpb25D b250cm9sbGVyLmg7IHBhdGggPSBpb3MvU21hcnRNYWduaWZpY2F0aW9uQ29udHJvbGxlci5oOyBz b3VyY2VUcmVlID0gIjxncm91cD4iOyB9OwogCQkyREFGMDZENTE4QkQxQTQ3MDA4MUNFQjEgLyog U21hcnRNYWduaWZpY2F0aW9uQ29udHJvbGxlci5tbSAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJl bmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuY3Bw Lm9iamNwcDsgbmFtZSA9IFNtYXJ0TWFnbmlmaWNhdGlvbkNvbnRyb2xsZXIubW07IHBhdGggPSBp b3MvU21hcnRNYWduaWZpY2F0aW9uQ29udHJvbGxlci5tbTsgc291cmNlVHJlZSA9ICI8Z3JvdXA+ IjsgfTsKQEAgLTYxODQsNiArNjE4Niw3IEBACiAJCQkJMzdFMjVENkQxOEZERTVENjAwNUQzQTAw IC8qIEFQSUZvcm1DbGllbnQuaCAqLywKIAkJCQkyREY5RUVFMzFBNzgxRkI0MDBCNkNGQkUgLyog QVBJRnJhbWVJbmZvLmNwcCAqLywKIAkJCQkyREY5RUVFNDFBNzgxRkI0MDBCNkNGQkUgLyogQVBJ RnJhbWVJbmZvLmggKi8sCisJCQkJMkRBQkE3NzUxQTgyQjQyMTAwRUYwRjFBIC8qIEFQSUhpc3Rv cnlDbGllbnQuaCAqLywKIAkJCQk3Q0U0RDIwNjFBNDY3NzU3MDBDN0YxNTIgLyogQVBJTGVnYWN5 Q29udGV4dEhpc3RvcnlDbGllbnQuaCAqLywKIAkJCQkxQTI0NjRGMjE4OTFFNDUxMDAyMzRDNUIg LyogQVBJTG9hZGVyQ2xpZW50LmggKi8sCiAJCQkJN0NEM0E0ODAxQTVEMDJGQTAwOTYyM0I4IC8q IEFQSU5hdmlnYXRpb24uY3BwICovLApAQCAtNzc4Niw2ICs3Nzg5LDcgQEAKIAkJCQkxQUUwMEQ2 QzE4MzI3QzEyMDAwODdERDcgLyogU3RyaW5nUmVmZXJlbmNlLmggaW4gSGVhZGVycyAqLywKIAkJ CQkyOTZCRDg1RDE1MDE5QkMzMDA3MUY0MjQgLyogU3RyaW5nVXRpbGl0aWVzLmggaW4gSGVhZGVy cyAqLywKIAkJCQlDRTFBMEJENjFBNDhFNkM2MDA1NEVGNzQgLyogVENDU1BJLmggaW4gSGVhZGVy cyAqLywKKwkJCQkyREFCQTc3NjFBODJCNDIxMDBFRjBGMUEgLyogQVBJSGlzdG9yeUNsaWVudC5o IGluIEhlYWRlcnMgKi8sCiAJCQkJMUFBNDE3Q0IxMkMwMENDQTAwMkJFNjdCIC8qIFRleHRDaGVj a2VyLmggaW4gSGVhZGVycyAqLywKIAkJCQkxUVE0MTdDQjEyQzAwQ0NBMDAyQkU2N0IgLyogVGV4 dENoZWNrZXJDb21wbGV0aW9uLmggaW4gSGVhZGVycyAqLywKIAkJCQkxQTVFNERBNDEyRDNCRDNE MDA5OUEyQkIgLyogVGV4dENoZWNrZXJTdGF0ZS5oIGluIEhlYWRlcnMgKi8sCg==