95916 2012-09-05 17:22:20 -0700 [WK2] Annotate multi-process FIXMEs with bug numbers 2012-09-06 10:16:22 -0700 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 ap ap beidson eric.carlson feature-media-reviews webkit.review.bot oldest_to_newest 712696 0 ap 2012-09-05 17:22:20 -0700 Patch forthcoming 712704 1 162379 ap 2012-09-05 17:33:42 -0700 Created attachment 162379 proposed patch 712742 2 162379 eric.carlson 2012-09-05 18:29:58 -0700 Comment on attachment 162379 proposed patch View in context: https://bugs.webkit.org/attachment.cgi?id=162379&action=review > Source/WebKit2/ChangeLog:3 > + [WK2] Annotate multi-process FIXMEs with bug numbers You might want to update the bug title because you did more than add bug numbers to FIXMEs. > Source/WebKit2/ChangeLog:21 > + (WebKit::WebPluginSiteDataManager::clearSiteData): > + Removed FIXMEs - some ports haven't switched to plugin process yet, but that > + doesn't stop others from having a multi-process model. And added ASSERT that plug-in process is enabled. 713413 3 ap 2012-09-06 10:16:22 -0700 Committed <http://trac.webkit.org/changeset/127754>. Wasn't sure how to better describe the change, so kept the old title. 162379 2012-09-05 17:33:42 -0700 2012-09-05 18:29:57 -0700 proposed patch BugNumbers.txt text/plain 22087 ap SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDEyNzY0NSkKKysrIFNvdXJjZS9XZWJLaXQyL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDU4IEBACisyMDEyLTA5LTA1ICBBbGV4ZXkg UHJvc2t1cnlha292ICA8YXBAYXBwbGUuY29tPgorCisgICAgICAgIFtXSzJdIEFubm90YXRlIG11 bHRpLXByb2Nlc3MgRklYTUVzIHdpdGggYnVnIG51bWJlcnMKKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTk1OTE2CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvV2ViQ29udGV4dC5jcHA6Cisg ICAgICAgIChXZWJLaXQ6OldlYkNvbnRleHQ6OnNldFByb2Nlc3NNb2RlbCk6IEVuc3VyZSB0aGF0 IHBsdWctaW4gcHJvY2VzcyBpcyBlbmFibGVkLgorICAgICAgICBDb21tZW50cyBpbiBXZWJQbHVn aW5TaXRlRGF0YU1hbmFnZXIgc2FpZCB0aGF0IGl0J3MgcmVxdWlyZWQgZm9yIG11bHRpLXByb2Nl c3MuCisgICAgICAgIChXZWJLaXQ6OldlYkNvbnRleHQ6OmNyZWF0ZU5ld1dlYlByb2Nlc3MpOiBB ZGRlZCBhIGJ1ZyBudW1iZXIuCisgICAgICAgIChXZWJLaXQ6OldlYkNvbnRleHQ6OmRpc2Nvbm5l Y3RQcm9jZXNzKTogRGl0dG8uCisgICAgICAgIChXZWJLaXQ6OldlYkNvbnRleHQ6OmNyZWF0ZVdl YlBhZ2UpOiBEaXR0by4KKyAgICAgICAgKFdlYktpdDo6V2ViQ29udGV4dDo6ZG93bmxvYWQpOiBE aXR0by4KKyAgICAgICAgKFdlYktpdDo6V2ViQ29udGV4dDo6Z2V0V2ViQ29yZVN0YXRpc3RpY3Mp OiBEaXR0by4KKworICAgICAgICAqIFVJUHJvY2Vzcy9QbHVnaW5zL1dlYlBsdWdpblNpdGVEYXRh TWFuYWdlci5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYlBsdWdpblNpdGVEYXRhTWFuYWdlcjo6 Z2V0U2l0ZXNXaXRoRGF0YSk6CisgICAgICAgIChXZWJLaXQ6OldlYlBsdWdpblNpdGVEYXRhTWFu YWdlcjo6Y2xlYXJTaXRlRGF0YSk6CisgICAgICAgIFJlbW92ZWQgRklYTUVzIC0gc29tZSBwb3J0 cyBoYXZlbid0IHN3aXRjaGVkIHRvIHBsdWdpbiBwcm9jZXNzIHlldCwgYnV0IHRoYXQKKyAgICAg ICAgZG9lc24ndCBzdG9wIG90aGVycyBmcm9tIGhhdmluZyBhIG11bHRpLXByb2Nlc3MgbW9kZWwu CisKKyAgICAgICAgKiBVSVByb2Nlc3MvRG93bmxvYWRzL0Rvd25sb2FkUHJveHkuY3BwOgorICAg ICAgICAoV2ViS2l0OjpEb3dubG9hZFByb3h5OjpjYW5jZWwpOgorICAgICAgICAoV2ViS2l0OjpE b3dubG9hZFByb3h5OjpkaWRSZWNlaXZlQXV0aGVudGljYXRpb25DaGFsbGVuZ2UpOgorICAgICAg ICAoV2ViS2l0OjpEb3dubG9hZFByb3h5OjpzdGFydFRyYW5zZmVyKToKKyAgICAgICAgKiBVSVBy b2Nlc3MvV2ViQXBwbGljYXRpb25DYWNoZU1hbmFnZXJQcm94eS5jcHA6CisgICAgICAgIChXZWJL aXQ6OldlYkFwcGxpY2F0aW9uQ2FjaGVNYW5hZ2VyUHJveHk6OmdldEFwcGxpY2F0aW9uQ2FjaGVP cmlnaW5zKToKKyAgICAgICAgKFdlYktpdDo6V2ViQXBwbGljYXRpb25DYWNoZU1hbmFnZXJQcm94 eTo6ZGVsZXRlRW50cmllc0Zvck9yaWdpbik6CisgICAgICAgIChXZWJLaXQ6OldlYkFwcGxpY2F0 aW9uQ2FjaGVNYW5hZ2VyUHJveHk6OmRlbGV0ZUFsbEVudHJpZXMpOgorICAgICAgICAqIFVJUHJv Y2Vzcy9XZWJDb29raWVNYW5hZ2VyUHJveHkuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJDb29r aWVNYW5hZ2VyUHJveHk6OmdldEhvc3RuYW1lc1dpdGhDb29raWVzKToKKyAgICAgICAgKFdlYktp dDo6V2ViQ29va2llTWFuYWdlclByb3h5OjpnZXRIVFRQQ29va2llQWNjZXB0UG9saWN5KToKKyAg ICAgICAgKiBVSVByb2Nlc3MvV2ViRGF0YWJhc2VNYW5hZ2VyUHJveHkuY3BwOgorICAgICAgICAo V2ViS2l0OjpXZWJEYXRhYmFzZU1hbmFnZXJQcm94eTo6Z2V0RGF0YWJhc2VzQnlPcmlnaW4pOgor ICAgICAgICAoV2ViS2l0OjpXZWJEYXRhYmFzZU1hbmFnZXJQcm94eTo6Z2V0RGF0YWJhc2VPcmln aW5zKToKKyAgICAgICAgKFdlYktpdDo6V2ViRGF0YWJhc2VNYW5hZ2VyUHJveHk6OmRlbGV0ZURh dGFiYXNlV2l0aE5hbWVGb3JPcmlnaW4pOgorICAgICAgICAoV2ViS2l0OjpXZWJEYXRhYmFzZU1h bmFnZXJQcm94eTo6ZGVsZXRlRGF0YWJhc2VzRm9yT3JpZ2luKToKKyAgICAgICAgKFdlYktpdDo6 V2ViRGF0YWJhc2VNYW5hZ2VyUHJveHk6OmRlbGV0ZUFsbERhdGFiYXNlcyk6CisgICAgICAgIChX ZWJLaXQ6OldlYkRhdGFiYXNlTWFuYWdlclByb3h5OjpzZXRRdW90YUZvck9yaWdpbik6CisgICAg ICAgICogVUlQcm9jZXNzL1dlYkljb25EYXRhYmFzZS5jcHA6CisgICAgICAgIChXZWJLaXQ6Oldl Ykljb25EYXRhYmFzZTo6Z2V0TG9hZERlY2lzaW9uRm9ySWNvblVSTCk6CisgICAgICAgIChXZWJL aXQ6OldlYkljb25EYXRhYmFzZTo6ZGlkRmluaXNoVVJMSW1wb3J0KToKKyAgICAgICAgKiBVSVBy b2Nlc3MvV2ViS2V5VmFsdWVTdG9yYWdlTWFuYWdlclByb3h5LmNwcDoKKyAgICAgICAgKFdlYktp dDo6V2ViS2V5VmFsdWVTdG9yYWdlTWFuYWdlclByb3h5OjpnZXRLZXlWYWx1ZVN0b3JhZ2VPcmln aW5zKToKKyAgICAgICAgKFdlYktpdDo6V2ViS2V5VmFsdWVTdG9yYWdlTWFuYWdlclByb3h5Ojpk ZWxldGVFbnRyaWVzRm9yT3JpZ2luKToKKyAgICAgICAgKFdlYktpdDo6V2ViS2V5VmFsdWVTdG9y YWdlTWFuYWdlclByb3h5OjpkZWxldGVBbGxFbnRyaWVzKToKKyAgICAgICAgKiBVSVByb2Nlc3Mv V2ViTWVkaWFDYWNoZU1hbmFnZXJQcm94eS5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYk1lZGlh Q2FjaGVNYW5hZ2VyUHJveHk6OmdldEhvc3RuYW1lc1dpdGhNZWRpYUNhY2hlKToKKyAgICAgICAg KiBVSVByb2Nlc3MvV2ViUmVzb3VyY2VDYWNoZU1hbmFnZXJQcm94eS5jcHA6CisgICAgICAgIChX ZWJLaXQ6OldlYlJlc291cmNlQ2FjaGVNYW5hZ2VyUHJveHk6OmdldENhY2hlT3JpZ2lucyk6Cisg ICAgICAgIChXZWJLaXQ6OldlYlJlc291cmNlQ2FjaGVNYW5hZ2VyUHJveHk6OmNsZWFyQ2FjaGVG b3JPcmlnaW4pOgorICAgICAgICAoV2ViS2l0OjpXZWJSZXNvdXJjZUNhY2hlTWFuYWdlclByb3h5 OjpjbGVhckNhY2hlRm9yQWxsT3JpZ2lucyk6CisgICAgICAgIEFkZGVkIGJ1ZyBudW1iZXJzLgor CiAyMDEyLTA5LTA1ICBCZW5qYW1pbiBQb3VsYWluICA8YnBvdWxhaW5AYXBwbGUuY29tPgogCiAg ICAgICAgIE1vcmUgZml4ZXMgZm9yIFN0cmluZzo6b3BlcmF0b3IrPSgpIG9uIE1hYwpJbmRleDog U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYkFwcGxpY2F0aW9uQ2FjaGVNYW5hZ2VyUHJveHku Y3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJBcHBsaWNhdGlv bkNhY2hlTWFuYWdlclByb3h5LmNwcAkocmV2aXNpb24gMTI3NjI1KQorKysgU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL1dlYkFwcGxpY2F0aW9uQ2FjaGVNYW5hZ2VyUHJveHkuY3BwCSh3b3JraW5n IGNvcHkpCkBAIC02OSw3ICs2OSw3IEBAIHZvaWQgV2ViQXBwbGljYXRpb25DYWNoZU1hbmFnZXJQ cm94eTo6Z2UKICAgICB1aW50NjRfdCBjYWxsYmFja0lEID0gY2FsbGJhY2stPmNhbGxiYWNrSUQo KTsKICAgICBtX2FycmF5Q2FsbGJhY2tzLnNldChjYWxsYmFja0lELCBjYWxsYmFjay5yZWxlYXNl KCkpOwogCi0gICAgLy8gRklYTUUgKE11bHRpLVdlYlByb2Nlc3MpOiBUaGUgYXBwbGljYXRpb24g Y2FjaGUgc2hvdWxkbid0IGJlIHN0b3JlZCBpbiB0aGUgd2ViIHByb2Nlc3MuCisgICAgLy8gRklY TUUgKE11bHRpLVdlYlByb2Nlc3MpOiA8cmRhcjovL3Byb2JsZW0vMTIyMzk3NjU+IE1ha2UgbWFu aXB1bGF0aW5nIGNhY2hlIGluZm9ybWF0aW9uIHdvcmsgd2l0aCBwZXItdGFiIFdlYlByb2Nlc3Mu CiAgICAgbV93ZWJDb250ZXh0LT5zZW5kVG9BbGxQcm9jZXNzZXNSZWxhdW5jaGluZ1RoZW1JZk5l Y2Vzc2FyeShNZXNzYWdlczo6V2ViQXBwbGljYXRpb25DYWNoZU1hbmFnZXI6OkdldEFwcGxpY2F0 aW9uQ2FjaGVPcmlnaW5zKGNhbGxiYWNrSUQpKTsKIH0KICAgICAKQEAgLTg2LDEzICs4NiwxMyBA QCB2b2lkIFdlYkFwcGxpY2F0aW9uQ2FjaGVNYW5hZ2VyUHJveHk6OmRlCiAgICAgc2VjdXJpdHlP cmlnaW5EYXRhLmhvc3QgPSBvcmlnaW4tPmhvc3QoKTsKICAgICBzZWN1cml0eU9yaWdpbkRhdGEu cG9ydCA9IG9yaWdpbi0+cG9ydCgpOwogCi0gICAgLy8gRklYTUUgKE11bHRpLVdlYlByb2Nlc3Mp OiBUaGUgYXBwbGljYXRpb24gY2FjaGUgc2hvdWxkbid0IGJlIHN0b3JlZCBpbiB0aGUgd2ViIHBy b2Nlc3MuCisgICAgLy8gRklYTUUgKE11bHRpLVdlYlByb2Nlc3MpOiA8cmRhcjovL3Byb2JsZW0v MTIyMzk3NjU+IE1ha2UgbWFuaXB1bGF0aW5nIGNhY2hlIGluZm9ybWF0aW9uIHdvcmsgd2l0aCBw ZXItdGFiIFdlYlByb2Nlc3MuCiAgICAgbV93ZWJDb250ZXh0LT5zZW5kVG9BbGxQcm9jZXNzZXNS ZWxhdW5jaGluZ1RoZW1JZk5lY2Vzc2FyeShNZXNzYWdlczo6V2ViQXBwbGljYXRpb25DYWNoZU1h bmFnZXI6OkRlbGV0ZUVudHJpZXNGb3JPcmlnaW4oc2VjdXJpdHlPcmlnaW5EYXRhKSk7CiB9CiAK IHZvaWQgV2ViQXBwbGljYXRpb25DYWNoZU1hbmFnZXJQcm94eTo6ZGVsZXRlQWxsRW50cmllcygp CiB7Ci0gICAgLy8gRklYTUUgKE11bHRpLVdlYlByb2Nlc3MpOiBUaGUgYXBwbGljYXRpb24gY2Fj aGUgc2hvdWxkbid0IGJlIHN0b3JlZCBpbiB0aGUgd2ViIHByb2Nlc3MuCisgICAgLy8gRklYTUUg KE11bHRpLVdlYlByb2Nlc3MpOiA8cmRhcjovL3Byb2JsZW0vMTIyMzk3NjU+IE1ha2UgbWFuaXB1 bGF0aW5nIGNhY2hlIGluZm9ybWF0aW9uIHdvcmsgd2l0aCBwZXItdGFiIFdlYlByb2Nlc3MuCiAg ICAgbV93ZWJDb250ZXh0LT5zZW5kVG9BbGxQcm9jZXNzZXNSZWxhdW5jaGluZ1RoZW1JZk5lY2Vz c2FyeShNZXNzYWdlczo6V2ViQXBwbGljYXRpb25DYWNoZU1hbmFnZXI6OkRlbGV0ZUFsbEVudHJp ZXMoKSk7CiB9CiAKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJDb250ZXh0LmNw cAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViQ29udGV4dC5jcHAJ KHJldmlzaW9uIDEyNzYyNSkKKysrIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJDb250ZXh0 LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMjY0LDYgKzI2NCwxMiBAQCB2b2lkIFdlYkNvbnRleHQ6 OnNldFByb2Nlc3NNb2RlbChQcm9jZXNzCiAgICAgaWYgKCFtX3Byb2Nlc3Nlcy5pc0VtcHR5KCkp CiAgICAgICAgIENSQVNIKCk7CiAKKyNpZiAhRU5BQkxFKFBMVUdJTl9QUk9DRVNTKQorICAgIC8v IFBsdWdpbiBwcm9jZXNzIGlzIHJlcXVpcmVkIGZvciBtdWx0aXBsZSB3ZWIgcHJvY2VzcyBtb2Rl LgorICAgIGlmIChwcm9jZXNzTW9kZWwgIT0gUHJvY2Vzc01vZGVsU2hhcmVkU2Vjb25kYXJ5UHJv Y2VzcykKKyAgICAgICAgQ1JBU0goKTsKKyNlbmRpZgorCiAgICAgbV9wcm9jZXNzTW9kZWwgPSBw cm9jZXNzTW9kZWw7CiB9CiAKQEAgLTM2MCw3ICszNjYsNyBAQCBQYXNzUmVmUHRyPFdlYlByb2Nl c3NQcm94eT4gV2ViQ29udGV4dDo6CiAgICAgICAgIHBhaXI8U3RyaW5nLCBSZWZQdHI8QVBJT2Jq ZWN0PiA+JiBtZXNzYWdlID0gbV9wZW5kaW5nTWVzc2FnZXNUb1Bvc3RUb0luamVjdGVkQnVuZGxl W2ldOwogICAgICAgICBwcm9jZXNzLT5kZXByZWNhdGVkU2VuZChJbmplY3RlZEJ1bmRsZU1lc3Nh Z2U6OlBvc3RNZXNzYWdlLCAwLCBDb3JlSVBDOjpJbihtZXNzYWdlLmZpcnN0LCBXZWJDb250ZXh0 VXNlck1lc3NhZ2VFbmNvZGVyKG1lc3NhZ2Uuc2Vjb25kLmdldCgpKSkpOwogICAgIH0KLSAgICAv LyBGSVhNRSAoTXVsdGktV2ViUHJvY2Vzcyk6IFdoYXQgZG9lcyB0aGlzIG1lYW4gaW4gdGhlIGJy YXZlIG5ldyB3b3JsZD8KKyAgICAvLyBGSVhNRSAoTXVsdGktV2ViUHJvY2VzcykgKDk0MzY4KTog V2hhdCBkb2VzIHRoaXMgbWVhbiBpbiB0aGUgYnJhdmUgbmV3IHdvcmxkPwogICAgIG1fcGVuZGlu Z01lc3NhZ2VzVG9Qb3N0VG9JbmplY3RlZEJ1bmRsZS5jbGVhcigpOwogCiAgICAgcmV0dXJuIHBy b2Nlc3MucmVsZWFzZSgpOwpAQCAtNDQzLDcgKzQ0OSw3IEBAIHZvaWQgV2ViQ29udGV4dDo6ZGlz Y29ubmVjdFByb2Nlc3MoV2ViUHIKIAogICAgIG1fdmlzaXRlZExpbmtQcm92aWRlci5wcm9jZXNz RGlkQ2xvc2UocHJvY2Vzcyk7CiAKLSAgICAvLyBGSVhNRSAoTXVsdGktV2ViUHJvY2Vzcyk6IEFs bCB0aGUgaW52YWxpZGF0aW9uIGNhbGxzIGJlbG93IGFyZSBzdGlsbCBuZWNlc3NhcnkgaW4gbXVs dGktcHJvY2VzcyBtb2RlLCBidXQgdGhleSBzaG91bGQgb25seSBhZmZlY3QgZGF0YSBzdHJ1Y3R1 cmVzIHBlcnRhaW5pbmcgdG8gdGhlIHByb2Nlc3MgYmVpbmcgZGlzY29ubmVjdGVkLgorICAgIC8v IEZJWE1FIChNdWx0aS1XZWJQcm9jZXNzKTogPHJkYXI6Ly9wcm9ibGVtLzEyMjM5NzY1PiBBbGwg dGhlIGludmFsaWRhdGlvbiBjYWxscyBiZWxvdyBhcmUgc3RpbGwgbmVjZXNzYXJ5IGluIG11bHRp LXByb2Nlc3MgbW9kZSwgYnV0IHRoZXkgc2hvdWxkIG9ubHkgYWZmZWN0IGRhdGEgc3RydWN0dXJl cyBwZXJ0YWluaW5nIHRvIHRoZSBwcm9jZXNzIGJlaW5nIGRpc2Nvbm5lY3RlZC4KICAgICAvLyBD bGVhcmluZyBldmVyeXRoaW5nIGNhdXNlcyBhc3NlcnRpb24gZmFpbHVyZXMsIHNvIGl0J3MgbGVz cyB0cm91YmxlIHRvIHNraXAgdGhhdCBmb3Igbm93LgogICAgIGlmIChtX3Byb2Nlc3NNb2RlbCAh PSBQcm9jZXNzTW9kZWxTaGFyZWRTZWNvbmRhcnlQcm9jZXNzKSB7CiAgICAgICAgIFJlZlB0cjxX ZWJQcm9jZXNzUHJveHk+IHByb3RlY3QocHJvY2Vzcyk7CkBAIC01MDMsNiArNTA5LDggQEAgUGFz c1JlZlB0cjxXZWJQYWdlUHJveHk+IFdlYkNvbnRleHQ6OmNyZQogICAgICAgICBwcm9jZXNzID0g bV9wcm9jZXNzZXNbMF07CiAgICAgfSBlbHNlIHsKICAgICAgICAgLy8gRklYTUUgKE11bHRpLVdl YlByb2Nlc3MpOiBBZGQgbG9naWMgZm9yIHNoYXJpbmcgYSBwcm9jZXNzLgorICAgICAgICAvLyA8 cmRhcjovL3Byb2JsZW0vMTIyMTgxNjQ+IHdpbmRvdy5vcGVuKCkgc2hvdWxkIGNyZWF0ZSBwYWdl cyBpbiB0aGUgc2FtZSBwcm9jZXNzLgorICAgICAgICAvLyA8cmRhcjovL3Byb2JsZW0vMTIyMzk2 NjE+IENvbnNpZGVyIGxpbWl0aW5nIHRoZSBudW1iZXIgb2Ygd2ViIHByb2Nlc3NlcyBpbiBwZXIt dGFiIHByb2Nlc3MgbW9kZWwKICAgICAgICAgaWYgKG1faGF2ZUluaXRpYWxFbXB0eVByb2Nlc3Mp IHsKICAgICAgICAgICAgIHByb2Nlc3MgPSBtX3Byb2Nlc3Nlcy5sYXN0KCk7CiAgICAgICAgICAg ICBtX2hhdmVJbml0aWFsRW1wdHlQcm9jZXNzID0gZmFsc2U7CkBAIC01NDYsNyArNTU0LDcgQEAg RG93bmxvYWRQcm94eSogV2ViQ29udGV4dDo6ZG93bmxvYWQoV2ViUAogICAgICAgICByZXR1cm4g ZG93bmxvYWQ7CiAKICAgICB9IGVsc2UgewotICAgICAgICAvLyBGSVhNRTogKE11bHRpLVdlYlBy b2Nlc3MpOiBJbXBsZW1lbnQuCisgICAgICAgIC8vIEZJWE1FIChNdWx0aS1XZWJQcm9jZXNzKTog PHJkYXI6Ly9wcm9ibGVtLzEyMjM5NDgzPiBNYWtlIGRvd25sb2FkaW5nIHdvcmsuCiAgICAgICAg IHJldHVybiAwOwogICAgIH0KIH0KQEAgLTkzMiw3ICs5NDAsNyBAQCB2b2lkIFdlYkNvbnRleHQ6 OmdldFdlYkNvcmVTdGF0aXN0aWNzKFBhCiAgICAgICAgIG1fcHJvY2Vzc2VzWzBdLT5zZW5kKE1l c3NhZ2VzOjpXZWJQcm9jZXNzOjpHZXRXZWJDb3JlU3RhdGlzdGljcyhjYWxsYmFja0lEKSwgMCk7 CiAKICAgICB9IGVsc2UgewotICAgICAgICAvLyBGSVhNRSAoTXVsdGktV2ViUHJvY2Vzcyk6IElt cGxlbWVudC4KKyAgICAgICAgLy8gRklYTUUgKE11bHRpLVdlYlByb2Nlc3MpOiA8cmRhcjovL3By b2JsZW0vMTIyMzk0ODM+IE1ha2UgZG93bmxvYWRpbmcgd29yay4KICAgICAgICAgY2FsbGJhY2st PmludmFsaWRhdGUoKTsKICAgICB9CiB9CkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mv V2ViQ29va2llTWFuYWdlclByb3h5LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvV2ViQ29va2llTWFuYWdlclByb3h5LmNwcAkocmV2aXNpb24gMTI3NjI1KQorKysg U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYkNvb2tpZU1hbmFnZXJQcm94eS5jcHAJKHdvcmtp bmcgY29weSkKQEAgLTc2LDcgKzc2LDcgQEAgdm9pZCBXZWJDb29raWVNYW5hZ2VyUHJveHk6Omdl dEhvc3RuYW1lcwogICAgIHVpbnQ2NF90IGNhbGxiYWNrSUQgPSBjYWxsYmFjay0+Y2FsbGJhY2tJ RCgpOwogICAgIG1fYXJyYXlDYWxsYmFja3Muc2V0KGNhbGxiYWNrSUQsIGNhbGxiYWNrLnJlbGVh c2UoKSk7CiAKLSAgICAvLyBGSVhNRSAoTXVsdGktV2ViUHJvY2Vzcyk6IENvb2tpZXMgc2hvdWxk bid0IGJlIHN0b3JlZCBpbiB0aGUgd2ViIHByb2Nlc3MuCisgICAgLy8gRklYTUUgKE11bHRpLVdl YlByb2Nlc3MpOiA8cmRhcjovL3Byb2JsZW0vMTIyMzk3NjU+IENvb2tpZXMgc2hvdWxkbid0IGJl IHN0b3JlZCBpbiB0aGUgd2ViIHByb2Nlc3MuCiAgICAgbV93ZWJDb250ZXh0LT5zZW5kVG9BbGxQ cm9jZXNzZXNSZWxhdW5jaGluZ1RoZW1JZk5lY2Vzc2FyeShNZXNzYWdlczo6V2ViQ29va2llTWFu YWdlcjo6R2V0SG9zdG5hbWVzV2l0aENvb2tpZXMoY2FsbGJhY2tJRCkpOwogfQogICAgIApAQCAt MTQ1LDcgKzE0NSw4IEBAIHZvaWQgV2ViQ29va2llTWFuYWdlclByb3h5OjpnZXRIVFRQQ29va2kK ICAgICB1aW50NjRfdCBjYWxsYmFja0lEID0gY2FsbGJhY2stPmNhbGxiYWNrSUQoKTsKICAgICBt X2h0dHBDb29raWVBY2NlcHRQb2xpY3lDYWxsYmFja3Muc2V0KGNhbGxiYWNrSUQsIGNhbGxiYWNr LnJlbGVhc2UoKSk7CiAKLSAgICAvLyBGSVhNRSAoTXVsdGktV2ViUHJvY2Vzcyk6IENvb2tpZXMg c2hvdWxkbid0IGJlIHN0b3JlZCBpbiB0aGUgd2ViIHByb2Nlc3MuCisgICAgLy8gRklYTUUgKE11 bHRpLVdlYlByb2Nlc3MpOiA8cmRhcjovL3Byb2JsZW0vMTIyNDAxODk+IE1ha2UgY29va2llIHBv bGljaWVzIHdvcmsgd2l0aCBwZXItdGFiIFdlYlByb2Nlc3MuCisgICAgLy8gV2UgY2FuJ3QgYmVy IGFza2luZyBhbGwgd2ViIHByb2Nlc3NlcyBmb3IgdGhpcyBpbmZvcm1hdGlvbi4KICAgICBtX3dl YkNvbnRleHQtPnNlbmRUb0FsbFByb2Nlc3Nlc1JlbGF1bmNoaW5nVGhlbUlmTmVjZXNzYXJ5KE1l c3NhZ2VzOjpXZWJDb29raWVNYW5hZ2VyOjpHZXRIVFRQQ29va2llQWNjZXB0UG9saWN5KGNhbGxi YWNrSUQpKTsKIH0KIApJbmRleDogU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYkRhdGFiYXNl TWFuYWdlclByb3h5LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mv V2ViRGF0YWJhc2VNYW5hZ2VyUHJveHkuY3BwCShyZXZpc2lvbiAxMjc2MjUpCisrKyBTb3VyY2Uv V2ViS2l0Mi9VSVByb2Nlc3MvV2ViRGF0YWJhc2VNYW5hZ2VyUHJveHkuY3BwCSh3b3JraW5nIGNv cHkpCkBAIC0xMjEsNyArMTIxLDcgQEAgdm9pZCBXZWJEYXRhYmFzZU1hbmFnZXJQcm94eTo6Z2V0 RGF0YWJhcwogICAgIHVpbnQ2NF90IGNhbGxiYWNrSUQgPSBjYWxsYmFjay0+Y2FsbGJhY2tJRCgp OwogICAgIG1fYXJyYXlDYWxsYmFja3Muc2V0KGNhbGxiYWNrSUQsIGNhbGxiYWNrLnJlbGVhc2Uo KSk7CiAKLSAgICAvLyBGSVhNRSAoTXVsdGktV2ViUHJvY2Vzcyk6IERhdGFiYXNlcyBzaG91bGRu J3QgYmUgc3RvcmVkIGluIHRoZSB3ZWIgcHJvY2Vzcy4KKyAgICAvLyBGSVhNRSAoTXVsdGktV2Vi UHJvY2Vzcyk6IDxyZGFyOi8vcHJvYmxlbS8xMjIzOTc2NT4gRGF0YWJhc2VzIHNob3VsZG4ndCBi ZSBzdG9yZWQgaW4gdGhlIHdlYiBwcm9jZXNzLgogICAgIG1fd2ViQ29udGV4dC0+c2VuZFRvQWxs UHJvY2Vzc2VzUmVsYXVuY2hpbmdUaGVtSWZOZWNlc3NhcnkoTWVzc2FnZXM6OldlYkRhdGFiYXNl TWFuYWdlcjo6R2V0RGF0YWJhc2VzQnlPcmlnaW4oY2FsbGJhY2tJRCkpOwogfQogCkBAIC0xNzQs NyArMTc0LDcgQEAgdm9pZCBXZWJEYXRhYmFzZU1hbmFnZXJQcm94eTo6Z2V0RGF0YWJhcwogICAg IHVpbnQ2NF90IGNhbGxiYWNrSUQgPSBjYWxsYmFjay0+Y2FsbGJhY2tJRCgpOwogICAgIG1fYXJy YXlDYWxsYmFja3Muc2V0KGNhbGxiYWNrSUQsIGNhbGxiYWNrLnJlbGVhc2UoKSk7CiAKLSAgICAv LyBGSVhNRSAoTXVsdGktV2ViUHJvY2Vzcyk6IERhdGFiYXNlcyBzaG91bGRuJ3QgYmUgc3RvcmVk IGluIHRoZSB3ZWIgcHJvY2Vzcy4KKyAgICAvLyBGSVhNRSAoTXVsdGktV2ViUHJvY2Vzcyk6IDxy ZGFyOi8vcHJvYmxlbS8xMjIzOTc2NT4gRGF0YWJhc2VzIHNob3VsZG4ndCBiZSBzdG9yZWQgaW4g dGhlIHdlYiBwcm9jZXNzLgogICAgIG1fd2ViQ29udGV4dC0+c2VuZFRvQWxsUHJvY2Vzc2VzUmVs YXVuY2hpbmdUaGVtSWZOZWNlc3NhcnkoTWVzc2FnZXM6OldlYkRhdGFiYXNlTWFuYWdlcjo6R2V0 RGF0YWJhc2VPcmlnaW5zKGNhbGxiYWNrSUQpKTsKIH0KIApAQCAtMTk3LDI1ICsxOTcsMjUgQEAg dm9pZCBXZWJEYXRhYmFzZU1hbmFnZXJQcm94eTo6ZGlkR2V0RGF0YQogCiB2b2lkIFdlYkRhdGFi YXNlTWFuYWdlclByb3h5OjpkZWxldGVEYXRhYmFzZVdpdGhOYW1lRm9yT3JpZ2luKGNvbnN0IFN0 cmluZyYgZGF0YWJhc2VJZGVudGlmaWVyLCBXZWJTZWN1cml0eU9yaWdpbiogb3JpZ2luKQogewot ICAgIC8vIEZJWE1FIChNdWx0aS1XZWJQcm9jZXNzKTogRGF0YWJhc2VzIHNob3VsZG4ndCBiZSBz dG9yZWQgaW4gdGhlIHdlYiBwcm9jZXNzLgorICAgIC8vIEZJWE1FIChNdWx0aS1XZWJQcm9jZXNz KTogPHJkYXI6Ly9wcm9ibGVtLzc4NTU2OTY+IERhdGFiYXNlcyBzaG91bGRuJ3QgYmUgc3RvcmVk IGluIHRoZSB3ZWIgcHJvY2Vzcy4KICAgICBtX3dlYkNvbnRleHQtPnNlbmRUb0FsbFByb2Nlc3Nl c1JlbGF1bmNoaW5nVGhlbUlmTmVjZXNzYXJ5KE1lc3NhZ2VzOjpXZWJEYXRhYmFzZU1hbmFnZXI6 OkRlbGV0ZURhdGFiYXNlV2l0aE5hbWVGb3JPcmlnaW4oZGF0YWJhc2VJZGVudGlmaWVyLCBvcmln aW4tPmRhdGFiYXNlSWRlbnRpZmllcigpKSk7CiB9CiAKIHZvaWQgV2ViRGF0YWJhc2VNYW5hZ2Vy UHJveHk6OmRlbGV0ZURhdGFiYXNlc0Zvck9yaWdpbihXZWJTZWN1cml0eU9yaWdpbiogb3JpZ2lu KQogewotICAgIC8vIEZJWE1FIChNdWx0aS1XZWJQcm9jZXNzKTogRGF0YWJhc2VzIHNob3VsZG4n dCBiZSBzdG9yZWQgaW4gdGhlIHdlYiBwcm9jZXNzLgorICAgIC8vIEZJWE1FIChNdWx0aS1XZWJQ cm9jZXNzKTogPHJkYXI6Ly9wcm9ibGVtLzc4NTU2OTY+IERhdGFiYXNlcyBzaG91bGRuJ3QgYmUg c3RvcmVkIGluIHRoZSB3ZWIgcHJvY2Vzcy4KICAgICBtX3dlYkNvbnRleHQtPnNlbmRUb0FsbFBy b2Nlc3Nlc1JlbGF1bmNoaW5nVGhlbUlmTmVjZXNzYXJ5KE1lc3NhZ2VzOjpXZWJEYXRhYmFzZU1h bmFnZXI6OkRlbGV0ZURhdGFiYXNlc0Zvck9yaWdpbihvcmlnaW4tPmRhdGFiYXNlSWRlbnRpZmll cigpKSk7CiB9CiAKIHZvaWQgV2ViRGF0YWJhc2VNYW5hZ2VyUHJveHk6OmRlbGV0ZUFsbERhdGFi YXNlcygpCiB7Ci0gICAgLy8gRklYTUUgKE11bHRpLVdlYlByb2Nlc3MpOiBEYXRhYmFzZXMgc2hv dWxkbid0IGJlIHN0b3JlZCBpbiB0aGUgd2ViIHByb2Nlc3MuCisgICAgLy8gRklYTUUgKE11bHRp LVdlYlByb2Nlc3MpOiA8cmRhcjovL3Byb2JsZW0vNzg1NTY5Nj4gRGF0YWJhc2VzIHNob3VsZG4n dCBiZSBzdG9yZWQgaW4gdGhlIHdlYiBwcm9jZXNzLgogICAgIG1fd2ViQ29udGV4dC0+c2VuZFRv QWxsUHJvY2Vzc2VzUmVsYXVuY2hpbmdUaGVtSWZOZWNlc3NhcnkoTWVzc2FnZXM6OldlYkRhdGFi YXNlTWFuYWdlcjo6RGVsZXRlQWxsRGF0YWJhc2VzKCkpOwogfQogCiB2b2lkIFdlYkRhdGFiYXNl TWFuYWdlclByb3h5OjpzZXRRdW90YUZvck9yaWdpbihXZWJTZWN1cml0eU9yaWdpbiogb3JpZ2lu LCB1aW50NjRfdCBxdW90YSkKIHsKLSAgICAvLyBGSVhNRSAoTXVsdGktV2ViUHJvY2Vzcyk6IERh dGFiYXNlcyBzaG91bGRuJ3QgYmUgc3RvcmVkIGluIHRoZSB3ZWIgcHJvY2Vzcy4KKyAgICAvLyBG SVhNRSAoTXVsdGktV2ViUHJvY2Vzcyk6IDxyZGFyOi8vcHJvYmxlbS83ODU1Njk2PiBEYXRhYmFz ZXMgc2hvdWxkbid0IGJlIHN0b3JlZCBpbiB0aGUgd2ViIHByb2Nlc3MuCiAgICAgbV93ZWJDb250 ZXh0LT5zZW5kVG9BbGxQcm9jZXNzZXNSZWxhdW5jaGluZ1RoZW1JZk5lY2Vzc2FyeShNZXNzYWdl czo6V2ViRGF0YWJhc2VNYW5hZ2VyOjpTZXRRdW90YUZvck9yaWdpbihvcmlnaW4tPmRhdGFiYXNl SWRlbnRpZmllcigpLCBxdW90YSkpOwogfQogCkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nl c3MvV2ViSWNvbkRhdGFiYXNlLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvV2ViSWNvbkRhdGFiYXNlLmNwcAkocmV2aXNpb24gMTI3NjI1KQorKysgU291cmNlL1dl YktpdDIvVUlQcm9jZXNzL1dlYkljb25EYXRhYmFzZS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTE2 MSw3ICsxNjEsNyBAQCB2b2lkIFdlYkljb25EYXRhYmFzZTo6Z2V0TG9hZERlY2lzaW9uRm9yCiAg ICAgICAgIHJldHVybjsKIAogICAgIGlmICghbV9pY29uRGF0YWJhc2VJbXBsIHx8ICFtX2ljb25E YXRhYmFzZUltcGwtPmlzT3BlbigpIHx8IGljb25VUkwuaXNFbXB0eSgpKSB7Ci0gICAgICAgIC8v IEZJWE1FIChNdWx0aS1XZWJQcm9jZXNzKTogV2UgbmVlZCB0byBrbm93IHdoaWNoIGNvbm5lY3Rp b24gdG8gc2VuZCB0aGlzIG1lc3NhZ2UgdG8uCisgICAgICAgIC8vIEZJWE1FIChNdWx0aS1XZWJQ cm9jZXNzKTogPHJkYXI6Ly9wcm9ibGVtLzEyMjQwMjIzPiBXZSBuZWVkIHRvIGtub3cgd2hpY2gg Y29ubmVjdGlvbiB0byBzZW5kIHRoaXMgbWVzc2FnZSB0by4KICAgICAgICAgbV93ZWJDb250ZXh0 LT5zZW5kVG9BbGxQcm9jZXNzZXMoTWVzc2FnZXM6OldlYkljb25EYXRhYmFzZVByb3h5OjpSZWNl aXZlZEljb25Mb2FkRGVjaXNpb24oc3RhdGljX2Nhc3Q8aW50PihJY29uTG9hZE5vKSwgY2FsbGJh Y2tJRCkpOwogICAgICAgICByZXR1cm47CiAgICAgfQpAQCAtMTc2LDcgKzE3Niw3IEBAIHZvaWQg V2ViSWNvbkRhdGFiYXNlOjpnZXRMb2FkRGVjaXNpb25Gb3IKICAgICAgICAgcmV0dXJuOyAgICAK ICAgICB9CiAKLSAgICAvLyBGSVhNRSAoTXVsdGktV2ViUHJvY2Vzcyk6IFdlIG5lZWQgdG8ga25v dyB3aGljaCBjb25uZWN0aW9uIHRvIHNlbmQgdGhpcyBtZXNzYWdlIHRvLgorICAgIC8vIEZJWE1F IChNdWx0aS1XZWJQcm9jZXNzKTogPHJkYXI6Ly9wcm9ibGVtLzEyMjQwMjIzPiBXZSBuZWVkIHRv IGtub3cgd2hpY2ggY29ubmVjdGlvbiB0byBzZW5kIHRoaXMgbWVzc2FnZSB0by4KICAgICBtX3dl YkNvbnRleHQtPnNlbmRUb0FsbFByb2Nlc3NlcyhNZXNzYWdlczo6V2ViSWNvbkRhdGFiYXNlUHJv eHk6OlJlY2VpdmVkSWNvbkxvYWREZWNpc2lvbigoaW50KWRlY2lzaW9uLCBjYWxsYmFja0lEKSk7 CiB9CiAKQEAgLTI2OSw3ICsyNjksNyBAQCB2b2lkIFdlYkljb25EYXRhYmFzZTo6ZGlkRmluaXNo VVJMSW1wb3J0CiAgICAgICAgIC8vIERlY2lzaW9ucyBzaG91bGQgbmV2ZXIgYmUgdW5rbm93biBh ZnRlciB0aGUgaW5pdGFsIGltcG9ydCBpcyBjb21wbGV0ZQogICAgICAgICBBU1NFUlQoZGVjaXNp b24gIT0gSWNvbkxvYWRVbmtub3duKTsKIAotICAgICAgICAvLyBGSVhNRSAoTXVsdGktV2ViUHJv Y2Vzcyk6IFdlIG5lZWQgdG8ga25vdyB3aGljaCBjb25uZWN0aW9uIHRvIHNlbmQgdGhpcyBtZXNz YWdlIHRvLgorICAgICAgICAvLyBGSVhNRSAoTXVsdGktV2ViUHJvY2Vzcyk6IDxyZGFyOi8vcHJv YmxlbS8xMjI0MDIyMz4gV2UgbmVlZCB0byBrbm93IHdoaWNoIGNvbm5lY3Rpb24gdG8gc2VuZCB0 aGlzIG1lc3NhZ2UgdG8uCiAgICAgICAgIG1fd2ViQ29udGV4dC0+c2VuZFRvQWxsUHJvY2Vzc2Vz KE1lc3NhZ2VzOjpXZWJJY29uRGF0YWJhc2VQcm94eTo6UmVjZWl2ZWRJY29uTG9hZERlY2lzaW9u KHN0YXRpY19jYXN0PGludD4oZGVjaXNpb24pLCBpLT5maXJzdCkpOwogICAgIH0KICAgICAKSW5k ZXg6IFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJLZXlWYWx1ZVN0b3JhZ2VNYW5hZ2VyUHJv eHkuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJLZXlWYWx1 ZVN0b3JhZ2VNYW5hZ2VyUHJveHkuY3BwCShyZXZpc2lvbiAxMjc2MjUpCisrKyBTb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvV2ViS2V5VmFsdWVTdG9yYWdlTWFuYWdlclByb3h5LmNwcAkod29ya2lu ZyBjb3B5KQpAQCAtNjgsNyArNjgsNyBAQCB2b2lkIFdlYktleVZhbHVlU3RvcmFnZU1hbmFnZXJQ cm94eTo6Z2V0CiAgICAgdWludDY0X3QgY2FsbGJhY2tJRCA9IGNhbGxiYWNrLT5jYWxsYmFja0lE KCk7CiAgICAgbV9hcnJheUNhbGxiYWNrcy5zZXQoY2FsbGJhY2tJRCwgY2FsbGJhY2sucmVsZWFz ZSgpKTsKIAotICAgIC8vIEZJWE1FIChNdWx0aS1XZWJQcm9jZXNzKTogU2hvdWxkIGtleS12YWx1 ZSBzdG9yYWdlIGJlIGhhbmRsZWQgaW4gdGhlIHdlYiBwcm9jZXNzPworICAgIC8vIEZJWE1FIChN dWx0aS1XZWJQcm9jZXNzKTogPHJkYXI6Ly9wcm9ibGVtLzEyMjM5NzY1PiBTaG91bGQga2V5LXZh bHVlIHN0b3JhZ2UgYmUgaGFuZGxlZCBpbiB0aGUgd2ViIHByb2Nlc3M/CiAgICAgbV93ZWJDb250 ZXh0LT5zZW5kVG9BbGxQcm9jZXNzZXNSZWxhdW5jaGluZ1RoZW1JZk5lY2Vzc2FyeShNZXNzYWdl czo6V2ViS2V5VmFsdWVTdG9yYWdlTWFuYWdlcjo6R2V0S2V5VmFsdWVTdG9yYWdlT3JpZ2lucyhj YWxsYmFja0lEKSk7CiB9CiAgICAgCkBAIC04NSwxMyArODUsMTMgQEAgdm9pZCBXZWJLZXlWYWx1 ZVN0b3JhZ2VNYW5hZ2VyUHJveHk6OmRlbAogICAgIHNlY3VyaXR5T3JpZ2luRGF0YS5ob3N0ID0g b3JpZ2luLT5ob3N0KCk7CiAgICAgc2VjdXJpdHlPcmlnaW5EYXRhLnBvcnQgPSBvcmlnaW4tPnBv cnQoKTsKIAotICAgIC8vIEZJWE1FIChNdWx0aS1XZWJQcm9jZXNzKTogU2hvdWxkIGtleS12YWx1 ZSBzdG9yYWdlIGJlIGhhbmRsZWQgaW4gdGhlIHdlYiBwcm9jZXNzPworICAgIC8vIEZJWE1FIChN dWx0aS1XZWJQcm9jZXNzKTogPHJkYXI6Ly9wcm9ibGVtLzEyMjM5NzY1PiBTaG91bGQga2V5LXZh bHVlIHN0b3JhZ2UgYmUgaGFuZGxlZCBpbiB0aGUgd2ViIHByb2Nlc3M/CiAgICAgbV93ZWJDb250 ZXh0LT5zZW5kVG9BbGxQcm9jZXNzZXNSZWxhdW5jaGluZ1RoZW1JZk5lY2Vzc2FyeShNZXNzYWdl czo6V2ViS2V5VmFsdWVTdG9yYWdlTWFuYWdlcjo6RGVsZXRlRW50cmllc0Zvck9yaWdpbihzZWN1 cml0eU9yaWdpbkRhdGEpKTsKIH0KIAogdm9pZCBXZWJLZXlWYWx1ZVN0b3JhZ2VNYW5hZ2VyUHJv eHk6OmRlbGV0ZUFsbEVudHJpZXMoKQogewotICAgIC8vIEZJWE1FIChNdWx0aS1XZWJQcm9jZXNz KTogU2hvdWxkIGtleS12YWx1ZSBzdG9yYWdlIGJlIGhhbmRsZWQgaW4gdGhlIHdlYiBwcm9jZXNz PworICAgIC8vIEZJWE1FIChNdWx0aS1XZWJQcm9jZXNzKTogPHJkYXI6Ly9wcm9ibGVtLzEyMjM5 NzY1PiBTaG91bGQga2V5LXZhbHVlIHN0b3JhZ2UgYmUgaGFuZGxlZCBpbiB0aGUgd2ViIHByb2Nl c3M/CiAgICAgbV93ZWJDb250ZXh0LT5zZW5kVG9BbGxQcm9jZXNzZXNSZWxhdW5jaGluZ1RoZW1J Zk5lY2Vzc2FyeShNZXNzYWdlczo6V2ViS2V5VmFsdWVTdG9yYWdlTWFuYWdlcjo6RGVsZXRlQWxs RW50cmllcygpKTsKIH0KIApJbmRleDogU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYk1lZGlh Q2FjaGVNYW5hZ2VyUHJveHkuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1VJUHJv Y2Vzcy9XZWJNZWRpYUNhY2hlTWFuYWdlclByb3h5LmNwcAkocmV2aXNpb24gMTI3NjI1KQorKysg U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYk1lZGlhQ2FjaGVNYW5hZ2VyUHJveHkuY3BwCSh3 b3JraW5nIGNvcHkpCkBAIC02Nyw4ICs2Nyw3IEBAIHZvaWQgV2ViTWVkaWFDYWNoZU1hbmFnZXJQ cm94eTo6Z2V0SG9zdG4KICAgICB1aW50NjRfdCBjYWxsYmFja0lEID0gY2FsbGJhY2stPmNhbGxi YWNrSUQoKTsKICAgICBtX2FycmF5Q2FsbGJhY2tzLnNldChjYWxsYmFja0lELCBjYWxsYmFjay5y ZWxlYXNlKCkpOwogCi0gICAgLy8gRklYTUUgKE11bHRpLVdlYlByb2Nlc3MpOiBXaGVuIHdlJ3Jl IHNlbmRpbmcgdGhpcyB0byBtdWx0aXBsZSBwcm9jZXNzZXMsIHdlIG5lZWQgdG8gYWdncmVnYXRl IHRoZQotICAgIC8vIGNhbGxiYWNrIGRhdGEgd2hlbiBpdCBjb21lcyBiYWNrLgorICAgIC8vIEZJ WE1FIChNdWx0aS1XZWJQcm9jZXNzKTogPHJkYXI6Ly9wcm9ibGVtLzEyMjM5NzY1PiBXaGVuIHdl J3JlIHNlbmRpbmcgdGhpcyB0byBtdWx0aXBsZSBwcm9jZXNzZXMsIHdlIG5lZWQgdG8gYWdncmVn YXRlIHRoZSBjYWxsYmFjayBkYXRhIHdoZW4gaXQgY29tZXMgYmFjay4KICAgICBtX3dlYkNvbnRl eHQtPnNlbmRUb0FsbFByb2Nlc3Nlc1JlbGF1bmNoaW5nVGhlbUlmTmVjZXNzYXJ5KE1lc3NhZ2Vz OjpXZWJNZWRpYUNhY2hlTWFuYWdlcjo6R2V0SG9zdG5hbWVzV2l0aE1lZGlhQ2FjaGUoY2FsbGJh Y2tJRCkpOwogfQogICAgIApJbmRleDogU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlJlc291 cmNlQ2FjaGVNYW5hZ2VyUHJveHkuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1VJ UHJvY2Vzcy9XZWJSZXNvdXJjZUNhY2hlTWFuYWdlclByb3h5LmNwcAkocmV2aXNpb24gMTI3NjI1 KQorKysgU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlJlc291cmNlQ2FjaGVNYW5hZ2VyUHJv eHkuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC02OCw3ICs2OCw3IEBAIHZvaWQgV2ViUmVzb3VyY2VD YWNoZU1hbmFnZXJQcm94eTo6Z2V0Q2EKICAgICB1aW50NjRfdCBjYWxsYmFja0lEID0gY2FsbGJh Y2stPmNhbGxiYWNrSUQoKTsKICAgICBtX2FycmF5Q2FsbGJhY2tzLnNldChjYWxsYmFja0lELCBj YWxsYmFjay5yZWxlYXNlKCkpOwogCi0gICAgLy8gRklYTUUgKE11bHRpLVdlYlByb2Nlc3MpOiBX aGVuIG11bHRpLXByb2Nlc3MgaXMgZW5hYmxlZCwgd2UgbmVlZCB0byBhZ2dyZWdhdGUgdGhlIGNh bGxiYWNrIGRhdGEgZnJvbSBhbGwgcHJvY2Vzc2VzLgorICAgIC8vIEZJWE1FIChNdWx0aS1XZWJQ cm9jZXNzKTogPHJkYXI6Ly9wcm9ibGVtLzEyMjM5NzY1PiBXaGVuIG11bHRpLXByb2Nlc3MgaXMg ZW5hYmxlZCwgd2UgbmVlZCB0byBhZ2dyZWdhdGUgdGhlIGNhbGxiYWNrIGRhdGEgZnJvbSBhbGwg cHJvY2Vzc2VzLgogICAgIG1fd2ViQ29udGV4dC0+c2VuZFRvQWxsUHJvY2Vzc2VzUmVsYXVuY2hp bmdUaGVtSWZOZWNlc3NhcnkoTWVzc2FnZXM6OldlYlJlc291cmNlQ2FjaGVNYW5hZ2VyOjpHZXRD YWNoZU9yaWdpbnMoY2FsbGJhY2tJRCkpOwogfQogCkBAIC04NSwxMSArODUsMTMgQEAgdm9pZCBX ZWJSZXNvdXJjZUNhY2hlTWFuYWdlclByb3h5OjpjbGVhcgogICAgIHNlY3VyaXR5T3JpZ2luLmhv c3QgPSBvcmlnaW4tPmhvc3QoKTsKICAgICBzZWN1cml0eU9yaWdpbi5wb3J0ID0gb3JpZ2luLT5w b3J0KCk7CiAKKyAgICAvLyBGSVhNRSAoTXVsdGktV2ViUHJvY2Vzcyk6IDxyZGFyOi8vcHJvYmxl bS8xMjIzOTc2NT4gVGhlcmUgaXMgbm8gbmVlZCB0byByZWxhdW5jaCBhbGwgcHJvY2Vzc2VzLiBP bmUgcHJvY2VzcyB0byB0YWtlIGNhcmUgb2YgcGVyc2lzdGVudCBjYWNoZSBpcyBlbm91Z2guCiAg ICAgbV93ZWJDb250ZXh0LT5zZW5kVG9BbGxQcm9jZXNzZXNSZWxhdW5jaGluZ1RoZW1JZk5lY2Vz c2FyeShNZXNzYWdlczo6V2ViUmVzb3VyY2VDYWNoZU1hbmFnZXI6OkNsZWFyQ2FjaGVGb3JPcmln aW4oc2VjdXJpdHlPcmlnaW4sIGNhY2hlc1RvQ2xlYXIpKTsKIH0KIAogdm9pZCBXZWJSZXNvdXJj ZUNhY2hlTWFuYWdlclByb3h5OjpjbGVhckNhY2hlRm9yQWxsT3JpZ2lucyhSZXNvdXJjZUNhY2hl c1RvQ2xlYXIgY2FjaGVzVG9DbGVhcikKIHsKKyAgICAvLyBGSVhNRSAoTXVsdGktV2ViUHJvY2Vz cyk6IDxyZGFyOi8vcHJvYmxlbS8xMjIzOTc2NT4gVGhlcmUgaXMgbm8gbmVlZCB0byByZWxhdW5j aCBhbGwgcHJvY2Vzc2VzLiBPbmUgcHJvY2VzcyB0byB0YWtlIGNhcmUgb2YgcGVyc2lzdGVudCBj YWNoZSBpcyBlbm91Z2guCiAgICAgbV93ZWJDb250ZXh0LT5zZW5kVG9BbGxQcm9jZXNzZXNSZWxh dW5jaGluZ1RoZW1JZk5lY2Vzc2FyeShNZXNzYWdlczo6V2ViUmVzb3VyY2VDYWNoZU1hbmFnZXI6 OkNsZWFyQ2FjaGVGb3JBbGxPcmlnaW5zKGNhY2hlc1RvQ2xlYXIpKTsKIH0KIApJbmRleDogU291 cmNlL1dlYktpdDIvVUlQcm9jZXNzL0Rvd25sb2Fkcy9Eb3dubG9hZFByb3h5LmNwcAo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvRG93bmxvYWRzL0Rvd25sb2FkUHJveHku Y3BwCShyZXZpc2lvbiAxMjc2MjUpCisrKyBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvRG93bmxv YWRzL0Rvd25sb2FkUHJveHkuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC02NSw3ICs2NSw3IEBAIHZv aWQgRG93bmxvYWRQcm94eTo6Y2FuY2VsKCkKICAgICBpZiAoIW1fd2ViQ29udGV4dCkKICAgICAg ICAgcmV0dXJuOwogCi0gICAgLy8gRklYTUUgKE11bHRpLVdlYlByb2Nlc3MpOiBEb3dubG9hZHMg c2hvdWxkbid0IGJlIGhhbmRsZWQgaW4gdGhlIHdlYiBwcm9jZXNzLgorICAgIC8vIEZJWE1FIChN dWx0aS1XZWJQcm9jZXNzKTogPHJkYXI6Ly9wcm9ibGVtLzEyMjM5NDgzPiBEb3dubG9hZHMgc2hv dWxkbid0IGJlIGhhbmRsZWQgaW4gdGhlIHdlYiBwcm9jZXNzLgogICAgIG1fd2ViQ29udGV4dC0+ c2VuZFRvQWxsUHJvY2Vzc2VzKE1lc3NhZ2VzOjpXZWJQcm9jZXNzOjpDYW5jZWxEb3dubG9hZCht X2Rvd25sb2FkSUQpKTsKIH0KIApAQCAtOTgsNyArOTgsOCBAQCB2b2lkIERvd25sb2FkUHJveHk6 OmRpZFJlY2VpdmVBdXRoZW50aWNhCiAgICAgaWYgKCFtX3dlYkNvbnRleHQpCiAgICAgICAgIHJl dHVybjsKIAotICAgIC8vIEZJWE1FIChNdWx0aS1XZWJQcm9jZXNzKTogR2V0IHJpZCBvZiBkZXBy ZWNhdGVkU2hhcmVkUHJvY2Vzcy4KKyAgICAvLyBGSVhNRSAoTXVsdGktV2ViUHJvY2Vzcyk6IDxy ZGFyOi8vcHJvYmxlbS8xMjIzOTQ4Mz4gRG93bmxvYWRzIHNob3VsZG4ndCBiZSBoYW5kbGVkIGlu IHRoZSB3ZWIgcHJvY2Vzcy4KKyAgICAvLyBPbmNlIHRoaXMgaXMgZml4ZWQsIHJlbW92ZSBXZWJD b250ZXh0OjpkZXByZWNhdGVkU2hhcmVkUHJvY2VzcygpLgogICAgIFJlZlB0cjxBdXRoZW50aWNh dGlvbkNoYWxsZW5nZVByb3h5PiBhdXRoZW50aWNhdGlvbkNoYWxsZW5nZVByb3h5ID0gQXV0aGVu dGljYXRpb25DaGFsbGVuZ2VQcm94eTo6Y3JlYXRlKGF1dGhlbnRpY2F0aW9uQ2hhbGxlbmdlLCBj aGFsbGVuZ2VJRCwgbV93ZWJDb250ZXh0LT5kZXByZWNhdGVkU2hhcmVkUHJvY2VzcygpKTsKICAg ICBtX3dlYkNvbnRleHQtPmRvd25sb2FkQ2xpZW50KCkuZGlkUmVjZWl2ZUF1dGhlbnRpY2F0aW9u Q2hhbGxlbmdlKG1fd2ViQ29udGV4dCwgdGhpcywgYXV0aGVudGljYXRpb25DaGFsbGVuZ2VQcm94 eS5nZXQoKSk7CiB9CkBAIC0xOTQsNyArMTk1LDcgQEAgdm9pZCBEb3dubG9hZFByb3h5OjpzdGFy dFRyYW5zZmVyKGNvbnN0IAogICAgIGlmICghbV93ZWJDb250ZXh0KQogICAgICAgICByZXR1cm47 CiAKLSAgICAvLyBGSVhNRSAoTXVsdGktV2ViUHJvY2Vzcyk6IERvd25sb2FkcyBzaG91bGRuJ3Qg YmUgaGFuZGxlZCBpbiB0aGUgd2ViIHByb2Nlc3MuCisgICAgLy8gRklYTUUgKE11bHRpLVdlYlBy b2Nlc3MpOiA8cmRhcjovL3Byb2JsZW0vMTIyMzk0ODM+IERvd25sb2FkcyBzaG91bGRuJ3QgYmUg aGFuZGxlZCBpbiB0aGUgd2ViIHByb2Nlc3MuCiAgICAgbV93ZWJDb250ZXh0LT5zZW5kVG9BbGxQ cm9jZXNzZXMoTWVzc2FnZXM6OldlYlByb2Nlc3M6OlN0YXJ0VHJhbnNmZXIobV9kb3dubG9hZElE LCBmaWxlbmFtZSkpOwogfQogI2VuZGlmCkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mv UGx1Z2lucy9XZWJQbHVnaW5TaXRlRGF0YU1hbmFnZXIuY3BwCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJj ZS9XZWJLaXQyL1VJUHJvY2Vzcy9QbHVnaW5zL1dlYlBsdWdpblNpdGVEYXRhTWFuYWdlci5jcHAJ KHJldmlzaW9uIDEyNzYyNSkKKysrIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9QbHVnaW5zL1dl YlBsdWdpblNpdGVEYXRhTWFuYWdlci5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTE3MCw4ICsxNzAs NyBAQCB2b2lkIFdlYlBsdWdpblNpdGVEYXRhTWFuYWdlcjo6Z2V0U2l0ZXNXCiAgICAgZm9yIChz aXplX3QgaSA9IDA7IGkgPCBwbHVnaW5zLnNpemUoKTsgKytpKQogICAgICAgICBwbHVnaW5QYXRo cy5hcHBlbmQocGx1Z2luc1tpXS5wYXRoKTsKIAotICAgIC8vIEZJWE1FIChNdWx0aS1XZWJQcm9j ZXNzKTogV2hlbiBtdWx0aS1wcm9jZXNzIGlzIGVuYWJsZWQsIHdlIG11c3QgYWx3YXlzIHVzZSBh IHBsdWctaW4gcHJvY2VzcyBmb3IgdGhpcywKLSAgICAvLyBzbyB0aGlzIGNvZGUgc2hvdWxkIGp1 c3QgYmUgcmVtb3ZlZC4KKyAgICBBU1NFUlQobV93ZWJDb250ZXh0LT5wcm9jZXNzTW9kZWwoKSA9 PSBQcm9jZXNzTW9kZWxTaGFyZWRTZWNvbmRhcnlQcm9jZXNzKTsgLy8gUGx1Z2luIHByb2Nlc3Mg aXMgcmVxdWlyZWQgZm9yIG11bHRpcGxlIFdlYlByb2Nlc3MgbW9kZS4KICAgICBtX3dlYkNvbnRl eHQtPnNlbmRUb0FsbFByb2Nlc3Nlc1JlbGF1bmNoaW5nVGhlbUlmTmVjZXNzYXJ5KE1lc3NhZ2Vz OjpXZWJQcm9jZXNzOjpHZXRTaXRlc1dpdGhQbHVnaW5EYXRhKHBsdWdpblBhdGhzLCBjYWxsYmFj a0lEKSk7CiAjZW5kaWYKIH0KQEAgLTIzMyw4ICsyMzIsNyBAQCB2b2lkIFdlYlBsdWdpblNpdGVE YXRhTWFuYWdlcjo6Y2xlYXJTaXRlCiAgICAgZm9yIChzaXplX3QgaSA9IDA7IGkgPCBwbHVnaW5z LnNpemUoKTsgKytpKQogICAgICAgICBwbHVnaW5QYXRocy5hcHBlbmQocGx1Z2luc1tpXS5wYXRo KTsKIAotICAgIC8vIEZJWE1FIChNdWx0aS1XZWJQcm9jZXNzKTogV2hlbiBtdWx0aS1wcm9jZXNz IGlzIGVuYWJsZWQsIHdlIG11c3QgYWx3YXlzIHVzZSBhIHBsdWctaW4gcHJvY2VzcyBmb3IgdGhp cywKLSAgICAvLyBzbyB0aGlzIGNvZGUgc2hvdWxkIGp1c3QgYmUgcmVtb3ZlZC4KKyAgICBBU1NF UlQobV93ZWJDb250ZXh0LT5wcm9jZXNzTW9kZWwoKSA9PSBQcm9jZXNzTW9kZWxTaGFyZWRTZWNv bmRhcnlQcm9jZXNzKTsgLy8gUGx1Z2luIHByb2Nlc3MgaXMgcmVxdWlyZWQgZm9yIG11bHRpcGxl IFdlYlByb2Nlc3MgbW9kZS4KICAgICBtX3dlYkNvbnRleHQtPnNlbmRUb0FsbFByb2Nlc3Nlc1Jl bGF1bmNoaW5nVGhlbUlmTmVjZXNzYXJ5KE1lc3NhZ2VzOjpXZWJQcm9jZXNzOjpDbGVhclBsdWdp blNpdGVEYXRhKHBsdWdpblBhdGhzLCBzaXRlc1ZlY3RvciwgZmxhZ3MsIG1heEFnZUluU2Vjb25k cywgY2FsbGJhY2tJRCkpOwogI2VuZGlmCiB9Cg==