116335 2013-05-17 11:18:52 -0700 Expose new load-with-userData API to Objective-C 2013-05-21 01:04:00 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 116467 116522 1 sam sam abecsi jturcotte kadam michael.bruning ossy zarvai oldest_to_newest 890530 0 sam 2013-05-17 11:18:52 -0700 Expose new load-with-userData API to Objective-C 890533 1 202122 sam 2013-05-17 11:22:48 -0700 Created attachment 202122 Patch 890540 2 sam 2013-05-17 11:27:26 -0700 Committed r150277: <http://trac.webkit.org/changeset/150277> 890849 3 ossy 2013-05-18 01:28:44 -0700 (In reply to comment #2) > Committed r150277: <http://trac.webkit.org/changeset/150277> It broke the Qt Mountain Lion build: /Users/admin/work/WebKit-BuildSlave/qt-mountainlion-release/build/Source/WebKit2/Shared/API/c/WKBase.h:45:10: fatal error: 'WebKit2/WKBaseMac.h' file not found #include <WebKit2/WKBaseMac.h> __APPLE__ is defined on Qt, but WebKit2/WKBaseMac.h shouldn't be included. cc-ed Qt guys to check and fix it 202122 2013-05-17 11:22:48 -0700 2013-05-17 11:25:34 -0700 Patch bug-116335-20130517112143.patch text/plain 23112 sam SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDE1MDI3NikKKysrIFNvdXJjZS9XZWJLaXQyL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDM3IEBACisyMDEzLTA1LTE3ICBTYW0gV2Vp bmlnICA8c2FtQHdlYmtpdC5vcmc+CisKKyAgICAgICAgRXhwb3NlIG5ldyBsb2FkLXdpdGgtdXNl ckRhdGEgQVBJIHRvIE9iamVjdGl2ZS1DCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD0xMTYzMzUKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICAtIEFkZHMgbG9hZFJlcXVlc3Q6dXNlckRhdGE6LCBsb2FkRmlsZVVS TDpyZXN0cmljdFRvRmlsZXNXaXRoaW46dXNlckRhdGE6LCBsb2FkSFRNTFN0cmluZzpiYXNlVVJM OnVzZXJEYXRhOgorICAgICAgICAgIGxvYWREYXRhOk1JTUVUeXBlOnRleHRFbmNvZGluZ05hbWU6 YmFzZVVSTDosIGFuZCBsb2FkRGF0YTpNSU1FVHlwZTp0ZXh0RW5jb2RpbmdOYW1lOmJhc2VVUkw6 dXNlckRhdGEuCisgICAgICAgIC0gQWRkcyBhIFdLT2JqQ1R5cGVXcmFwcGVyUmVmICh3aGljaCBp cyBhIE9iakNPYmplY3RHcmFwaCB1bmRlciB0aGUgY292ZXJzKSB0byBhbGxvdyB0aGUgdXNlckRh dGEgdG8gYmUgdW53cmFwcGVkCisgICAgICAgICAgaW4gdGhlIGluamVjdGVkIGJ1bmRsZXMgd2ls bExvYWRVUkxSZXF1ZXN0IGFuZCB3aWxsTG9hZERhdGFSZXF1ZXN0IEMtU1BJIGNhbGxiYWNrcy4K KworICAgICAgICAqIFNoYXJlZC9BUEkvYy9XS0Jhc2UuaDoKKyAgICAgICAgKiBTaGFyZWQvQVBJ L2MvV0tTaGFyZWRBUElDYXN0Lmg6CisgICAgICAgICogU2hhcmVkL0FQSS9jL21hYy9XS0Jhc2VN YWMuaDogQWRkZWQuCisgICAgICAgICogU2hhcmVkL0FQSS9jL21hYy9XS09iakNUeXBlV3JhcHBl clJlZi5oOiBBZGRlZC4KKyAgICAgICAgKiBTaGFyZWQvQVBJL2MvbWFjL1dLT2JqQ1R5cGVXcmFw cGVyUmVmLm1tOiBBZGRlZC4KKyAgICAgICAgKFdLT2JqQ1R5cGVXcmFwcGVyR2V0VHlwZUlEKToK KyAgICAgICAgKFdLT2JqQ1R5cGVXcmFwcGVyQ3JlYXRlKToKKyAgICAgICAgKFdLT2JqQ1R5cGVX cmFwcGVyR2V0T2JqZWN0KToKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL21hYy9XS0Jyb3dzaW5n Q29udGV4dENvbnRyb2xsZXIuaDoKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL21hYy9XS0Jyb3dz aW5nQ29udGV4dENvbnRyb2xsZXIubW06CisgICAgICAgICgrW1dLQnJvd3NpbmdDb250ZXh0Q29u dHJvbGxlciByZWdpc3RlclNjaGVtZUZvckN1c3RvbVByb3RvY29sOl0pOgorICAgICAgICAoK1tX S0Jyb3dzaW5nQ29udGV4dENvbnRyb2xsZXIgdW5yZWdpc3RlclNjaGVtZUZvckN1c3RvbVByb3Rv Y29sOl0pOgorICAgICAgICAoLVtXS0Jyb3dzaW5nQ29udGV4dENvbnRyb2xsZXIgbG9hZFJlcXVl c3Q6XSk6CisgICAgICAgICgtW1dLQnJvd3NpbmdDb250ZXh0Q29udHJvbGxlciBsb2FkUmVxdWVz dDp1c2VyRGF0YTpdKToKKyAgICAgICAgKC1bV0tCcm93c2luZ0NvbnRleHRDb250cm9sbGVyIGxv YWRGaWxlVVJMOnJlc3RyaWN0VG9GaWxlc1dpdGhpbjpdKToKKyAgICAgICAgKC1bV0tCcm93c2lu Z0NvbnRleHRDb250cm9sbGVyIGxvYWRGaWxlVVJMOnJlc3RyaWN0VG9GaWxlc1dpdGhpbjp1c2Vy RGF0YTpdKToKKyAgICAgICAgKC1bV0tCcm93c2luZ0NvbnRleHRDb250cm9sbGVyIGxvYWRIVE1M U3RyaW5nOmJhc2VVUkw6XSk6CisgICAgICAgICgtW1dLQnJvd3NpbmdDb250ZXh0Q29udHJvbGxl ciBsb2FkSFRNTFN0cmluZzpiYXNlVVJMOnVzZXJEYXRhOl0pOgorICAgICAgICAoLVtXS0Jyb3dz aW5nQ29udGV4dENvbnRyb2xsZXIgbG9hZERhdGE6TUlNRVR5cGU6dGV4dEVuY29kaW5nTmFtZTpi YXNlVVJMOl0pOgorICAgICAgICAoLVtXS0Jyb3dzaW5nQ29udGV4dENvbnRyb2xsZXIgbG9hZERh dGE6TUlNRVR5cGU6dGV4dEVuY29kaW5nTmFtZTpiYXNlVVJMOnVzZXJEYXRhOl0pOgorICAgICAg ICAqIFdlYktpdDIueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvajoKKwogMjAxMy0wNS0xNyAgU2Ft IFdlaW5pZyAgPHNhbUB3ZWJraXQub3JnPgogCiAgICAgICAgIEFkZCBXS1BhZ2VMb2FkRGF0YSBh bmQgV0tQYWdlTG9hZERhdGFXaXRoVXNlckRhdGEgU1BJIHRvIHN1cHBvcnQgbG9hZGluZyBhcmJp dHJhcnkgZGF0YSBibG9icwpJbmRleDogU291cmNlL1dlYktpdDIvU2hhcmVkL0FQSS9jL1dLQmFz ZS5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1NoYXJlZC9BUEkvYy9XS0Jhc2UuaAko cmV2aXNpb24gMTUwMjcwKQorKysgU291cmNlL1dlYktpdDIvU2hhcmVkL0FQSS9jL1dLQmFzZS5o CSh3b3JraW5nIGNvcHkpCkBAIC00MSw2ICs0MSwxMCBAQAogI2luY2x1ZGUgPFdlYktpdDIvV0tC YXNlRWZsLmg+CiAjZW5kaWYKIAorI2lmIGRlZmluZWQoX19BUFBMRV9fKQorI2luY2x1ZGUgPFdl YktpdDIvV0tCYXNlTWFjLmg+CisjZW5kaWYKKwogLyogV2ViS2l0MiBzaGFyZWQgdHlwZXMgKi8K IAogdHlwZWRlZiB1aW50MzJfdCBXS1R5cGVJRDsKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1NoYXJl ZC9BUEkvYy9XS1NoYXJlZEFQSUNhc3QuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9T aGFyZWQvQVBJL2MvV0tTaGFyZWRBUElDYXN0LmgJKHJldmlzaW9uIDE1MDI3MCkKKysrIFNvdXJj ZS9XZWJLaXQyL1NoYXJlZC9BUEkvYy9XS1NoYXJlZEFQSUNhc3QuaAkod29ya2luZyBjb3B5KQpA QCAtNjMsNiArNjMsNyBAQCBjbGFzcyBJbW11dGFibGVBcnJheTsKIGNsYXNzIEltbXV0YWJsZURp Y3Rpb25hcnk7CiBjbGFzcyBNdXRhYmxlQXJyYXk7CiBjbGFzcyBNdXRhYmxlRGljdGlvbmFyeTsK K2NsYXNzIE9iakNPYmplY3RHcmFwaDsKIGNsYXNzIFdlYkFyY2hpdmU7CiBjbGFzcyBXZWJBcmNo aXZlUmVzb3VyY2U7CiBjbGFzcyBXZWJDZXJ0aWZpY2F0ZUluZm87CkBAIC0xMTYsNiArMTE3LDcg QEAgV0tfQUREX0FQSV9NQVBQSU5HKFdLVXNlckNvbnRlbnRVUkxQYXR0ZQogI2lmIFBMQVRGT1JN KE1BQykKIFdLX0FERF9BUElfTUFQUElORyhXS1dlYkFyY2hpdmVSZWYsIFdlYkFyY2hpdmUpCiBX S19BRERfQVBJX01BUFBJTkcoV0tXZWJBcmNoaXZlUmVzb3VyY2VSZWYsIFdlYkFyY2hpdmVSZXNv dXJjZSkKK1dLX0FERF9BUElfTUFQUElORyhXS09iakNUeXBlV3JhcHBlclJlZiwgT2JqQ09iamVj dEdyYXBoKQogI2VuZGlmCiAKIHRlbXBsYXRlPHR5cGVuYW1lIEltcGxUeXBlLCB0eXBlbmFtZSBB UElUeXBlID0gdHlwZW5hbWUgSW1wbFR5cGVJbmZvPEltcGxUeXBlKj46OkFQSVR5cGU+CkluZGV4 OiBTb3VyY2UvV2ViS2l0Mi9TaGFyZWQvQVBJL2MvbWFjL1dLQmFzZU1hYy5oCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFNvdXJjZS9XZWJLaXQyL1NoYXJlZC9BUEkvYy9tYWMvV0tCYXNlTWFjLmgJKHJldmlzaW9u IDApCisrKyBTb3VyY2UvV2ViS2l0Mi9TaGFyZWQvQVBJL2MvbWFjL1dLQmFzZU1hYy5oCSh3b3Jr aW5nIGNvcHkpCkBAIC0wLDAgKzEsMzUgQEAKKy8qCisgKiBDb3B5cmlnaHQgKEMpIDIwMTMgQXBw bGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgorICoKKyAqIFJlZGlzdHJpYnV0aW9uIGFuZCB1 c2UgaW4gc291cmNlIGFuZCBiaW5hcnkgZm9ybXMsIHdpdGggb3Igd2l0aG91dAorICogbW9kaWZp Y2F0aW9uLCBhcmUgcGVybWl0dGVkIHByb3ZpZGVkIHRoYXQgdGhlIGZvbGxvd2luZyBjb25kaXRp b25zCisgKiBhcmUgbWV0OgorICogMS4gUmVkaXN0cmlidXRpb25zIG9mIHNvdXJjZSBjb2RlIG11 c3QgcmV0YWluIHRoZSBhYm92ZSBjb3B5cmlnaHQKKyAqICAgIG5vdGljZSwgdGhpcyBsaXN0IG9m IGNvbmRpdGlvbnMgYW5kIHRoZSBmb2xsb3dpbmcgZGlzY2xhaW1lci4KKyAqIDIuIFJlZGlzdHJp YnV0aW9ucyBpbiBiaW5hcnkgZm9ybSBtdXN0IHJlcHJvZHVjZSB0aGUgYWJvdmUgY29weXJpZ2h0 CisgKiAgICBub3RpY2UsIHRoaXMgbGlzdCBvZiBjb25kaXRpb25zIGFuZCB0aGUgZm9sbG93aW5n IGRpc2NsYWltZXIgaW4gdGhlCisgKiAgICBkb2N1bWVudGF0aW9uIGFuZC9vciBvdGhlciBtYXRl cmlhbHMgcHJvdmlkZWQgd2l0aCB0aGUgZGlzdHJpYnV0aW9uLgorICoKKyAqIFRISVMgU09GVFdB UkUgSVMgUFJPVklERUQgQlkgQVBQTEUgSU5DLiBBTkQgSVRTIENPTlRSSUJVVE9SUyBgYEFTIElT JycKKyAqIEFORCBBTlkgRVhQUkVTUyBPUiBJTVBMSUVEIFdBUlJBTlRJRVMsIElOQ0xVRElORywg QlVUIE5PVCBMSU1JVEVEIFRPLAorICogVEhFIElNUExJRUQgV0FSUkFOVElFUyBPRiBNRVJDSEFO VEFCSUxJVFkgQU5EIEZJVE5FU1MgRk9SIEEgUEFSVElDVUxBUgorICogUFVSUE9TRSBBUkUgRElT Q0xBSU1FRC4gSU4gTk8gRVZFTlQgU0hBTEwgQVBQTEUgSU5DLiBPUiBJVFMgQ09OVFJJQlVUT1JT CisgKiBCRSBMSUFCTEUgRk9SIEFOWSBESVJFQ1QsIElORElSRUNULCBJTkNJREVOVEFMLCBTUEVD SUFMLCBFWEVNUExBUlksIE9SCisgKiBDT05TRVFVRU5USUFMIERBTUFHRVMgKElOQ0xVRElORywg QlVUIE5PVCBMSU1JVEVEIFRPLCBQUk9DVVJFTUVOVCBPRgorICogU1VCU1RJVFVURSBHT09EUyBP UiBTRVJWSUNFUzsgTE9TUyBPRiBVU0UsIERBVEEsIE9SIFBST0ZJVFM7IE9SIEJVU0lORVNTCisg KiBJTlRFUlJVUFRJT04pIEhPV0VWRVIgQ0FVU0VEIEFORCBPTiBBTlkgVEhFT1JZIE9GIExJQUJJ TElUWSwgV0hFVEhFUiBJTgorICogQ09OVFJBQ1QsIFNUUklDVCBMSUFCSUxJVFksIE9SIFRPUlQg KElOQ0xVRElORyBORUdMSUdFTkNFIE9SIE9USEVSV0lTRSkKKyAqIEFSSVNJTkcgSU4gQU5ZIFdB WSBPVVQgT0YgVEhFIFVTRSBPRiBUSElTIFNPRlRXQVJFLCBFVkVOIElGIEFEVklTRUQgT0YKKyAq IFRIRSBQT1NTSUJJTElUWSBPRiBTVUNIIERBTUFHRS4KKyAqLworCisjaWZuZGVmIFdLQmFzZU1h Y19oCisjZGVmaW5lIFdLQmFzZU1hY19oCisKKyNpZm5kZWYgV0tCYXNlX2gKKyNlcnJvciAiUGxl YXNlICNpbmNsdWRlIFwiV0tCYXNlLmhcIiBpbnN0ZWFkIG9mIHRoaXMgZmlsZSBkaXJlY3RseS4i CisjZW5kaWYKKwordHlwZWRlZiBjb25zdCBzdHJ1Y3QgT3BhcXVlV0tPYmpDVHlwZVdyYXBwZXIq IFdLT2JqQ1R5cGVXcmFwcGVyUmVmOworCisjZW5kaWYgLyogV0tCYXNlTWFjX2ggKi8KSW5kZXg6 IFNvdXJjZS9XZWJLaXQyL1NoYXJlZC9BUEkvYy9tYWMvV0tPYmpDVHlwZVdyYXBwZXJSZWYuaAo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9TaGFyZWQvQVBJL2MvbWFjL1dLT2JqQ1R5cGVX cmFwcGVyUmVmLmgJKHJldmlzaW9uIDApCisrKyBTb3VyY2UvV2ViS2l0Mi9TaGFyZWQvQVBJL2Mv bWFjL1dLT2JqQ1R5cGVXcmFwcGVyUmVmLmgJKHdvcmtpbmcgY29weSkKQEAgLTAsMCArMSw0NSBA QAorLyoKKyAqIENvcHlyaWdodCAoQykgMjAxMyBBcHBsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2 ZWQuCisgKgorICogUmVkaXN0cmlidXRpb24gYW5kIHVzZSBpbiBzb3VyY2UgYW5kIGJpbmFyeSBm b3Jtcywgd2l0aCBvciB3aXRob3V0CisgKiBtb2RpZmljYXRpb24sIGFyZSBwZXJtaXR0ZWQgcHJv dmlkZWQgdGhhdCB0aGUgZm9sbG93aW5nIGNvbmRpdGlvbnMKKyAqIGFyZSBtZXQ6CisgKiAxLiBS ZWRpc3RyaWJ1dGlvbnMgb2Ygc291cmNlIGNvZGUgbXVzdCByZXRhaW4gdGhlIGFib3ZlIGNvcHly aWdodAorICogICAgbm90aWNlLCB0aGlzIGxpc3Qgb2YgY29uZGl0aW9ucyBhbmQgdGhlIGZvbGxv d2luZyBkaXNjbGFpbWVyLgorICogMi4gUmVkaXN0cmlidXRpb25zIGluIGJpbmFyeSBmb3JtIG11 c3QgcmVwcm9kdWNlIHRoZSBhYm92ZSBjb3B5cmlnaHQKKyAqICAgIG5vdGljZSwgdGhpcyBsaXN0 IG9mIGNvbmRpdGlvbnMgYW5kIHRoZSBmb2xsb3dpbmcgZGlzY2xhaW1lciBpbiB0aGUKKyAqICAg IGRvY3VtZW50YXRpb24gYW5kL29yIG90aGVyIG1hdGVyaWFscyBwcm92aWRlZCB3aXRoIHRoZSBk aXN0cmlidXRpb24uCisgKgorICogVEhJUyBTT0ZUV0FSRSBJUyBQUk9WSURFRCBCWSBBUFBMRSBJ TkMuIEFORCBJVFMgQ09OVFJJQlVUT1JTIGBgQVMgSVMnJworICogQU5EIEFOWSBFWFBSRVNTIE9S IElNUExJRUQgV0FSUkFOVElFUywgSU5DTFVESU5HLCBCVVQgTk9UIExJTUlURUQgVE8sCisgKiBU SEUgSU1QTElFRCBXQVJSQU5USUVTIE9GIE1FUkNIQU5UQUJJTElUWSBBTkQgRklUTkVTUyBGT1Ig QSBQQVJUSUNVTEFSCisgKiBQVVJQT1NFIEFSRSBESVNDTEFJTUVELiBJTiBOTyBFVkVOVCBTSEFM TCBBUFBMRSBJTkMuIE9SIElUUyBDT05UUklCVVRPUlMKKyAqIEJFIExJQUJMRSBGT1IgQU5ZIERJ UkVDVCwgSU5ESVJFQ1QsIElOQ0lERU5UQUwsIFNQRUNJQUwsIEVYRU1QTEFSWSwgT1IKKyAqIENP TlNFUVVFTlRJQUwgREFNQUdFUyAoSU5DTFVESU5HLCBCVVQgTk9UIExJTUlURUQgVE8sIFBST0NV UkVNRU5UIE9GCisgKiBTVUJTVElUVVRFIEdPT0RTIE9SIFNFUlZJQ0VTOyBMT1NTIE9GIFVTRSwg REFUQSwgT1IgUFJPRklUUzsgT1IgQlVTSU5FU1MKKyAqIElOVEVSUlVQVElPTikgSE9XRVZFUiBD QVVTRUQgQU5EIE9OIEFOWSBUSEVPUlkgT0YgTElBQklMSVRZLCBXSEVUSEVSIElOCisgKiBDT05U UkFDVCwgU1RSSUNUIExJQUJJTElUWSwgT1IgVE9SVCAoSU5DTFVESU5HIE5FR0xJR0VOQ0UgT1Ig T1RIRVJXSVNFKQorICogQVJJU0lORyBJTiBBTlkgV0FZIE9VVCBPRiBUSEUgVVNFIE9GIFRISVMg U09GVFdBUkUsIEVWRU4gSUYgQURWSVNFRCBPRgorICogVEhFIFBPU1NJQklMSVRZIE9GIFNVQ0gg REFNQUdFLgorICovCisKKyNpZm5kZWYgV0tPYmpDVHlwZVdyYXBwZXJSZWZfaAorI2RlZmluZSBX S09iakNUeXBlV3JhcHBlclJlZl9oCisKKyNpbmNsdWRlIDxGb3VuZGF0aW9uL0ZvdW5kYXRpb24u aD4KKyNpbmNsdWRlIDxXZWJLaXQyL1dLQmFzZS5oPgorCisjaWZkZWYgX19jcGx1c3BsdXMKK2V4 dGVybiAiQyIgeworI2VuZGlmCisKK1dLX0VYUE9SVCBXS1R5cGVJRCBXS09iakNUeXBlV3JhcHBl ckdldFR5cGVJRCgpOworCitXS19FWFBPUlQgV0tPYmpDVHlwZVdyYXBwZXJSZWYgV0tPYmpDVHlw ZVdyYXBwZXJDcmVhdGUoaWQgb2JqZWN0KTsKK1dLX0VYUE9SVCBpZCBXS09iakNUeXBlV3JhcHBl ckdldE9iamVjdChXS09iakNUeXBlV3JhcHBlclJlZiB3cmFwcGVyKTsKKworI2lmZGVmIF9fY3Bs dXNwbHVzCit9CisjZW5kaWYKKworI2VuZGlmIC8qIFdLT2JqQ1R5cGVXcmFwcGVyUmVmX2ggKi8K SW5kZXg6IFNvdXJjZS9XZWJLaXQyL1NoYXJlZC9BUEkvYy9tYWMvV0tPYmpDVHlwZVdyYXBwZXJS ZWYubW0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvU2hhcmVkL0FQSS9jL21hYy9XS09i akNUeXBlV3JhcHBlclJlZi5tbQkocmV2aXNpb24gMCkKKysrIFNvdXJjZS9XZWJLaXQyL1NoYXJl ZC9BUEkvYy9tYWMvV0tPYmpDVHlwZVdyYXBwZXJSZWYubW0JKHdvcmtpbmcgY29weSkKQEAgLTAs MCArMSw0OCBAQAorLyoKKyAqIENvcHlyaWdodCAoQykgMjAxMyBBcHBsZSBJbmMuIEFsbCByaWdo dHMgcmVzZXJ2ZWQuCisgKgorICogUmVkaXN0cmlidXRpb24gYW5kIHVzZSBpbiBzb3VyY2UgYW5k IGJpbmFyeSBmb3Jtcywgd2l0aCBvciB3aXRob3V0CisgKiBtb2RpZmljYXRpb24sIGFyZSBwZXJt aXR0ZWQgcHJvdmlkZWQgdGhhdCB0aGUgZm9sbG93aW5nIGNvbmRpdGlvbnMKKyAqIGFyZSBtZXQ6 CisgKiAxLiBSZWRpc3RyaWJ1dGlvbnMgb2Ygc291cmNlIGNvZGUgbXVzdCByZXRhaW4gdGhlIGFi b3ZlIGNvcHlyaWdodAorICogICAgbm90aWNlLCB0aGlzIGxpc3Qgb2YgY29uZGl0aW9ucyBhbmQg dGhlIGZvbGxvd2luZyBkaXNjbGFpbWVyLgorICogMi4gUmVkaXN0cmlidXRpb25zIGluIGJpbmFy eSBmb3JtIG11c3QgcmVwcm9kdWNlIHRoZSBhYm92ZSBjb3B5cmlnaHQKKyAqICAgIG5vdGljZSwg dGhpcyBsaXN0IG9mIGNvbmRpdGlvbnMgYW5kIHRoZSBmb2xsb3dpbmcgZGlzY2xhaW1lciBpbiB0 aGUKKyAqICAgIGRvY3VtZW50YXRpb24gYW5kL29yIG90aGVyIG1hdGVyaWFscyBwcm92aWRlZCB3 aXRoIHRoZSBkaXN0cmlidXRpb24uCisgKgorICogVEhJUyBTT0ZUV0FSRSBJUyBQUk9WSURFRCBC WSBBUFBMRSBJTkMuIEFORCBJVFMgQ09OVFJJQlVUT1JTIGBgQVMgSVMnJworICogQU5EIEFOWSBF WFBSRVNTIE9SIElNUExJRUQgV0FSUkFOVElFUywgSU5DTFVESU5HLCBCVVQgTk9UIExJTUlURUQg VE8sCisgKiBUSEUgSU1QTElFRCBXQVJSQU5USUVTIE9GIE1FUkNIQU5UQUJJTElUWSBBTkQgRklU TkVTUyBGT1IgQSBQQVJUSUNVTEFSCisgKiBQVVJQT1NFIEFSRSBESVNDTEFJTUVELiBJTiBOTyBF VkVOVCBTSEFMTCBBUFBMRSBJTkMuIE9SIElUUyBDT05UUklCVVRPUlMKKyAqIEJFIExJQUJMRSBG T1IgQU5ZIERJUkVDVCwgSU5ESVJFQ1QsIElOQ0lERU5UQUwsIFNQRUNJQUwsIEVYRU1QTEFSWSwg T1IKKyAqIENPTlNFUVVFTlRJQUwgREFNQUdFUyAoSU5DTFVESU5HLCBCVVQgTk9UIExJTUlURUQg VE8sIFBST0NVUkVNRU5UIE9GCisgKiBTVUJTVElUVVRFIEdPT0RTIE9SIFNFUlZJQ0VTOyBMT1NT IE9GIFVTRSwgREFUQSwgT1IgUFJPRklUUzsgT1IgQlVTSU5FU1MKKyAqIElOVEVSUlVQVElPTikg SE9XRVZFUiBDQVVTRUQgQU5EIE9OIEFOWSBUSEVPUlkgT0YgTElBQklMSVRZLCBXSEVUSEVSIElO CisgKiBDT05UUkFDVCwgU1RSSUNUIExJQUJJTElUWSwgT1IgVE9SVCAoSU5DTFVESU5HIE5FR0xJ R0VOQ0UgT1IgT1RIRVJXSVNFKQorICogQVJJU0lORyBJTiBBTlkgV0FZIE9VVCBPRiBUSEUgVVNF IE9GIFRISVMgU09GVFdBUkUsIEVWRU4gSUYgQURWSVNFRCBPRgorICogVEhFIFBPU1NJQklMSVRZ IE9GIFNVQ0ggREFNQUdFLgorICovCisKKyNpbXBvcnQgImNvbmZpZy5oIgorI2ltcG9ydCAiV0tP YmpDVHlwZVdyYXBwZXJSZWYuaCIKKworI2ltcG9ydCAiT2JqQ09iamVjdEdyYXBoLmgiCisjaW1w b3J0ICJXS1NoYXJlZEFQSUNhc3QuaCIKKwordXNpbmcgbmFtZXNwYWNlIFdlYktpdDsKKworV0tU eXBlSUQgV0tPYmpDVHlwZVdyYXBwZXJHZXRUeXBlSUQoKQoreworICAgIHJldHVybiB0b0FQSShP YmpDT2JqZWN0R3JhcGg6OkFQSVR5cGUpOworfQorCitXS09iakNUeXBlV3JhcHBlclJlZiBXS09i akNUeXBlV3JhcHBlckNyZWF0ZShpZCBvYmplY3QpCit7CisgICAgUmVmUHRyPE9iakNPYmplY3RH cmFwaD4gb2JqZWN0V3JhcHBlciA9IE9iakNPYmplY3RHcmFwaDo6Y3JlYXRlKG9iamVjdCk7Cisg ICAgcmV0dXJuIHRvQVBJKG9iamVjdFdyYXBwZXIucmVsZWFzZSgpLmxlYWtSZWYoKSk7Cit9CisK K2lkIFdLT2JqQ1R5cGVXcmFwcGVyR2V0T2JqZWN0KFdLT2JqQ1R5cGVXcmFwcGVyUmVmIHdyYXBw ZXJSZWYpCit7CisgICAgcmV0dXJuIHRvSW1wbCh3cmFwcGVyUmVmKS0+cm9vdE9iamVjdCgpOwor fQpJbmRleDogU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9tYWMvV0tCcm93c2luZ0NvbnRl eHRDb250cm9sbGVyLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQ SS9tYWMvV0tCcm93c2luZ0NvbnRleHRDb250cm9sbGVyLmgJKHJldmlzaW9uIDE1MDI3MCkKKysr IFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvbWFjL1dLQnJvd3NpbmdDb250ZXh0Q29udHJv bGxlci5oCSh3b3JraW5nIGNvcHkpCkBAIC00OCw2ICs0OCw3IEBAIEBpbnRlcmZhY2UgV0tCcm93 c2luZ0NvbnRleHRDb250cm9sbGVyIDoKIC8qIExvYWQgYSByZXF1ZXN0LiBUaGlzIGlzIG9ubHkg dmFsaWQgZm9yIHJlcXVlc3RzIG9mIG5vbi1maWxlOiBVUkxzLiBQYXNzaW5nIGEKICAgIGZpbGU6 IFVSTCB3aWxsIHRocm93IGFuIGV4Y2VwdGlvbi4gKi8KIC0gKHZvaWQpbG9hZFJlcXVlc3Q6KE5T VVJMUmVxdWVzdCAqKXJlcXVlc3Q7CistICh2b2lkKWxvYWRSZXF1ZXN0OihOU1VSTFJlcXVlc3Qg KilyZXF1ZXN0IHVzZXJEYXRhOihpZCl1c2VyRGF0YTsKIAogLyogTG9hZCBhIGZpbGU6IFVSTC4g T3BlbnMgdGhlIHNhbmRib3ggb25seSBmb3IgZmlsZXMgd2l0aGluIGFsbG93ZWREaXJlY3Rvcnku CiAgICAgLSBQYXNzaW5nIGEgbm9uLWZpbGU6IFVSTCB0byBlaXRoZXIgcGFyYW1ldGVyIHdpbGwg eWllbGQgYW4gZXhjZXB0aW9uLgpAQCAtNTUsOSArNTYsMTUgQEAgQGludGVyZmFjZSBXS0Jyb3dz aW5nQ29udGV4dENvbnRyb2xsZXIgOgogICAgICAgcmVhZGluZy4KICovCiAtICh2b2lkKWxvYWRG aWxlVVJMOihOU1VSTCAqKVVSTCByZXN0cmljdFRvRmlsZXNXaXRoaW46KE5TVVJMICopYWxsb3dl ZERpcmVjdG9yeTsKKy0gKHZvaWQpbG9hZEZpbGVVUkw6KE5TVVJMICopVVJMIHJlc3RyaWN0VG9G aWxlc1dpdGhpbjooTlNVUkwgKilhbGxvd2VkRGlyZWN0b3J5IHVzZXJEYXRhOihpZCl1c2VyRGF0 YTsKIAogLyogTG9hZCBhIHBhZ2UgdXNpbmcgdGhlIHBhc3NlZCBpbiBzdHJpbmcgYXMgaXRzIGNv bnRlbnRzLiAqLwogLSAodm9pZClsb2FkSFRNTFN0cmluZzooTlNTdHJpbmcgKilIVE1MU3RyaW5n IGJhc2VVUkw6KE5TVVJMICopYmFzZVVSTDsKKy0gKHZvaWQpbG9hZEhUTUxTdHJpbmc6KE5TU3Ry aW5nICopSFRNTFN0cmluZyBiYXNlVVJMOihOU1VSTCAqKWJhc2VVUkwgdXNlckRhdGE6KGlkKXVz ZXJEYXRhOworCisvKiBMb2FkIGEgcGFnZSB1c2luZyB0aGUgcGFzc2VkIGluIGRhdGEgYXMgaXRz IGNvbnRlbnRzLiAqLworLSAodm9pZClsb2FkRGF0YTooTlNEYXRhICopZGF0YSBNSU1FVHlwZToo TlNTdHJpbmcgKilNSU1FVHlwZSB0ZXh0RW5jb2RpbmdOYW1lOihOU1N0cmluZyAqKWVuY29kaW5n TmFtZSBiYXNlVVJMOihOU1VSTCAqKWJhc2VVUkw7CistICh2b2lkKWxvYWREYXRhOihOU0RhdGEg KilkYXRhIE1JTUVUeXBlOihOU1N0cmluZyAqKU1JTUVUeXBlIHRleHRFbmNvZGluZ05hbWU6KE5T U3RyaW5nICopZW5jb2RpbmdOYW1lIGJhc2VVUkw6KE5TVVJMICopYmFzZVVSTCB1c2VyRGF0YToo aWQpdXNlckRhdGE7CiAKIC8qIFN0b3BzIHRoZSBsb2FkIGFzc29jaWF0ZWQgd2l0aCB0aGUgYWN0 aXZlIFVSTC4gKi8KIC0gKHZvaWQpc3RvcExvYWRpbmc7CkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvQVBJL21hYy9XS0Jyb3dzaW5nQ29udGV4dENvbnRyb2xsZXIubW0KPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9tYWMvV0tCcm93c2luZ0NvbnRleHRD b250cm9sbGVyLm1tCShyZXZpc2lvbiAxNTAyNzApCisrKyBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nl c3MvQVBJL21hYy9XS0Jyb3dzaW5nQ29udGV4dENvbnRyb2xsZXIubW0JKHdvcmtpbmcgY29weSkK QEAgLTI4LDYgKzI4LDcgQEAKICNpbXBvcnQgIldLQnJvd3NpbmdDb250ZXh0Q29udHJvbGxlclBy aXZhdGUuaCIKICNpbXBvcnQgIldLQnJvd3NpbmdDb250ZXh0Q29udHJvbGxlckludGVybmFsLmgi CiAKKyNpbXBvcnQgIk9iakNPYmplY3RHcmFwaC5oIgogI2ltcG9ydCAiV0tFcnJvckNGLmgiCiAj aW1wb3J0ICJXS0ZyYW1lLmgiCiAjaW1wb3J0ICJXS1BhZ2VQcml2YXRlLmgiCkBAIC0zNywxMSAr MzgsMTQgQEAKICNpbXBvcnQgIldLVVJMUmVxdWVzdC5oIgogI2ltcG9ydCAiV0tVUkxSZXF1ZXN0 TlMuaCIKICNpbXBvcnQgIldlYkNvbnRleHQuaCIKKyNpbXBvcnQgIldlYkRhdGEuaCIKICNpbXBv cnQgIldlYlBhZ2VQcm94eS5oIgogI2ltcG9ydCA8d3RmL1JldGFpblB0ci5oPgogCiAjaW1wb3J0 ICJXS0Jyb3dzaW5nQ29udGV4dExvYWREZWxlZ2F0ZS5oIgogCit1c2luZyBuYW1lc3BhY2UgV2Vi S2l0OworCiBzdGF0aWMgaW5saW5lIE5TU3RyaW5nICphdXRvcmVsZWFzZWQoV0tTdHJpbmdSZWYg c3RyaW5nKQogewogICAgIFdLUmV0YWluUHRyPFdLU3RyaW5nUmVmPiB3a1N0cmluZyA9IGFkb3B0 V0soc3RyaW5nKTsKQEAgLTEwNCw3ICsxMDgsNyBAQCArICh2b2lkKXJlZ2lzdGVyU2NoZW1lRm9y Q3VzdG9tUHJvdG9jb2w6CiAKICAgICBOU1N0cmluZyAqbG93ZXJjYXNlU2NoZW1lID0gW3NjaGVt ZSBsb3dlcmNhc2VTdHJpbmddOwogICAgIFtbV0tCcm93c2luZ0NvbnRleHRDb250cm9sbGVyIGN1 c3RvbVNjaGVtZXNdIGFkZE9iamVjdDpsb3dlcmNhc2VTY2hlbWVdOwotICAgIFtbTlNOb3RpZmlj YXRpb25DZW50ZXIgZGVmYXVsdENlbnRlcl0gcG9zdE5vdGlmaWNhdGlvbk5hbWU6V2ViS2l0OjpT Y2hlbWVGb3JDdXN0b21Qcm90b2NvbFJlZ2lzdGVyZWROb3RpZmljYXRpb25OYW1lIG9iamVjdDps b3dlcmNhc2VTY2hlbWVdOworICAgIFtbTlNOb3RpZmljYXRpb25DZW50ZXIgZGVmYXVsdENlbnRl cl0gcG9zdE5vdGlmaWNhdGlvbk5hbWU6U2NoZW1lRm9yQ3VzdG9tUHJvdG9jb2xSZWdpc3RlcmVk Tm90aWZpY2F0aW9uTmFtZSBvYmplY3Q6bG93ZXJjYXNlU2NoZW1lXTsKIH0KIAogKyAodm9pZCl1 bnJlZ2lzdGVyU2NoZW1lRm9yQ3VzdG9tUHJvdG9jb2w6KE5TU3RyaW5nICopc2NoZW1lCkBAIC0x MTQsMjggKzExOCw1MiBAQCArICh2b2lkKXVucmVnaXN0ZXJTY2hlbWVGb3JDdXN0b21Qcm90b2Nv CiAKICAgICBOU1N0cmluZyAqbG93ZXJjYXNlU2NoZW1lID0gW3NjaGVtZSBsb3dlcmNhc2VTdHJp bmddOwogICAgIFtbV0tCcm93c2luZ0NvbnRleHRDb250cm9sbGVyIGN1c3RvbVNjaGVtZXNdIHJl bW92ZU9iamVjdDpsb3dlcmNhc2VTY2hlbWVdOwotICAgIFtbTlNOb3RpZmljYXRpb25DZW50ZXIg ZGVmYXVsdENlbnRlcl0gcG9zdE5vdGlmaWNhdGlvbk5hbWU6V2ViS2l0OjpTY2hlbWVGb3JDdXN0 b21Qcm90b2NvbFVucmVnaXN0ZXJlZE5vdGlmaWNhdGlvbk5hbWUgb2JqZWN0Omxvd2VyY2FzZVNj aGVtZV07CisgICAgW1tOU05vdGlmaWNhdGlvbkNlbnRlciBkZWZhdWx0Q2VudGVyXSBwb3N0Tm90 aWZpY2F0aW9uTmFtZTpTY2hlbWVGb3JDdXN0b21Qcm90b2NvbFVucmVnaXN0ZXJlZE5vdGlmaWNh dGlvbk5hbWUgb2JqZWN0Omxvd2VyY2FzZVNjaGVtZV07CiB9CiAKIC0gKHZvaWQpbG9hZFJlcXVl c3Q6KE5TVVJMUmVxdWVzdCAqKXJlcXVlc3QKIHsKKyAgICBbc2VsZiBsb2FkUmVxdWVzdDpyZXF1 ZXN0IHVzZXJEYXRhOm5pbF07Cit9CisKKy0gKHZvaWQpbG9hZFJlcXVlc3Q6KE5TVVJMUmVxdWVz dCAqKXJlcXVlc3QgdXNlckRhdGE6KGlkKXVzZXJEYXRhCit7CiAgICAgV0tSZXRhaW5QdHI8V0tV UkxSZXF1ZXN0UmVmPiB3a1JlcXVlc3QgPSBhZG9wdFdLKFdLVVJMUmVxdWVzdENyZWF0ZVdpdGhO U1VSTFJlcXVlc3QocmVxdWVzdCkpOwotICAgIFdLUGFnZUxvYWRVUkxSZXF1ZXN0KHNlbGYuX3Bh Z2VSZWYsIHdrUmVxdWVzdC5nZXQoKSk7CisKKyAgICBSZWZQdHI8T2JqQ09iamVjdEdyYXBoPiB3 a1VzZXJEYXRhOworICAgIGlmICh1c2VyRGF0YSkKKyAgICAgICAgd2tVc2VyRGF0YSA9IE9iakNP YmplY3RHcmFwaDo6Y3JlYXRlKHVzZXJEYXRhKTsKKworICAgIFdLUGFnZUxvYWRVUkxSZXF1ZXN0 V2l0aFVzZXJEYXRhKHNlbGYuX3BhZ2VSZWYsIHdrUmVxdWVzdC5nZXQoKSwgKFdLVHlwZVJlZil3 a1VzZXJEYXRhLmdldCgpKTsKIH0KIAogLSAodm9pZClsb2FkRmlsZVVSTDooTlNVUkwgKilVUkwg cmVzdHJpY3RUb0ZpbGVzV2l0aGluOihOU1VSTCAqKWFsbG93ZWREaXJlY3RvcnkKIHsKKyAgICBb c2VsZiBsb2FkRmlsZVVSTDpVUkwgcmVzdHJpY3RUb0ZpbGVzV2l0aGluOmFsbG93ZWREaXJlY3Rv cnkgdXNlckRhdGE6bmlsXTsKK30KKworLSAodm9pZClsb2FkRmlsZVVSTDooTlNVUkwgKilVUkwg cmVzdHJpY3RUb0ZpbGVzV2l0aGluOihOU1VSTCAqKWFsbG93ZWREaXJlY3RvcnkgdXNlckRhdGE6 KGlkKXVzZXJEYXRhCit7CiAgICAgaWYgKCFbVVJMIGlzRmlsZVVSTF0gfHwgKGFsbG93ZWREaXJl Y3RvcnkgJiYgIVthbGxvd2VkRGlyZWN0b3J5IGlzRmlsZVVSTF0pKQogICAgICAgICBbTlNFeGNl cHRpb24gcmFpc2U6TlNJbnZhbGlkQXJndW1lbnRFeGNlcHRpb24gZm9ybWF0OkAiQXR0ZW1wdGVk IHRvIGxvYWQgYSBub24tZmlsZSBVUkwiXTsKIAogICAgIFdLUmV0YWluUHRyPFdLVVJMUmVmPiB3 a1VSTCA9IGFkb3B0V0soV0tVUkxDcmVhdGVXaXRoQ0ZVUkwoKENGVVJMUmVmKVVSTCkpOwogICAg IFdLUmV0YWluUHRyPFdLVVJMUmVmPiB3a0FsbG93ZWREaXJlY3RvcnkgPSBhZG9wdFdLKFdLVVJM Q3JlYXRlV2l0aENGVVJMKChDRlVSTFJlZilhbGxvd2VkRGlyZWN0b3J5KSk7CiAgICAgCi0gICAg V0tQYWdlTG9hZEZpbGUoc2VsZi5fcGFnZVJlZiwgd2tVUkwuZ2V0KCksIHdrQWxsb3dlZERpcmVj dG9yeS5nZXQoKSk7CisgICAgUmVmUHRyPE9iakNPYmplY3RHcmFwaD4gd2tVc2VyRGF0YTsKKyAg ICBpZiAodXNlckRhdGEpCisgICAgICAgIHdrVXNlckRhdGEgPSBPYmpDT2JqZWN0R3JhcGg6OmNy ZWF0ZSh1c2VyRGF0YSk7CisKKyAgICBXS1BhZ2VMb2FkRmlsZVdpdGhVc2VyRGF0YShzZWxmLl9w YWdlUmVmLCB3a1VSTC5nZXQoKSwgd2tBbGxvd2VkRGlyZWN0b3J5LmdldCgpLCAoV0tUeXBlUmVm KXdrVXNlckRhdGEuZ2V0KCkpOwogfQogCiAtICh2b2lkKWxvYWRIVE1MU3RyaW5nOihOU1N0cmlu ZyAqKUhUTUxTdHJpbmcgYmFzZVVSTDooTlNVUkwgKiliYXNlVVJMCiB7CisgICAgW3NlbGYgbG9h ZEhUTUxTdHJpbmc6SFRNTFN0cmluZyBiYXNlVVJMOmJhc2VVUkwgdXNlckRhdGE6bmlsXTsKK30K KworLSAodm9pZClsb2FkSFRNTFN0cmluZzooTlNTdHJpbmcgKilIVE1MU3RyaW5nIGJhc2VVUkw6 KE5TVVJMICopYmFzZVVSTCB1c2VyRGF0YTooaWQpdXNlckRhdGEKK3sKICAgICBXS1JldGFpblB0 cjxXS1N0cmluZ1JlZj4gd2tIVE1MU3RyaW5nOwogICAgIGlmIChIVE1MU3RyaW5nKQogICAgICAg ICB3a0hUTUxTdHJpbmcgPSBhZG9wdFdLKFdLU3RyaW5nQ3JlYXRlV2l0aENGU3RyaW5nKChDRlN0 cmluZ1JlZilIVE1MU3RyaW5nKSk7CkBAIC0xNDQsNyArMTcyLDQ4IEBAIC0gKHZvaWQpbG9hZEhU TUxTdHJpbmc6KE5TU3RyaW5nICopSFRNTFMKICAgICBpZiAoYmFzZVVSTCkKICAgICAgICAgd2tC YXNlVVJMID0gYWRvcHRXSyhXS1VSTENyZWF0ZVdpdGhDRlVSTCgoQ0ZVUkxSZWYpYmFzZVVSTCkp OwogCi0gICAgV0tQYWdlTG9hZEhUTUxTdHJpbmcoc2VsZi5fcGFnZVJlZiwgd2tIVE1MU3RyaW5n LmdldCgpLCB3a0Jhc2VVUkwuZ2V0KCkpOworICAgIFJlZlB0cjxPYmpDT2JqZWN0R3JhcGg+IHdr VXNlckRhdGE7CisgICAgaWYgKHVzZXJEYXRhKQorICAgICAgICB3a1VzZXJEYXRhID0gT2JqQ09i amVjdEdyYXBoOjpjcmVhdGUodXNlckRhdGEpOworCisgICAgV0tQYWdlTG9hZEhUTUxTdHJpbmdX aXRoVXNlckRhdGEoc2VsZi5fcGFnZVJlZiwgd2tIVE1MU3RyaW5nLmdldCgpLCB3a0Jhc2VVUkwu Z2V0KCksIChXS1R5cGVSZWYpd2tVc2VyRGF0YS5nZXQoKSk7Cit9CisKKy0gKHZvaWQpbG9hZERh dGE6KE5TRGF0YSAqKWRhdGEgTUlNRVR5cGU6KE5TU3RyaW5nICopTUlNRVR5cGUgdGV4dEVuY29k aW5nTmFtZTooTlNTdHJpbmcgKillbmNvZGluZ05hbWUgYmFzZVVSTDooTlNVUkwgKiliYXNlVVJM Cit7CisgICAgW3NlbGYgbG9hZERhdGE6ZGF0YSBNSU1FVHlwZTpNSU1FVHlwZSB0ZXh0RW5jb2Rp bmdOYW1lOmVuY29kaW5nTmFtZSBiYXNlVVJMOmJhc2VVUkwgdXNlckRhdGE6bmlsXTsKK30KKwor c3RhdGljIHZvaWQgcmVsZWFzZU5TRGF0YSh1bnNpZ25lZCBjaGFyKiwgY29uc3Qgdm9pZCogZGF0 YSkKK3sKKyAgICBbKE5TRGF0YSAqKWRhdGEgcmVsZWFzZV07Cit9CisKKy0gKHZvaWQpbG9hZERh dGE6KE5TRGF0YSAqKWRhdGEgTUlNRVR5cGU6KE5TU3RyaW5nICopTUlNRVR5cGUgdGV4dEVuY29k aW5nTmFtZTooTlNTdHJpbmcgKillbmNvZGluZ05hbWUgYmFzZVVSTDooTlNVUkwgKiliYXNlVVJM IHVzZXJEYXRhOihpZCl1c2VyRGF0YQoreworICAgIFJlZlB0cjxXZWJEYXRhPiB3a0RhdGE7Cisg ICAgaWYgKGRhdGEpIHsKKyAgICAgICAgW2RhdGEgcmV0YWluXTsKKyAgICAgICAgd2tEYXRhID0g V2ViRGF0YTo6Y3JlYXRlV2l0aG91dENvcHlpbmcoKGNvbnN0IHVuc2lnbmVkIGNoYXIqKVtkYXRh IGJ5dGVzXSwgW2RhdGEgbGVuZ3RoXSwgcmVsZWFzZU5TRGF0YSwgZGF0YSk7CisgICAgfQorCisg ICAgV0tSZXRhaW5QdHI8V0tTdHJpbmdSZWY+IHdrTUlNRVR5cGU7CisgICAgaWYgKE1JTUVUeXBl KQorICAgICAgICB3a01JTUVUeXBlID0gYWRvcHRXSyhXS1N0cmluZ0NyZWF0ZVdpdGhDRlN0cmlu ZygoQ0ZTdHJpbmdSZWYpTUlNRVR5cGUpKTsKKworICAgIFdLUmV0YWluUHRyPFdLU3RyaW5nUmVm PiB3a0VuY29kaW5nTmFtZTsKKyAgICBpZiAoZW5jb2RpbmdOYW1lKQorICAgICAgICB3a0VuY29k aW5nTmFtZSA9IGFkb3B0V0soV0tTdHJpbmdDcmVhdGVXaXRoQ0ZTdHJpbmcoKENGU3RyaW5nUmVm KWVuY29kaW5nTmFtZSkpOworCisgICAgV0tSZXRhaW5QdHI8V0tVUkxSZWY+IHdrQmFzZVVSTDsK KyAgICBpZiAoYmFzZVVSTCkKKyAgICAgICAgd2tCYXNlVVJMID0gYWRvcHRXSyhXS1VSTENyZWF0 ZVdpdGhDRlVSTCgoQ0ZVUkxSZWYpYmFzZVVSTCkpOworCisgICAgUmVmUHRyPE9iakNPYmplY3RH cmFwaD4gd2tVc2VyRGF0YTsKKyAgICBpZiAodXNlckRhdGEpCisgICAgICAgIHdrVXNlckRhdGEg PSBPYmpDT2JqZWN0R3JhcGg6OmNyZWF0ZSh1c2VyRGF0YSk7CisKKyAgICBXS1BhZ2VMb2FkRGF0 YVdpdGhVc2VyRGF0YShzZWxmLl9wYWdlUmVmLCB0b0FQSSh3a0RhdGEuZ2V0KCkpLCB3a01JTUVU eXBlLmdldCgpLCB3a0VuY29kaW5nTmFtZS5nZXQoKSwgd2tCYXNlVVJMLmdldCgpLCAoV0tUeXBl UmVmKXdrVXNlckRhdGEuZ2V0KCkpOwogfQogCiAtICh2b2lkKXN0b3BMb2FkaW5nCkluZGV4OiBT b3VyY2UvV2ViS2l0Mi9XZWJLaXQyLnhjb2RlcHJvai9wcm9qZWN0LnBieHByb2oKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gU291cmNlL1dlYktpdDIvV2ViS2l0Mi54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qCShy ZXZpc2lvbiAxNTAyNzApCisrKyBTb3VyY2UvV2ViS2l0Mi9XZWJLaXQyLnhjb2RlcHJvai9wcm9q ZWN0LnBieHByb2oJKHdvcmtpbmcgY29weSkKQEAgLTU4Nyw2ICs1ODcsOSBAQAogCQk3Q0IxNkZG MjE3MjRCQTI4MDA3QTBBOTUgLyogY29tLm1hY3JvbWVkaWEuRmxhc2ggUGxheWVyLnBsdWdpbi5z YiBpbiBDb3B5IFBsdWctaW4gU2FuZGJveCBQcm9maWxlcyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZp bGU7IGZpbGVSZWYgPSA3Q0IxNkZFNTE3MjRCOUI1MDA3QTBBOTUgLyogY29tLm1hY3JvbWVkaWEu Rmxhc2ggUGxheWVyLnBsdWdpbi5zYiAqLzsgfTsKIAkJN0NCMTZGRjMxNzI0QkEyRjAwN0EwQTk1 IC8qIGNvbS5taWNyb3NvZnQuU2lsdmVybGlnaHRQbHVnaW4uc2IgaW4gQ29weSBQbHVnLWluIFNh bmRib3ggUHJvZmlsZXMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gN0NCMTZG RTYxNzI0QjlCNTAwN0EwQTk1IC8qIGNvbS5taWNyb3NvZnQuU2lsdmVybGlnaHRQbHVnaW4uc2Ig Ki87IH07CiAJCTdDQjE2RkY0MTcyNEJBMzAwMDdBMEE5NSAvKiBjb20ub3JhY2xlLmphdmEuSmF2 YUFwcGxldFBsdWdpbi5zYiBpbiBDb3B5IFBsdWctaW4gU2FuZGJveCBQcm9maWxlcyAqLyA9IHtp c2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSA3Q0IxNkZFNzE3MjRCOUI1MDA3QTBBOTUgLyog Y29tLm9yYWNsZS5qYXZhLkphdmFBcHBsZXRQbHVnaW4uc2IgKi87IH07CisJCTdDRDVFQkI4MTc0 NkExNUIwMDBDMUM0NSAvKiBXS09iakNUeXBlV3JhcHBlclJlZi5tbSBpbiBTb3VyY2VzICovID0g e2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IDdDRDVFQkI2MTc0NkExNUIwMDBDMUM0NSAv KiBXS09iakNUeXBlV3JhcHBlclJlZi5tbSAqLzsgfTsKKwkJN0NENUVCQjkxNzQ2QTE1QjAwMEMx QzQ1IC8qIFdLT2JqQ1R5cGVXcmFwcGVyUmVmLmggaW4gSGVhZGVycyAqLyA9IHtpc2EgPSBQQlhC dWlsZEZpbGU7IGZpbGVSZWYgPSA3Q0Q1RUJCNzE3NDZBMTVCMDAwQzFDNDUgLyogV0tPYmpDVHlw ZVdyYXBwZXJSZWYuaCAqLzsgc2V0dGluZ3MgPSB7QVRUUklCVVRFUyA9IChQcml2YXRlLCApOyB9 OyB9OworCQk3Q0Q1RUJCQjE3NDZBODNFMDAwQzFDNDUgLyogV0tCYXNlTWFjLmggaW4gSGVhZGVy cyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSA3Q0Q1RUJCQTE3NDZBODNFMDAw QzFDNDUgLyogV0tCYXNlTWFjLmggKi87IHNldHRpbmdzID0ge0FUVFJJQlVURVMgPSAoUHJpdmF0 ZSwgKTsgfTsgfTsKIAkJN0NENjIyNzcxNzM5RDg2MzAwNUJEN0ZGIC8qIFBsdWdpblNhbmRib3hQ cm9maWxlLm1tIGluIFNvdXJjZXMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0g N0NENjIyNzUxNzM5RDg2MzAwNUJEN0ZGIC8qIFBsdWdpblNhbmRib3hQcm9maWxlLm1tICovOyB9 OwogCQk3Q0Q2MjI3ODE3MzlEODYzMDA1QkQ3RkYgLyogUGx1Z2luU2FuZGJveFByb2ZpbGUuaCBp biBIZWFkZXJzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IDdDRDYyMjc2MTcz OUQ4NjMwMDVCRDdGRiAvKiBQbHVnaW5TYW5kYm94UHJvZmlsZS5oICovOyB9OwogCQk3Q0Y0N0ZG NjE3Mjc1QjcxMDA4QUNCOTEgLyogV0tCdW5kbGVQYWdlQmFubmVyLmNwcCBpbiBTb3VyY2VzICov ID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IDdDRjQ3RkY0MTcyNzVCNzEwMDhBQ0I5 MSAvKiBXS0J1bmRsZVBhZ2VCYW5uZXIuY3BwICovOyB9OwpAQCAtMjA2OCw2ICsyMDcxLDkgQEAK IAkJN0NCMTZGRTUxNzI0QjlCNTAwN0EwQTk1IC8qIGNvbS5tYWNyb21lZGlhLkZsYXNoIFBsYXll ci5wbHVnaW4uc2IgKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0g NDsgbGFzdEtub3duRmlsZVR5cGUgPSB0ZXh0OyBwYXRoID0gImNvbS5tYWNyb21lZGlhLkZsYXNo IFBsYXllci5wbHVnaW4uc2IiOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OwogCQk3Q0IxNkZF NjE3MjRCOUI1MDA3QTBBOTUgLyogY29tLm1pY3Jvc29mdC5TaWx2ZXJsaWdodFBsdWdpbi5zYiAq LyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25G aWxlVHlwZSA9IHRleHQ7IHBhdGggPSBjb20ubWljcm9zb2Z0LlNpbHZlcmxpZ2h0UGx1Z2luLnNi OyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OwogCQk3Q0IxNkZFNzE3MjRCOUI1MDA3QTBBOTUg LyogY29tLm9yYWNsZS5qYXZhLkphdmFBcHBsZXRQbHVnaW4uc2IgKi8gPSB7aXNhID0gUEJYRmls ZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSB0ZXh0OyBw YXRoID0gY29tLm9yYWNsZS5qYXZhLkphdmFBcHBsZXRQbHVnaW4uc2I7IHNvdXJjZVRyZWUgPSAi PGdyb3VwPiI7IH07CisJCTdDRDVFQkI2MTc0NkExNUIwMDBDMUM0NSAvKiBXS09iakNUeXBlV3Jh cHBlclJlZi5tbSAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0 OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuY3BwLm9iamNwcDsgcGF0aCA9IFdLT2Jq Q1R5cGVXcmFwcGVyUmVmLm1tOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OworCQk3Q0Q1RUJC NzE3NDZBMTVCMDAwQzFDNDUgLyogV0tPYmpDVHlwZVdyYXBwZXJSZWYuaCAqLyA9IHtpc2EgPSBQ QlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNv dXJjZWNvZGUuYy5oOyBwYXRoID0gV0tPYmpDVHlwZVdyYXBwZXJSZWYuaDsgc291cmNlVHJlZSA9 ICI8Z3JvdXA+IjsgfTsKKwkJN0NENUVCQkExNzQ2QTgzRTAwMEMxQzQ1IC8qIFdLQmFzZU1hYy5o ICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93 bkZpbGVUeXBlID0gc291cmNlY29kZS5jLmg7IHBhdGggPSBXS0Jhc2VNYWMuaDsgc291cmNlVHJl ZSA9ICI8Z3JvdXA+IjsgfTsKIAkJN0NENjIyNzUxNzM5RDg2MzAwNUJEN0ZGIC8qIFBsdWdpblNh bmRib3hQcm9maWxlLm1tICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGlu ZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jcHAub2JqY3BwOyBwYXRoID0g UGx1Z2luU2FuZGJveFByb2ZpbGUubW07IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CiAJCTdD RDYyMjc2MTczOUQ4NjMwMDVCRDdGRiAvKiBQbHVnaW5TYW5kYm94UHJvZmlsZS5oICovID0ge2lz YSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBl ID0gc291cmNlY29kZS5jLmg7IHBhdGggPSBQbHVnaW5TYW5kYm94UHJvZmlsZS5oOyBzb3VyY2VU cmVlID0gIjxncm91cD4iOyB9OwogCQk3Q0Y0N0ZGNDE3Mjc1QjcxMDA4QUNCOTEgLyogV0tCdW5k bGVQYWdlQmFubmVyLmNwcCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2Rp bmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuY3BwLmNwcDsgcGF0aCA9IFdL QnVuZGxlUGFnZUJhbm5lci5jcHA7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CkBAIC00NTA5 LDggKzQ1MTUsMTEgQEAKIAkJQkM0MDc1RDYxMjRGRjAwMDAwNjhGMjBBIC8qIG1hYyAqLyA9IHsK IAkJCWlzYSA9IFBCWEdyb3VwOwogCQkJY2hpbGRyZW4gPSAoCisJCQkJN0NENUVCQkExNzQ2QTgz RTAwMEMxQzQ1IC8qIFdLQmFzZU1hYy5oICovLAogCQkJCUJDNDA3NjIxMTI0RkYwNDAwMDY4RjIw QSAvKiBXS0NlcnRpZmljYXRlSW5mb01hYy5oICovLAogCQkJCUJDNDA3NjIyMTI0RkYwNDAwMDY4 RjIwQSAvKiBXS0NlcnRpZmljYXRlSW5mb01hYy5tbSAqLywKKwkJCQk3Q0Q1RUJCNzE3NDZBMTVC MDAwQzFDNDUgLyogV0tPYmpDVHlwZVdyYXBwZXJSZWYuaCAqLywKKwkJCQk3Q0Q1RUJCNjE3NDZB MTVCMDAwQzFDNDUgLyogV0tPYmpDVHlwZVdyYXBwZXJSZWYubW0gKi8sCiAJCQkJQkM0MDc2MjMx MjRGRjA0MDAwNjhGMjBBIC8qIFdLVVJMUmVxdWVzdE5TLmggKi8sCiAJCQkJQkM0MDc2MjQxMjRG RjA0MDAwNjhGMjBBIC8qIFdLVVJMUmVxdWVzdE5TLm1tICovLAogCQkJCUJDNDA3NjI1MTI0RkYw NDAwMDY4RjIwQSAvKiBXS1VSTFJlc3BvbnNlTlMuaCAqLywKQEAgLTU2NjQsNiArNTY3Myw3IEBA CiAJCQkJQkNEREIzMkQxMjRFQzJFMTAwNDhEMTNDIC8qIFdLQVBJQ2FzdC5oIGluIEhlYWRlcnMg Ki8sCiAJCQkJNTEyRTM0RTUxMzBCNEQwNTAwQUJEMTlBIC8qIFdLQXBwbGljYXRpb25DYWNoZU1h bmFnZXIuaCBpbiBIZWFkZXJzICovLAogCQkJCTdDRjQ3RkZCMTcyNzVDNTcwMDhBQ0I5MSAvKiBQ YWdlQmFubmVyLmggaW4gSGVhZGVycyAqLywKKwkJCQk3Q0Q1RUJCQjE3NDZBODNFMDAwQzFDNDUg LyogV0tCYXNlTWFjLmggaW4gSGVhZGVycyAqLywKIAkJCQlCQzQwNzVGNDEyNEZGMDI3MDA2OEYy MEEgLyogV0tBcnJheS5oIGluIEhlYWRlcnMgKi8sCiAJCQkJNTEyRjU4RjYxMkE4OEE1NDAwNjI5 NTMwIC8qIFdLQXV0aGVudGljYXRpb25DaGFsbGVuZ2UuaCBpbiBIZWFkZXJzICovLAogCQkJCTUx MkY1OEY4MTJBODhBNTQwMDYyOTUzMCAvKiBXS0F1dGhlbnRpY2F0aW9uRGVjaXNpb25MaXN0ZW5l ci5oIGluIEhlYWRlcnMgKi8sCkBAIC01NjcyLDYgKzU2ODIsNyBAQAogCQkJCUJDNjQ2QzFEMTFE RDM5OUYwMDY0NTVCMCAvKiBXS0JhY2tGb3J3YXJkTGlzdEl0ZW0uaCBpbiBIZWFkZXJzICovLAog CQkJCUJDRERCMzE3MTI0RUJEMTMwMDQ4RDEzQyAvKiBXS0Jhc2UuaCBpbiBIZWFkZXJzICovLAog CQkJCTI5MEY0MjcyMTcyQTBDNzQwMDkzOUZGMCAvKiBDaGlsZFByb2Nlc3NTdXBwbGVtZW50Lmgg aW4gSGVhZGVycyAqLywKKwkJCQk3Q0Q1RUJCOTE3NDZBMTVCMDAwQzFDNDUgLyogV0tPYmpDVHlw ZVdyYXBwZXJSZWYuaCBpbiBIZWFkZXJzICovLAogCQkJCUJDQkFBQzczMTQ0RTYxOUUwMDUzRjgy RiAvKiBXS0Jyb3dzaW5nQ29udGV4dENvbnRyb2xsZXIuaCBpbiBIZWFkZXJzICovLAogCQkJCUJD QkFBQzc0MTQ0RTYxQTUwMDUzRjgyRiAvKiBXS0Jyb3dzaW5nQ29udGV4dENvbnRyb2xsZXJJbnRl cm5hbC5oIGluIEhlYWRlcnMgKi8sCiAJCQkJMzc4OEEwNUMxNDc0M0M5MDAwNjMxOUU1IC8qIFdL QnJvd3NpbmdDb250ZXh0Q29udHJvbGxlclByaXZhdGUuaCBpbiBIZWFkZXJzICovLApAQCAtNjky MCw2ICs2OTMxLDcgQEAKIAkJCQkxQTA0M0EwQTEyNEQxMUE5MDBGRkJGQjUgLyogV2ViUHJvY2Vz c0Nvbm5lY3Rpb24uY3BwIGluIFNvdXJjZXMgKi8sCiAJCQkJMUEwNDNGNjkxMjUxNEQ4QjAwRkZC RkI1IC8qIFdlYlByb2Nlc3NDb25uZWN0aW9uTWVzc2FnZVJlY2VpdmVyLmNwcCBpbiBTb3VyY2Vz ICovLAogCQkJCUJDMzA2ODI1MTI1QTZCOTQwMEU3MTI3OCAvKiBXZWJQcm9jZXNzQ3JlYXRpb25Q YXJhbWV0ZXJzLmNwcCBpbiBTb3VyY2VzICovLAorCQkJCTdDRDVFQkI4MTc0NkExNUIwMDBDMUM0 NSAvKiBXS09iakNUeXBlV3JhcHBlclJlZi5tbSBpbiBTb3VyY2VzICovLAogCQkJCUJDMzA2NUM0 MTI1OTJGODkwMEU3MTI3OCAvKiBXZWJQcm9jZXNzTWFjLm1tIGluIFNvdXJjZXMgKi8sCiAJCQkJ QkMzMDY2QkUxMjVBNDQyMTAwRTcxMjc4IC8qIFdlYlByb2Nlc3NNZXNzYWdlUmVjZWl2ZXIuY3Bw IGluIFNvdXJjZXMgKi8sCiAJCQkJQkMxMTFCMTExMTJGNUU0RjAwMzM3QkFCIC8qIFdlYlByb2Nl c3NQcm94eS5jcHAgaW4gU291cmNlcyAqLywK