57787 2011-04-04 14:04:13 -0700 Get rid of WebContext::process() in more places 2011-04-04 15:29:31 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 1 andersca andersca abarth aroben eric webkit.review.bot oldest_to_newest 379055 0 andersca 2011-04-04 14:04:13 -0700 Get rid of WebContext::process() in more places 379061 1 88127 andersca 2011-04-04 14:07:30 -0700 Created attachment 88127 Patch 379067 2 aroben 2011-04-04 14:15:46 -0700 View in context: https://bugs.webkit.org/attachment.cgi?id=88127&action=review > Source/WebKit2/UIProcess/WebApplicationCacheManagerProxy.cpp:72 > + // FIXME (Multi-process): The application cache shouldn't be stored in the web process. Maybe this should say where it *should* be stored (if you know). > Source/WebKit2/UIProcess/WebApplicationCacheManagerProxy.cpp:89 > + // FIXME (Multi-process): The application cache shouldn't be stored in the web process. Ditto. > Source/WebKit2/UIProcess/WebApplicationCacheManagerProxy.cpp:95 > + // FIXME (Multi-process): The application cache shouldn't be stored in the web process. Tritto. > Source/WebKit2/UIProcess/WebCookieManagerProxy.cpp:79 > + // FIXME (Multi-process): Cookies shouldn't be stored in the web process. You know. > Source/WebKit2/UIProcess/WebCookieManagerProxy.cpp:148 > + // FIXME (Multi-process): Cookies shouldn't be stored in the web process. I'm done now. 379070 3 andersca 2011-04-04 14:17:45 -0700 Committed r82873: <http://trac.webkit.org/changeset/82873> 379133 4 webkit.review.bot 2011-04-04 15:29:31 -0700 http://trac.webkit.org/changeset/82873 might have broken GTK Linux 32-bit Release 88127 2011-04-04 14:07:30 -0700 2011-04-04 14:14:47 -0700 Patch bug-57787-20110404140729.patch text/plain 24843 andersca SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDgyODcwKQorKysgU291cmNlL1dlYktpdDIvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsNTUgQEAKKzIwMTEtMDQtMDQgIEFuZGVycyBD YXJsc3NvbiAgPGFuZGVyc2NhQGFwcGxlLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBHZXQgcmlkIG9mIFdlYkNvbnRleHQ6OnByb2Nlc3MoKSBp biBtb3JlIHBsYWNlcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9NTc3ODcKKworICAgICAgICBNaWdyYXRlIGNhbGxzIHRvIFdlYkNvbnRleHQ6OnByb2Nl c3MoKSBvdmVyIHRvIHNlbmRUb0FsbFByb2Nlc3NlcyBhbmQKKyAgICAgICAgc2VuZFRvQWxsUHJv Y2Vzc2VzUmVsYXVuY2hpbmdUaGVtSWZOZWNlc3NhcnkuCisKKyAgICAgICAgQWRkIEZJWE1FcyBm b3IgdGhpbmdzIHRoYXQgbmVlZCB0byBiZSBmaXhlZCBpbiBvcmRlciB0byBzdXBwb3J0IG11bHRp cGxlIHdlYiBwcm9jZXNzZXMuCisgICAgICAgICAgICAgICAgCisgICAgICAgICogVUlQcm9jZXNz L0Rvd25sb2Fkcy9Eb3dubG9hZFByb3h5LmNwcDoKKyAgICAgICAgKFdlYktpdDo6RG93bmxvYWRQ cm94eTo6Y2FuY2VsKToKKyAgICAgICAgKiBVSVByb2Nlc3MvUGx1Z2lucy9XZWJQbHVnaW5TaXRl RGF0YU1hbmFnZXIuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJQbHVnaW5TaXRlRGF0YU1hbmFn ZXI6OmdldFNpdGVzV2l0aERhdGEpOgorICAgICAgICAoV2ViS2l0OjpXZWJQbHVnaW5TaXRlRGF0 YU1hbmFnZXI6OmNsZWFyU2l0ZURhdGEpOgorICAgICAgICAqIFVJUHJvY2Vzcy9WaXNpdGVkTGlu a1Byb3ZpZGVyLmNwcDoKKyAgICAgICAgKFdlYktpdDo6VmlzaXRlZExpbmtQcm92aWRlcjo6cGVu ZGluZ1Zpc2l0ZWRMaW5rc1RpbWVyRmlyZWQpOgorICAgICAgICAqIFVJUHJvY2Vzcy9XZWJBcHBs aWNhdGlvbkNhY2hlTWFuYWdlclByb3h5LmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViQXBwbGlj YXRpb25DYWNoZU1hbmFnZXJQcm94eTo6Z2V0QXBwbGljYXRpb25DYWNoZU9yaWdpbnMpOgorICAg ICAgICAoV2ViS2l0OjpXZWJBcHBsaWNhdGlvbkNhY2hlTWFuYWdlclByb3h5OjpkZWxldGVFbnRy aWVzRm9yT3JpZ2luKToKKyAgICAgICAgKFdlYktpdDo6V2ViQXBwbGljYXRpb25DYWNoZU1hbmFn ZXJQcm94eTo6ZGVsZXRlQWxsRW50cmllcyk6CisgICAgICAgICogVUlQcm9jZXNzL1dlYkNvb2tp ZU1hbmFnZXJQcm94eS5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYkNvb2tpZU1hbmFnZXJQcm94 eTo6Z2V0SG9zdG5hbWVzV2l0aENvb2tpZXMpOgorICAgICAgICAoV2ViS2l0OjpXZWJDb29raWVN YW5hZ2VyUHJveHk6OmdldEhUVFBDb29raWVBY2NlcHRQb2xpY3kpOgorICAgICAgICAqIFVJUHJv Y2Vzcy9XZWJEYXRhYmFzZU1hbmFnZXJQcm94eS5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYkRh dGFiYXNlTWFuYWdlclByb3h5OjpnZXREYXRhYmFzZXNCeU9yaWdpbik6CisgICAgICAgIChXZWJL aXQ6OldlYkRhdGFiYXNlTWFuYWdlclByb3h5OjpnZXREYXRhYmFzZU9yaWdpbnMpOgorICAgICAg ICAoV2ViS2l0OjpXZWJEYXRhYmFzZU1hbmFnZXJQcm94eTo6ZGVsZXRlRGF0YWJhc2VXaXRoTmFt ZUZvck9yaWdpbik6CisgICAgICAgIChXZWJLaXQ6OldlYkRhdGFiYXNlTWFuYWdlclByb3h5Ojpk ZWxldGVEYXRhYmFzZXNGb3JPcmlnaW4pOgorICAgICAgICAoV2ViS2l0OjpXZWJEYXRhYmFzZU1h bmFnZXJQcm94eTo6ZGVsZXRlQWxsRGF0YWJhc2VzKToKKyAgICAgICAgKFdlYktpdDo6V2ViRGF0 YWJhc2VNYW5hZ2VyUHJveHk6OnNldFF1b3RhRm9yT3JpZ2luKToKKyAgICAgICAgKiBVSVByb2Nl c3MvV2ViR2VvbG9jYXRpb25NYW5hZ2VyUHJveHkuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJH ZW9sb2NhdGlvbk1hbmFnZXJQcm94eTo6cHJvdmlkZXJEaWRDaGFuZ2VQb3NpdGlvbik6CisgICAg ICAgIChXZWJLaXQ6OldlYkdlb2xvY2F0aW9uTWFuYWdlclByb3h5Ojpwcm92aWRlckRpZEZhaWxU b0RldGVybWluZVBvc2l0aW9uKToKKyAgICAgICAgKiBVSVByb2Nlc3MvV2ViSWNvbkRhdGFiYXNl LmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViSWNvbkRhdGFiYXNlOjpnZXRMb2FkRGVjaXNpb25G b3JJY29uVVJMKToKKyAgICAgICAgKFdlYktpdDo6V2ViSWNvbkRhdGFiYXNlOjpkaWRGaW5pc2hV UkxJbXBvcnQpOgorICAgICAgICAqIFVJUHJvY2Vzcy9XZWJLZXlWYWx1ZVN0b3JhZ2VNYW5hZ2Vy UHJveHkuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJLZXlWYWx1ZVN0b3JhZ2VNYW5hZ2VyUHJv eHk6OmdldEtleVZhbHVlU3RvcmFnZU9yaWdpbnMpOgorICAgICAgICAoV2ViS2l0OjpXZWJLZXlW YWx1ZVN0b3JhZ2VNYW5hZ2VyUHJveHk6OmRlbGV0ZUVudHJpZXNGb3JPcmlnaW4pOgorICAgICAg ICAoV2ViS2l0OjpXZWJLZXlWYWx1ZVN0b3JhZ2VNYW5hZ2VyUHJveHk6OmRlbGV0ZUFsbEVudHJp ZXMpOgorICAgICAgICAqIFVJUHJvY2Vzcy9XZWJNZWRpYUNhY2hlTWFuYWdlclByb3h5LmNwcDoK KyAgICAgICAgKFdlYktpdDo6V2ViTWVkaWFDYWNoZU1hbmFnZXJQcm94eTo6Z2V0SG9zdG5hbWVz V2l0aE1lZGlhQ2FjaGUpOgorICAgICAgICAoV2ViS2l0OjpXZWJNZWRpYUNhY2hlTWFuYWdlclBy b3h5OjpjbGVhckNhY2hlRm9ySG9zdG5hbWUpOgorICAgICAgICAoV2ViS2l0OjpXZWJNZWRpYUNh Y2hlTWFuYWdlclByb3h5OjpjbGVhckNhY2hlRm9yQWxsSG9zdG5hbWVzKToKKyAgICAgICAgKiBV SVByb2Nlc3MvV2ViUmVzb3VyY2VDYWNoZU1hbmFnZXJQcm94eS5jcHA6CisgICAgICAgIChXZWJL aXQ6OldlYlJlc291cmNlQ2FjaGVNYW5hZ2VyUHJveHk6OmdldENhY2hlT3JpZ2lucyk6CisgICAg ICAgIChXZWJLaXQ6OldlYlJlc291cmNlQ2FjaGVNYW5hZ2VyUHJveHk6OmNsZWFyQ2FjaGVGb3JP cmlnaW4pOgorICAgICAgICAoV2ViS2l0OjpXZWJSZXNvdXJjZUNhY2hlTWFuYWdlclByb3h5Ojpj bGVhckNhY2hlRm9yQWxsT3JpZ2lucyk6CisKIDIwMTEtMDQtMDQgIEFsZXhleSBQcm9za3VyeWFr b3YgIDxhcEBhcHBsZS5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgRGFuIEJlcm5zdGVpbi4K SW5kZXg6IFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9WaXNpdGVkTGlua1Byb3ZpZGVyLmNwcAo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvVmlzaXRlZExpbmtQcm92aWRl ci5jcHAJKHJldmlzaW9uIDgyODY3KQorKysgU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1Zpc2l0 ZWRMaW5rUHJvdmlkZXIuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xNjMsMTcgKzE2MywxOSBAQCB2 b2lkIFZpc2l0ZWRMaW5rUHJvdmlkZXI6OnBlbmRpbmdWaXNpdGVkCiAgICAgICAgIGlmICghbV90 YWJsZS5zaGFyZWRNZW1vcnkoKS0+Y3JlYXRlSGFuZGxlKGhhbmRsZSwgU2hhcmVkTWVtb3J5OjpS ZWFkT25seSkpCiAgICAgICAgICAgICByZXR1cm47CiAKLSAgICAgICAgbV9jb250ZXh0LT5wcm9j ZXNzKCktPnNlbmQoTWVzc2FnZXM6OldlYlByb2Nlc3M6OlNldFZpc2l0ZWRMaW5rVGFibGUoaGFu ZGxlKSwgMCk7CisgICAgICAgIC8vIEZJWE1FIChNdWx0aS1wcm9jZXNzKTogRW5jb2RpbmcgYSBo YW5kbGUgd2lsbCBudWxsIGl0IG91dCBzbyB3ZSBuZWVkIHRvIGNyZWF0ZSBhIG5ldworICAgICAg ICAvLyBoYW5kbGUgZm9yIGV2ZXJ5IHByb2Nlc3MuIE1heWJlIHRoZSBBcmd1bWVudEVuY29kZXIg c2hvdWxkIGhhbmRsZSB0aGlzLgorICAgICAgICBtX2NvbnRleHQtPnNlbmRUb0FsbFByb2Nlc3Nl cyhNZXNzYWdlczo6V2ViUHJvY2Vzczo6U2V0VmlzaXRlZExpbmtUYWJsZShoYW5kbGUpKTsKICAg ICB9CiAgICAgCiAgICAgLy8gV2Ugbm93IG5lZWQgdG8gbGV0IHRoZSB3ZWIgcHJvY2VzcyBrbm93 IHRoYXQgd2UndmUgYWRkZWQgbGlua3MuCiAgICAgaWYgKG1fd2ViUHJvY2Vzc0hhc1Zpc2l0ZWRM aW5rU3RhdGUgJiYgYWRkZWRWaXNpdGVkTGlua3Muc2l6ZSgpIDw9IDIwKSB7Ci0gICAgICAgIG1f Y29udGV4dC0+cHJvY2VzcygpLT5zZW5kKE1lc3NhZ2VzOjpXZWJQcm9jZXNzOjpWaXNpdGVkTGlu a1N0YXRlQ2hhbmdlZChhZGRlZFZpc2l0ZWRMaW5rcyksIDApOworICAgICAgICBtX2NvbnRleHQt PnNlbmRUb0FsbFByb2Nlc3NlcyhNZXNzYWdlczo6V2ViUHJvY2Vzczo6VmlzaXRlZExpbmtTdGF0 ZUNoYW5nZWQoYWRkZWRWaXNpdGVkTGlua3MpKTsKICAgICAgICAgcmV0dXJuOwogICAgIH0KICAg ICAKICAgICAvLyBKdXN0IHJlY2FsY3VsYXRlIGFsbCB0aGUgdmlzaXRlZCBsaW5rcy4KLSAgICBt X2NvbnRleHQtPnByb2Nlc3MoKS0+c2VuZChNZXNzYWdlczo6V2ViUHJvY2Vzczo6QWxsVmlzaXRl ZExpbmtTdGF0ZUNoYW5nZWQoKSwgMCk7CisgICAgbV9jb250ZXh0LT5zZW5kVG9BbGxQcm9jZXNz ZXMoTWVzc2FnZXM6OldlYlByb2Nlc3M6OkFsbFZpc2l0ZWRMaW5rU3RhdGVDaGFuZ2VkKCkpOwog ICAgIG1fd2ViUHJvY2Vzc0hhc1Zpc2l0ZWRMaW5rU3RhdGUgPSB0cnVlOwogfQogCkluZGV4OiBT b3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViQXBwbGljYXRpb25DYWNoZU1hbmFnZXJQcm94eS5j cHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYkFwcGxpY2F0aW9u Q2FjaGVNYW5hZ2VyUHJveHkuY3BwCShyZXZpc2lvbiA4Mjg2NykKKysrIFNvdXJjZS9XZWJLaXQy L1VJUHJvY2Vzcy9XZWJBcHBsaWNhdGlvbkNhY2hlTWFuYWdlclByb3h5LmNwcAkod29ya2luZyBj b3B5KQpAQCAtNjUsMTEgKzY1LDEyIEBAIHZvaWQgV2ViQXBwbGljYXRpb25DYWNoZU1hbmFnZXJQ cm94eTo6ZGkKIHZvaWQgV2ViQXBwbGljYXRpb25DYWNoZU1hbmFnZXJQcm94eTo6Z2V0QXBwbGlj YXRpb25DYWNoZU9yaWdpbnMoUGFzc1JlZlB0cjxBcnJheUNhbGxiYWNrPiBwcnBDYWxsYmFjaykK IHsKICAgICBSZWZQdHI8QXJyYXlDYWxsYmFjaz4gY2FsbGJhY2sgPSBwcnBDYWxsYmFjazsKLSAg ICBtX3dlYkNvbnRleHQtPnJlbGF1bmNoUHJvY2Vzc0lmTmVjZXNzYXJ5KCk7CiAgICAgCiAgICAg dWludDY0X3QgY2FsbGJhY2tJRCA9IGNhbGxiYWNrLT5jYWxsYmFja0lEKCk7CiAgICAgbV9hcnJh eUNhbGxiYWNrcy5zZXQoY2FsbGJhY2tJRCwgY2FsbGJhY2sucmVsZWFzZSgpKTsKLSAgICBtX3dl YkNvbnRleHQtPnByb2Nlc3MoKS0+c2VuZChNZXNzYWdlczo6V2ViQXBwbGljYXRpb25DYWNoZU1h bmFnZXI6OkdldEFwcGxpY2F0aW9uQ2FjaGVPcmlnaW5zKGNhbGxiYWNrSUQpLCAwKTsKKworICAg IC8vIEZJWE1FIChNdWx0aS1wcm9jZXNzKTogVGhlIGFwcGxpY2F0aW9uIGNhY2hlIHNob3VsZG4n dCBiZSBzdG9yZWQgaW4gdGhlIHdlYiBwcm9jZXNzLgorICAgIG1fd2ViQ29udGV4dC0+c2VuZFRv QWxsUHJvY2Vzc2VzUmVsYXVuY2hpbmdUaGVtSWZOZWNlc3NhcnkoTWVzc2FnZXM6OldlYkFwcGxp Y2F0aW9uQ2FjaGVNYW5hZ2VyOjpHZXRBcHBsaWNhdGlvbkNhY2hlT3JpZ2lucyhjYWxsYmFja0lE KSk7CiB9CiAgICAgCiB2b2lkIFdlYkFwcGxpY2F0aW9uQ2FjaGVNYW5hZ2VyUHJveHk6OmRpZEdl dEFwcGxpY2F0aW9uQ2FjaGVPcmlnaW5zKGNvbnN0IFZlY3RvcjxTZWN1cml0eU9yaWdpbkRhdGE+ JiBvcmlnaW5EYXRhcywgdWludDY0X3QgY2FsbGJhY2tJRCkKQEAgLTgwLDIwICs4MSwxOSBAQCB2 b2lkIFdlYkFwcGxpY2F0aW9uQ2FjaGVNYW5hZ2VyUHJveHk6OmRpCiAKIHZvaWQgV2ViQXBwbGlj YXRpb25DYWNoZU1hbmFnZXJQcm94eTo6ZGVsZXRlRW50cmllc0Zvck9yaWdpbihXZWJTZWN1cml0 eU9yaWdpbiogb3JpZ2luKQogewotICAgIG1fd2ViQ29udGV4dC0+cmVsYXVuY2hQcm9jZXNzSWZO ZWNlc3NhcnkoKTsKLSAgICAKICAgICBTZWN1cml0eU9yaWdpbkRhdGEgc2VjdXJpdHlPcmlnaW5E YXRhOwogICAgIHNlY3VyaXR5T3JpZ2luRGF0YS5wcm90b2NvbCA9IG9yaWdpbi0+cHJvdG9jb2wo KTsKICAgICBzZWN1cml0eU9yaWdpbkRhdGEuaG9zdCA9IG9yaWdpbi0+aG9zdCgpOwogICAgIHNl Y3VyaXR5T3JpZ2luRGF0YS5wb3J0ID0gb3JpZ2luLT5wb3J0KCk7CiAKLSAgICBtX3dlYkNvbnRl eHQtPnByb2Nlc3MoKS0+c2VuZChNZXNzYWdlczo6V2ViQXBwbGljYXRpb25DYWNoZU1hbmFnZXI6 OkRlbGV0ZUVudHJpZXNGb3JPcmlnaW4oc2VjdXJpdHlPcmlnaW5EYXRhKSwgMCk7CisgICAgLy8g RklYTUUgKE11bHRpLXByb2Nlc3MpOiBUaGUgYXBwbGljYXRpb24gY2FjaGUgc2hvdWxkbid0IGJl IHN0b3JlZCBpbiB0aGUgd2ViIHByb2Nlc3MuCisgICAgbV93ZWJDb250ZXh0LT5zZW5kVG9BbGxQ cm9jZXNzZXNSZWxhdW5jaGluZ1RoZW1JZk5lY2Vzc2FyeShNZXNzYWdlczo6V2ViQXBwbGljYXRp b25DYWNoZU1hbmFnZXI6OkRlbGV0ZUVudHJpZXNGb3JPcmlnaW4oc2VjdXJpdHlPcmlnaW5EYXRh KSk7CiB9CiAKIHZvaWQgV2ViQXBwbGljYXRpb25DYWNoZU1hbmFnZXJQcm94eTo6ZGVsZXRlQWxs RW50cmllcygpCiB7Ci0gICAgbV93ZWJDb250ZXh0LT5yZWxhdW5jaFByb2Nlc3NJZk5lY2Vzc2Fy eSgpOwotICAgIG1fd2ViQ29udGV4dC0+cHJvY2VzcygpLT5zZW5kKE1lc3NhZ2VzOjpXZWJBcHBs aWNhdGlvbkNhY2hlTWFuYWdlcjo6RGVsZXRlQWxsRW50cmllcygpLCAwKTsKKyAgICAvLyBGSVhN RSAoTXVsdGktcHJvY2Vzcyk6IFRoZSBhcHBsaWNhdGlvbiBjYWNoZSBzaG91bGRuJ3QgYmUgc3Rv cmVkIGluIHRoZSB3ZWIgcHJvY2Vzcy4KKyAgICBtX3dlYkNvbnRleHQtPnNlbmRUb0FsbFByb2Nl c3Nlc1JlbGF1bmNoaW5nVGhlbUlmTmVjZXNzYXJ5KE1lc3NhZ2VzOjpXZWJBcHBsaWNhdGlvbkNh Y2hlTWFuYWdlcjo6RGVsZXRlQWxsRW50cmllcygpKTsKIH0KIAogfSAvLyBuYW1lc3BhY2UgV2Vi S2l0CkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViQ29va2llTWFuYWdlclByb3h5 LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViQ29va2llTWFu YWdlclByb3h5LmNwcAkocmV2aXNpb24gODI4NjcpCisrKyBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nl c3MvV2ViQ29va2llTWFuYWdlclByb3h5LmNwcAkod29ya2luZyBjb3B5KQpAQCAtNzMsMTEgKzcz LDExIEBAIHZvaWQgV2ViQ29va2llTWFuYWdlclByb3h5OjpnZXRIb3N0bmFtZXMKICAgICBBU1NF UlQobV93ZWJDb250ZXh0KTsKIAogICAgIFJlZlB0cjxBcnJheUNhbGxiYWNrPiBjYWxsYmFjayA9 IHBycENhbGxiYWNrOwotICAgIG1fd2ViQ29udGV4dC0+cmVsYXVuY2hQcm9jZXNzSWZOZWNlc3Nh cnkoKTsKLSAgICAKICAgICB1aW50NjRfdCBjYWxsYmFja0lEID0gY2FsbGJhY2stPmNhbGxiYWNr SUQoKTsKICAgICBtX2FycmF5Q2FsbGJhY2tzLnNldChjYWxsYmFja0lELCBjYWxsYmFjay5yZWxl YXNlKCkpOwotICAgIG1fd2ViQ29udGV4dC0+cHJvY2VzcygpLT5zZW5kKE1lc3NhZ2VzOjpXZWJD b29raWVNYW5hZ2VyOjpHZXRIb3N0bmFtZXNXaXRoQ29va2llcyhjYWxsYmFja0lEKSwgMCk7CisK KyAgICAvLyBGSVhNRSAoTXVsdGktcHJvY2Vzcyk6IENvb2tpZXMgc2hvdWxkbid0IGJlIHN0b3Jl ZCBpbiB0aGUgd2ViIHByb2Nlc3MuCisgICAgbV93ZWJDb250ZXh0LT5zZW5kVG9BbGxQcm9jZXNz ZXNSZWxhdW5jaGluZ1RoZW1JZk5lY2Vzc2FyeShNZXNzYWdlczo6V2ViQ29va2llTWFuYWdlcjo6 R2V0SG9zdG5hbWVzV2l0aENvb2tpZXMoY2FsbGJhY2tJRCkpOwogfQogICAgIAogdm9pZCBXZWJD b29raWVNYW5hZ2VyUHJveHk6OmRpZEdldEhvc3RuYW1lc1dpdGhDb29raWVzKGNvbnN0IFZlY3Rv cjxTdHJpbmc+JiBob3N0bmFtZUxpc3QsIHVpbnQ2NF90IGNhbGxiYWNrSUQpCkBAIC0xNDEsMTEg KzE0MSwxMiBAQCB2b2lkIFdlYkNvb2tpZU1hbmFnZXJQcm94eTo6Z2V0SFRUUENvb2tpCiAgICAg QVNTRVJUKG1fd2ViQ29udGV4dCk7CiAKICAgICBSZWZQdHI8SFRUUENvb2tpZUFjY2VwdFBvbGlj eUNhbGxiYWNrPiBjYWxsYmFjayA9IHBycENhbGxiYWNrOwotICAgIG1fd2ViQ29udGV4dC0+cmVs YXVuY2hQcm9jZXNzSWZOZWNlc3NhcnkoKTsKIAogICAgIHVpbnQ2NF90IGNhbGxiYWNrSUQgPSBj YWxsYmFjay0+Y2FsbGJhY2tJRCgpOwogICAgIG1faHR0cENvb2tpZUFjY2VwdFBvbGljeUNhbGxi YWNrcy5zZXQoY2FsbGJhY2tJRCwgY2FsbGJhY2sucmVsZWFzZSgpKTsKLSAgICBtX3dlYkNvbnRl eHQtPnByb2Nlc3MoKS0+c2VuZChNZXNzYWdlczo6V2ViQ29va2llTWFuYWdlcjo6R2V0SFRUUENv b2tpZUFjY2VwdFBvbGljeShjYWxsYmFja0lEKSwgMCk7CisKKyAgICAvLyBGSVhNRSAoTXVsdGkt cHJvY2Vzcyk6IENvb2tpZXMgc2hvdWxkbid0IGJlIHN0b3JlZCBpbiB0aGUgd2ViIHByb2Nlc3Mu CisgICAgbV93ZWJDb250ZXh0LT5zZW5kVG9BbGxQcm9jZXNzZXNSZWxhdW5jaGluZ1RoZW1JZk5l Y2Vzc2FyeShNZXNzYWdlczo6V2ViQ29va2llTWFuYWdlcjo6R2V0SFRUUENvb2tpZUFjY2VwdFBv bGljeShjYWxsYmFja0lEKSk7CiB9CiAKIHZvaWQgV2ViQ29va2llTWFuYWdlclByb3h5OjpkaWRH ZXRIVFRQQ29va2llQWNjZXB0UG9saWN5KHVpbnQzMl90IHBvbGljeSwgdWludDY0X3QgY2FsbGJh Y2tJRCkKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJEYXRhYmFzZU1hbmFnZXJQ cm94eS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYkRhdGFi YXNlTWFuYWdlclByb3h5LmNwcAkocmV2aXNpb24gODI4NjcpCisrKyBTb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvV2ViRGF0YWJhc2VNYW5hZ2VyUHJveHkuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0x MTYsMTIgKzExNiwxMiBAQCB2b2lkIFdlYkRhdGFiYXNlTWFuYWdlclByb3h5Ojppbml0aWFsaXpl CiB2b2lkIFdlYkRhdGFiYXNlTWFuYWdlclByb3h5OjpnZXREYXRhYmFzZXNCeU9yaWdpbihQYXNz UmVmUHRyPEFycmF5Q2FsbGJhY2s+IHBycENhbGxiYWNrKQogewogICAgIFJlZlB0cjxBcnJheUNh bGxiYWNrPiBjYWxsYmFjayA9IHBycENhbGxiYWNrOwotICAgIG1fd2ViQ29udGV4dC0+cmVsYXVu Y2hQcm9jZXNzSWZOZWNlc3NhcnkoKTsKICAgICB1aW50NjRfdCBjYWxsYmFja0lEID0gY2FsbGJh Y2stPmNhbGxiYWNrSUQoKTsKICAgICBtX2FycmF5Q2FsbGJhY2tzLnNldChjYWxsYmFja0lELCBj YWxsYmFjay5yZWxlYXNlKCkpOwotICAgIG1fd2ViQ29udGV4dC0+cHJvY2VzcygpLT5zZW5kKE1l c3NhZ2VzOjpXZWJEYXRhYmFzZU1hbmFnZXI6OkdldERhdGFiYXNlc0J5T3JpZ2luKGNhbGxiYWNr SUQpLCAwKTsKLX0KIAorICAgIC8vIEZJWE1FIChNdWx0aS1wcm9jZXNzKTogRGF0YWJhc2VzIHNo b3VsZG4ndCBiZSBzdG9yZWQgaW4gdGhlIHdlYiBwcm9jZXNzLgorICAgIG1fd2ViQ29udGV4dC0+ c2VuZFRvQWxsUHJvY2Vzc2VzUmVsYXVuY2hpbmdUaGVtSWZOZWNlc3NhcnkoTWVzc2FnZXM6Oldl YkRhdGFiYXNlTWFuYWdlcjo6R2V0RGF0YWJhc2VzQnlPcmlnaW4oY2FsbGJhY2tJRCkpOworfQog CiB2b2lkIFdlYkRhdGFiYXNlTWFuYWdlclByb3h5OjpkaWRHZXREYXRhYmFzZXNCeU9yaWdpbihj b25zdCBWZWN0b3I8T3JpZ2luQW5kRGF0YWJhc2VzPiYgb3JpZ2luQW5kRGF0YWJhc2VzVmVjdG9y LCB1aW50NjRfdCBjYWxsYmFja0lEKQogewpAQCAtMTY5LDEwICsxNjksMTEgQEAgdm9pZCBXZWJE YXRhYmFzZU1hbmFnZXJQcm94eTo6ZGlkR2V0RGF0YQogdm9pZCBXZWJEYXRhYmFzZU1hbmFnZXJQ cm94eTo6Z2V0RGF0YWJhc2VPcmlnaW5zKFBhc3NSZWZQdHI8QXJyYXlDYWxsYmFjaz4gcHJwQ2Fs bGJhY2spCiB7CiAgICAgUmVmUHRyPEFycmF5Q2FsbGJhY2s+IGNhbGxiYWNrID0gcHJwQ2FsbGJh Y2s7Ci0gICAgbV93ZWJDb250ZXh0LT5yZWxhdW5jaFByb2Nlc3NJZk5lY2Vzc2FyeSgpOwogICAg IHVpbnQ2NF90IGNhbGxiYWNrSUQgPSBjYWxsYmFjay0+Y2FsbGJhY2tJRCgpOwogICAgIG1fYXJy YXlDYWxsYmFja3Muc2V0KGNhbGxiYWNrSUQsIGNhbGxiYWNrLnJlbGVhc2UoKSk7Ci0gICAgbV93 ZWJDb250ZXh0LT5wcm9jZXNzKCktPnNlbmQoTWVzc2FnZXM6OldlYkRhdGFiYXNlTWFuYWdlcjo6 R2V0RGF0YWJhc2VPcmlnaW5zKGNhbGxiYWNrSUQpLCAwKTsKKworICAgIC8vIEZJWE1FIChNdWx0 aS1wcm9jZXNzKTogRGF0YWJhc2VzIHNob3VsZG4ndCBiZSBzdG9yZWQgaW4gdGhlIHdlYiBwcm9j ZXNzLgorICAgIG1fd2ViQ29udGV4dC0+c2VuZFRvQWxsUHJvY2Vzc2VzUmVsYXVuY2hpbmdUaGVt SWZOZWNlc3NhcnkoTWVzc2FnZXM6OldlYkRhdGFiYXNlTWFuYWdlcjo6R2V0RGF0YWJhc2VPcmln aW5zKGNhbGxiYWNrSUQpKTsKIH0KIAogdm9pZCBXZWJEYXRhYmFzZU1hbmFnZXJQcm94eTo6ZGlk R2V0RGF0YWJhc2VPcmlnaW5zKGNvbnN0IFZlY3RvcjxTdHJpbmc+JiBvcmlnaW5JZGVudGlmaWVy cywgdWludDY0X3QgY2FsbGJhY2tJRCkKQEAgLTE5NCwyNiArMTk1LDI2IEBAIHZvaWQgV2ViRGF0 YWJhc2VNYW5hZ2VyUHJveHk6OmRpZEdldERhdGEKIAogdm9pZCBXZWJEYXRhYmFzZU1hbmFnZXJQ cm94eTo6ZGVsZXRlRGF0YWJhc2VXaXRoTmFtZUZvck9yaWdpbihjb25zdCBTdHJpbmcmIGRhdGFi YXNlSWRlbnRpZmllciwgV2ViU2VjdXJpdHlPcmlnaW4qIG9yaWdpbikKIHsKLSAgICBtX3dlYkNv bnRleHQtPnJlbGF1bmNoUHJvY2Vzc0lmTmVjZXNzYXJ5KCk7Ci0gICAgbV93ZWJDb250ZXh0LT5w cm9jZXNzKCktPnNlbmQoTWVzc2FnZXM6OldlYkRhdGFiYXNlTWFuYWdlcjo6RGVsZXRlRGF0YWJh c2VXaXRoTmFtZUZvck9yaWdpbihkYXRhYmFzZUlkZW50aWZpZXIsIG9yaWdpbi0+ZGF0YWJhc2VJ ZGVudGlmaWVyKCkpLCAwKTsKKyAgICAvLyBGSVhNRSAoTXVsdGktcHJvY2Vzcyk6IERhdGFiYXNl cyBzaG91bGRuJ3QgYmUgc3RvcmVkIGluIHRoZSB3ZWIgcHJvY2Vzcy4KKyAgICBtX3dlYkNvbnRl eHQtPnNlbmRUb0FsbFByb2Nlc3Nlc1JlbGF1bmNoaW5nVGhlbUlmTmVjZXNzYXJ5KE1lc3NhZ2Vz OjpXZWJEYXRhYmFzZU1hbmFnZXI6OkRlbGV0ZURhdGFiYXNlV2l0aE5hbWVGb3JPcmlnaW4oZGF0 YWJhc2VJZGVudGlmaWVyLCBvcmlnaW4tPmRhdGFiYXNlSWRlbnRpZmllcigpKSk7CiB9CiAKIHZv aWQgV2ViRGF0YWJhc2VNYW5hZ2VyUHJveHk6OmRlbGV0ZURhdGFiYXNlc0Zvck9yaWdpbihXZWJT ZWN1cml0eU9yaWdpbiogb3JpZ2luKQogewotICAgIG1fd2ViQ29udGV4dC0+cmVsYXVuY2hQcm9j ZXNzSWZOZWNlc3NhcnkoKTsKLSAgICBtX3dlYkNvbnRleHQtPnByb2Nlc3MoKS0+c2VuZChNZXNz YWdlczo6V2ViRGF0YWJhc2VNYW5hZ2VyOjpEZWxldGVEYXRhYmFzZXNGb3JPcmlnaW4ob3JpZ2lu LT5kYXRhYmFzZUlkZW50aWZpZXIoKSksIDApOworICAgIC8vIEZJWE1FIChNdWx0aS1wcm9jZXNz KTogRGF0YWJhc2VzIHNob3VsZG4ndCBiZSBzdG9yZWQgaW4gdGhlIHdlYiBwcm9jZXNzLgorICAg IG1fd2ViQ29udGV4dC0+c2VuZFRvQWxsUHJvY2Vzc2VzUmVsYXVuY2hpbmdUaGVtSWZOZWNlc3Nh cnkoTWVzc2FnZXM6OldlYkRhdGFiYXNlTWFuYWdlcjo6RGVsZXRlRGF0YWJhc2VzRm9yT3JpZ2lu KG9yaWdpbi0+ZGF0YWJhc2VJZGVudGlmaWVyKCkpKTsKIH0KIAogdm9pZCBXZWJEYXRhYmFzZU1h bmFnZXJQcm94eTo6ZGVsZXRlQWxsRGF0YWJhc2VzKCkKIHsKLSAgICBtX3dlYkNvbnRleHQtPnJl bGF1bmNoUHJvY2Vzc0lmTmVjZXNzYXJ5KCk7Ci0gICAgbV93ZWJDb250ZXh0LT5wcm9jZXNzKCkt PnNlbmQoTWVzc2FnZXM6OldlYkRhdGFiYXNlTWFuYWdlcjo6RGVsZXRlQWxsRGF0YWJhc2VzKCks IDApOworICAgIC8vIEZJWE1FIChNdWx0aS1wcm9jZXNzKTogRGF0YWJhc2VzIHNob3VsZG4ndCBi ZSBzdG9yZWQgaW4gdGhlIHdlYiBwcm9jZXNzLgorICAgIG1fd2ViQ29udGV4dC0+c2VuZFRvQWxs UHJvY2Vzc2VzUmVsYXVuY2hpbmdUaGVtSWZOZWNlc3NhcnkoTWVzc2FnZXM6OldlYkRhdGFiYXNl TWFuYWdlcjo6RGVsZXRlQWxsRGF0YWJhc2VzKCkpOwogfQogCiB2b2lkIFdlYkRhdGFiYXNlTWFu YWdlclByb3h5OjpzZXRRdW90YUZvck9yaWdpbihXZWJTZWN1cml0eU9yaWdpbiogb3JpZ2luLCB1 aW50NjRfdCBxdW90YSkKIHsKLSAgICBtX3dlYkNvbnRleHQtPnJlbGF1bmNoUHJvY2Vzc0lmTmVj ZXNzYXJ5KCk7Ci0gICAgbV93ZWJDb250ZXh0LT5wcm9jZXNzKCktPnNlbmQoTWVzc2FnZXM6Oldl YkRhdGFiYXNlTWFuYWdlcjo6U2V0UXVvdGFGb3JPcmlnaW4ob3JpZ2luLT5kYXRhYmFzZUlkZW50 aWZpZXIoKSwgcXVvdGEpLCAwKTsKKyAgICAvLyBGSVhNRSAoTXVsdGktcHJvY2Vzcyk6IERhdGFi YXNlcyBzaG91bGRuJ3QgYmUgc3RvcmVkIGluIHRoZSB3ZWIgcHJvY2Vzcy4KKyAgICBtX3dlYkNv bnRleHQtPnNlbmRUb0FsbFByb2Nlc3Nlc1JlbGF1bmNoaW5nVGhlbUlmTmVjZXNzYXJ5KE1lc3Nh Z2VzOjpXZWJEYXRhYmFzZU1hbmFnZXI6OlNldFF1b3RhRm9yT3JpZ2luKG9yaWdpbi0+ZGF0YWJh c2VJZGVudGlmaWVyKCksIHF1b3RhKSk7CiB9CiAKIHZvaWQgV2ViRGF0YWJhc2VNYW5hZ2VyUHJv eHk6OmRpZE1vZGlmeU9yaWdpbihjb25zdCBTdHJpbmcmIG9yaWdpbklkZW50aWZpZXIpCkluZGV4 OiBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViR2VvbG9jYXRpb25NYW5hZ2VyUHJveHkuY3Bw Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJHZW9sb2NhdGlvbk1h bmFnZXJQcm94eS5jcHAJKHJldmlzaW9uIDgyODY3KQorKysgU291cmNlL1dlYktpdDIvVUlQcm9j ZXNzL1dlYkdlb2xvY2F0aW9uTWFuYWdlclByb3h5LmNwcAkod29ya2luZyBjb3B5KQpAQCAtNjEs OCArNjEsNyBAQCB2b2lkIFdlYkdlb2xvY2F0aW9uTWFuYWdlclByb3h5Ojpwcm92aWRlCiAgICAg aWYgKCFtX2NvbnRleHQpCiAgICAgICAgIHJldHVybjsKIAotICAgIC8vIEZJWE1FOiBTaG91bGQg dGhpcyBjaGVjayBmb3IgYSB2YWxpZCBwcm9jZXNzPwotICAgIG1fY29udGV4dC0+cHJvY2Vzcygp LT5zZW5kKE1lc3NhZ2VzOjpXZWJHZW9sb2NhdGlvbk1hbmFnZXI6OkRpZENoYW5nZVBvc2l0aW9u KHBvc2l0aW9uLT5kYXRhKCkpLCAwKTsKKyAgICBtX2NvbnRleHQtPnNlbmRUb0FsbFByb2Nlc3Nl cyhNZXNzYWdlczo6V2ViR2VvbG9jYXRpb25NYW5hZ2VyOjpEaWRDaGFuZ2VQb3NpdGlvbihwb3Np dGlvbi0+ZGF0YSgpKSk7CiB9CiAKIHZvaWQgV2ViR2VvbG9jYXRpb25NYW5hZ2VyUHJveHk6OnBy b3ZpZGVyRGlkRmFpbFRvRGV0ZXJtaW5lUG9zaXRpb24oKQpAQCAtNzAsOCArNjksNyBAQCB2b2lk IFdlYkdlb2xvY2F0aW9uTWFuYWdlclByb3h5Ojpwcm92aWRlCiAgICAgaWYgKCFtX2NvbnRleHQp CiAgICAgICAgIHJldHVybjsKIAotICAgIC8vIEZJWE1FOiBTaG91bGQgdGhpcyBjaGVjayBmb3Ig YSB2YWxpZCBwcm9jZXNzPwotICAgIG1fY29udGV4dC0+cHJvY2VzcygpLT5zZW5kKE1lc3NhZ2Vz OjpXZWJHZW9sb2NhdGlvbk1hbmFnZXI6OkRpZEZhaWxUb0RldGVybWluZVBvc2l0aW9uKCksIDAp OworICAgIG1fY29udGV4dC0+c2VuZFRvQWxsUHJvY2Vzc2VzKE1lc3NhZ2VzOjpXZWJHZW9sb2Nh dGlvbk1hbmFnZXI6OkRpZEZhaWxUb0RldGVybWluZVBvc2l0aW9uKCkpOwogfQogCiB2b2lkIFdl Ykdlb2xvY2F0aW9uTWFuYWdlclByb3h5OjpkaWRSZWNlaXZlTWVzc2FnZShDb3JlSVBDOjpDb25u ZWN0aW9uKiBjb25uZWN0aW9uLCBDb3JlSVBDOjpNZXNzYWdlSUQgbWVzc2FnZUlELCBDb3JlSVBD OjpBcmd1bWVudERlY29kZXIqIGFyZ3VtZW50cykKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1VJUHJv Y2Vzcy9XZWJJY29uRGF0YWJhc2UuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1VJ UHJvY2Vzcy9XZWJJY29uRGF0YWJhc2UuY3BwCShyZXZpc2lvbiA4Mjg2NykKKysrIFNvdXJjZS9X ZWJLaXQyL1VJUHJvY2Vzcy9XZWJJY29uRGF0YWJhc2UuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0x NTUsNyArMTU1LDggQEAgdm9pZCBXZWJJY29uRGF0YWJhc2U6OmdldExvYWREZWNpc2lvbkZvcgog ICAgICAgICByZXR1cm47CiAKICAgICBpZiAoIW1faWNvbkRhdGFiYXNlSW1wbCB8fCAhbV9pY29u RGF0YWJhc2VJbXBsLT5pc09wZW4oKSB8fCBpY29uVVJMLmlzRW1wdHkoKSkgewotICAgICAgICBt X3dlYkNvbnRleHQtPnByb2Nlc3MoKS0+c2VuZChNZXNzYWdlczo6V2ViSWNvbkRhdGFiYXNlUHJv eHk6OlJlY2VpdmVkSWNvbkxvYWREZWNpc2lvbihzdGF0aWNfY2FzdDxpbnQ+KEljb25Mb2FkTm8p LCBjYWxsYmFja0lEKSwgMCk7CisgICAgICAgIC8vIEZJWE1FIChNdWx0aS1wcm9jZXNzKTogV2Ug bmVlZCB0byBrbm93IHdoaWNoIGNvbm5lY3Rpb24gdG8gc2VuZCB0aGlzIG1lc3NhZ2UgdG8uCisg ICAgICAgIG1fd2ViQ29udGV4dC0+c2VuZFRvQWxsUHJvY2Vzc2VzKE1lc3NhZ2VzOjpXZWJJY29u RGF0YWJhc2VQcm94eTo6UmVjZWl2ZWRJY29uTG9hZERlY2lzaW9uKHN0YXRpY19jYXN0PGludD4o SWNvbkxvYWRObyksIGNhbGxiYWNrSUQpKTsKICAgICAgICAgcmV0dXJuOwogICAgIH0KICAgICAK QEAgLTE2OCw4ICsxNjksOSBAQCB2b2lkIFdlYkljb25EYXRhYmFzZTo6Z2V0TG9hZERlY2lzaW9u Rm9yCiAgICAgICAgIG1fcGVuZGluZ0xvYWREZWNpc2lvblVSTE1hcC5zZXQoY2FsbGJhY2tJRCwg aWNvblVSTCk7CiAgICAgICAgIHJldHVybjsgICAgCiAgICAgfQotICAgIAotICAgIG1fd2ViQ29u dGV4dC0+cHJvY2VzcygpLT5zZW5kKE1lc3NhZ2VzOjpXZWJJY29uRGF0YWJhc2VQcm94eTo6UmVj ZWl2ZWRJY29uTG9hZERlY2lzaW9uKChpbnQpZGVjaXNpb24sIGNhbGxiYWNrSUQpLCAwKTsKKwor ICAgIC8vIEZJWE1FIChNdWx0aS1wcm9jZXNzKTogV2UgbmVlZCB0byBrbm93IHdoaWNoIGNvbm5l Y3Rpb24gdG8gc2VuZCB0aGlzIG1lc3NhZ2UgdG8uCisgICAgbV93ZWJDb250ZXh0LT5zZW5kVG9B bGxQcm9jZXNzZXMoTWVzc2FnZXM6OldlYkljb25EYXRhYmFzZVByb3h5OjpSZWNlaXZlZEljb25M b2FkRGVjaXNpb24oKGludClkZWNpc2lvbiwgY2FsbGJhY2tJRCkpOwogfQogCiBJbWFnZSogV2Vi SWNvbkRhdGFiYXNlOjppbWFnZUZvclBhZ2VVUkwoY29uc3QgU3RyaW5nJiBwYWdlVVJMKQpAQCAt MjQzLDcgKzI0NSw4IEBAIHZvaWQgV2ViSWNvbkRhdGFiYXNlOjpkaWRGaW5pc2hVUkxJbXBvcnQK ICAgICAgICAgLy8gRGVjaXNpb25zIHNob3VsZCBuZXZlciBiZSB1bmtub3duIGFmdGVyIHRoZSBp bml0YWwgaW1wb3J0IGlzIGNvbXBsZXRlCiAgICAgICAgIEFTU0VSVChkZWNpc2lvbiAhPSBJY29u TG9hZFVua25vd24pOwogCi0gICAgICAgIG1fd2ViQ29udGV4dC0+cHJvY2VzcygpLT5zZW5kKE1l c3NhZ2VzOjpXZWJJY29uRGF0YWJhc2VQcm94eTo6UmVjZWl2ZWRJY29uTG9hZERlY2lzaW9uKHN0 YXRpY19jYXN0PGludD4oZGVjaXNpb24pLCBpLT5maXJzdCksIDApOworICAgICAgICAvLyBGSVhN RSAoTXVsdGktcHJvY2Vzcyk6IFdlIG5lZWQgdG8ga25vdyB3aGljaCBjb25uZWN0aW9uIHRvIHNl bmQgdGhpcyBtZXNzYWdlIHRvLgorICAgICAgICBtX3dlYkNvbnRleHQtPnNlbmRUb0FsbFByb2Nl c3NlcyhNZXNzYWdlczo6V2ViSWNvbkRhdGFiYXNlUHJveHk6OlJlY2VpdmVkSWNvbkxvYWREZWNp c2lvbihzdGF0aWNfY2FzdDxpbnQ+KGRlY2lzaW9uKSwgaS0+Zmlyc3QpKTsKICAgICB9CiAgICAg CiAgICAgbV9wZW5kaW5nTG9hZERlY2lzaW9uVVJMTWFwLmNsZWFyKCk7CkluZGV4OiBTb3VyY2Uv V2ViS2l0Mi9VSVByb2Nlc3MvV2ViS2V5VmFsdWVTdG9yYWdlTWFuYWdlclByb3h5LmNwcAo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViS2V5VmFsdWVTdG9yYWdlTWFu YWdlclByb3h5LmNwcAkocmV2aXNpb24gODI4NjcpCisrKyBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nl c3MvV2ViS2V5VmFsdWVTdG9yYWdlTWFuYWdlclByb3h5LmNwcAkod29ya2luZyBjb3B5KQpAQCAt NjUsMTEgKzY1LDExIEBAIHZvaWQgV2ViS2V5VmFsdWVTdG9yYWdlTWFuYWdlclByb3h5OjpkaWQK IHZvaWQgV2ViS2V5VmFsdWVTdG9yYWdlTWFuYWdlclByb3h5OjpnZXRLZXlWYWx1ZVN0b3JhZ2VP cmlnaW5zKFBhc3NSZWZQdHI8QXJyYXlDYWxsYmFjaz4gcHJwQ2FsbGJhY2spCiB7CiAgICAgUmVm UHRyPEFycmF5Q2FsbGJhY2s+IGNhbGxiYWNrID0gcHJwQ2FsbGJhY2s7Ci0gICAgbV93ZWJDb250 ZXh0LT5yZWxhdW5jaFByb2Nlc3NJZk5lY2Vzc2FyeSgpOwotICAgIAogICAgIHVpbnQ2NF90IGNh bGxiYWNrSUQgPSBjYWxsYmFjay0+Y2FsbGJhY2tJRCgpOwogICAgIG1fYXJyYXlDYWxsYmFja3Mu c2V0KGNhbGxiYWNrSUQsIGNhbGxiYWNrLnJlbGVhc2UoKSk7Ci0gICAgbV93ZWJDb250ZXh0LT5w cm9jZXNzKCktPnNlbmQoTWVzc2FnZXM6OldlYktleVZhbHVlU3RvcmFnZU1hbmFnZXI6OkdldEtl eVZhbHVlU3RvcmFnZU9yaWdpbnMoY2FsbGJhY2tJRCksIDApOworCisgICAgLy8gRklYTUUgKE11 bHRpLXByb2Nlc3MpOiBTaG91bGQga2V5LXZhbHVlIHN0b3JhZ2UgYmUgaGFuZGxlZCBpbiB0aGUg d2ViIHByb2Nlc3M/CisgICAgbV93ZWJDb250ZXh0LT5zZW5kVG9BbGxQcm9jZXNzZXNSZWxhdW5j aGluZ1RoZW1JZk5lY2Vzc2FyeShNZXNzYWdlczo6V2ViS2V5VmFsdWVTdG9yYWdlTWFuYWdlcjo6 R2V0S2V5VmFsdWVTdG9yYWdlT3JpZ2lucyhjYWxsYmFja0lEKSk7CiB9CiAgICAgCiB2b2lkIFdl YktleVZhbHVlU3RvcmFnZU1hbmFnZXJQcm94eTo6ZGlkR2V0S2V5VmFsdWVTdG9yYWdlT3JpZ2lu cyhjb25zdCBWZWN0b3I8U2VjdXJpdHlPcmlnaW5EYXRhPiYgb3JpZ2luRGF0YXMsIHVpbnQ2NF90 IGNhbGxiYWNrSUQpCkBAIC04MCwyMCArODAsMTkgQEAgdm9pZCBXZWJLZXlWYWx1ZVN0b3JhZ2VN YW5hZ2VyUHJveHk6OmRpZAogCiB2b2lkIFdlYktleVZhbHVlU3RvcmFnZU1hbmFnZXJQcm94eTo6 ZGVsZXRlRW50cmllc0Zvck9yaWdpbihXZWJTZWN1cml0eU9yaWdpbiogb3JpZ2luKQogewotICAg IG1fd2ViQ29udGV4dC0+cmVsYXVuY2hQcm9jZXNzSWZOZWNlc3NhcnkoKTsKLSAgICAKICAgICBT ZWN1cml0eU9yaWdpbkRhdGEgc2VjdXJpdHlPcmlnaW5EYXRhOwogICAgIHNlY3VyaXR5T3JpZ2lu RGF0YS5wcm90b2NvbCA9IG9yaWdpbi0+cHJvdG9jb2woKTsKICAgICBzZWN1cml0eU9yaWdpbkRh dGEuaG9zdCA9IG9yaWdpbi0+aG9zdCgpOwogICAgIHNlY3VyaXR5T3JpZ2luRGF0YS5wb3J0ID0g b3JpZ2luLT5wb3J0KCk7CiAKLSAgICBtX3dlYkNvbnRleHQtPnByb2Nlc3MoKS0+c2VuZChNZXNz YWdlczo6V2ViS2V5VmFsdWVTdG9yYWdlTWFuYWdlcjo6RGVsZXRlRW50cmllc0Zvck9yaWdpbihz ZWN1cml0eU9yaWdpbkRhdGEpLCAwKTsKKyAgICAvLyBGSVhNRSAoTXVsdGktcHJvY2Vzcyk6IFNo b3VsZCBrZXktdmFsdWUgc3RvcmFnZSBiZSBoYW5kbGVkIGluIHRoZSB3ZWIgcHJvY2Vzcz8KKyAg ICBtX3dlYkNvbnRleHQtPnNlbmRUb0FsbFByb2Nlc3Nlc1JlbGF1bmNoaW5nVGhlbUlmTmVjZXNz YXJ5KE1lc3NhZ2VzOjpXZWJLZXlWYWx1ZVN0b3JhZ2VNYW5hZ2VyOjpEZWxldGVFbnRyaWVzRm9y T3JpZ2luKHNlY3VyaXR5T3JpZ2luRGF0YSkpOwogfQogCiB2b2lkIFdlYktleVZhbHVlU3RvcmFn ZU1hbmFnZXJQcm94eTo6ZGVsZXRlQWxsRW50cmllcygpCiB7Ci0gICAgbV93ZWJDb250ZXh0LT5y ZWxhdW5jaFByb2Nlc3NJZk5lY2Vzc2FyeSgpOwotICAgIG1fd2ViQ29udGV4dC0+cHJvY2Vzcygp LT5zZW5kKE1lc3NhZ2VzOjpXZWJLZXlWYWx1ZVN0b3JhZ2VNYW5hZ2VyOjpEZWxldGVBbGxFbnRy aWVzKCksIDApOworICAgIC8vIEZJWE1FIChNdWx0aS1wcm9jZXNzKTogU2hvdWxkIGtleS12YWx1 ZSBzdG9yYWdlIGJlIGhhbmRsZWQgaW4gdGhlIHdlYiBwcm9jZXNzPworICAgIG1fd2ViQ29udGV4 dC0+c2VuZFRvQWxsUHJvY2Vzc2VzUmVsYXVuY2hpbmdUaGVtSWZOZWNlc3NhcnkoTWVzc2FnZXM6 OldlYktleVZhbHVlU3RvcmFnZU1hbmFnZXI6OkRlbGV0ZUFsbEVudHJpZXMoKSk7CiB9CiAKIH0g Ly8gbmFtZXNwYWNlIFdlYktpdApJbmRleDogU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYk1l ZGlhQ2FjaGVNYW5hZ2VyUHJveHkuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1VJ UHJvY2Vzcy9XZWJNZWRpYUNhY2hlTWFuYWdlclByb3h5LmNwcAkocmV2aXNpb24gODI4NjcpCisr KyBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViTWVkaWFDYWNoZU1hbmFnZXJQcm94eS5jcHAJ KHdvcmtpbmcgY29weSkKQEAgLTY0LDExICs2NCwxMiBAQCB2b2lkIFdlYk1lZGlhQ2FjaGVNYW5h Z2VyUHJveHk6OmRpZFJlY2VpCiB2b2lkIFdlYk1lZGlhQ2FjaGVNYW5hZ2VyUHJveHk6OmdldEhv c3RuYW1lc1dpdGhNZWRpYUNhY2hlKFBhc3NSZWZQdHI8QXJyYXlDYWxsYmFjaz4gcHJwQ2FsbGJh Y2spCiB7CiAgICAgUmVmUHRyPEFycmF5Q2FsbGJhY2s+IGNhbGxiYWNrID0gcHJwQ2FsbGJhY2s7 Ci0gICAgbV93ZWJDb250ZXh0LT5yZWxhdW5jaFByb2Nlc3NJZk5lY2Vzc2FyeSgpOwotICAgIAog ICAgIHVpbnQ2NF90IGNhbGxiYWNrSUQgPSBjYWxsYmFjay0+Y2FsbGJhY2tJRCgpOwogICAgIG1f YXJyYXlDYWxsYmFja3Muc2V0KGNhbGxiYWNrSUQsIGNhbGxiYWNrLnJlbGVhc2UoKSk7Ci0gICAg bV93ZWJDb250ZXh0LT5wcm9jZXNzKCktPnNlbmQoTWVzc2FnZXM6OldlYk1lZGlhQ2FjaGVNYW5h Z2VyOjpHZXRIb3N0bmFtZXNXaXRoTWVkaWFDYWNoZShjYWxsYmFja0lEKSwgMCk7CisKKyAgICAv LyBGSVhNRSAoTXVsdGktcHJvY2Vzcyk6IFdoZW4gd2UncmUgc2VuZGluZyB0aGlzIHRvIG11bHRp cGxlIHByb2Nlc3Nlcywgd2UgbmVlZCB0byBhZ2dyZWdhdGUgdGhlCisgICAgLy8gY2FsbGJhY2sg ZGF0YSB3aGVuIGl0IGNvbWVzIGJhY2suCisgICAgbV93ZWJDb250ZXh0LT5zZW5kVG9BbGxQcm9j ZXNzZXNSZWxhdW5jaGluZ1RoZW1JZk5lY2Vzc2FyeShNZXNzYWdlczo6V2ViTWVkaWFDYWNoZU1h bmFnZXI6OkdldEhvc3RuYW1lc1dpdGhNZWRpYUNhY2hlKGNhbGxiYWNrSUQpKTsKIH0KICAgICAK IHZvaWQgV2ViTWVkaWFDYWNoZU1hbmFnZXJQcm94eTo6ZGlkR2V0SG9zdG5hbWVzV2l0aE1lZGlh Q2FjaGUoY29uc3QgVmVjdG9yPFN0cmluZz4mIGhvc3RuYW1lTGlzdCwgdWludDY0X3QgY2FsbGJh Y2tJRCkKQEAgLTkwLDE0ICs5MSwxMiBAQCB2b2lkIFdlYk1lZGlhQ2FjaGVNYW5hZ2VyUHJveHk6 OmRpZEdldEhvCiAKIHZvaWQgV2ViTWVkaWFDYWNoZU1hbmFnZXJQcm94eTo6Y2xlYXJDYWNoZUZv ckhvc3RuYW1lKGNvbnN0IFN0cmluZyYgaG9zdG5hbWUpCiB7Ci0gICAgbV93ZWJDb250ZXh0LT5y ZWxhdW5jaFByb2Nlc3NJZk5lY2Vzc2FyeSgpOwotICAgIG1fd2ViQ29udGV4dC0+cHJvY2Vzcygp LT5zZW5kKE1lc3NhZ2VzOjpXZWJNZWRpYUNhY2hlTWFuYWdlcjo6Q2xlYXJDYWNoZUZvckhvc3Ru YW1lKGhvc3RuYW1lKSwgMCk7CisgICAgbV93ZWJDb250ZXh0LT5zZW5kVG9BbGxQcm9jZXNzZXNS ZWxhdW5jaGluZ1RoZW1JZk5lY2Vzc2FyeShNZXNzYWdlczo6V2ViTWVkaWFDYWNoZU1hbmFnZXI6 OkNsZWFyQ2FjaGVGb3JIb3N0bmFtZShob3N0bmFtZSkpOwogfQogCiB2b2lkIFdlYk1lZGlhQ2Fj aGVNYW5hZ2VyUHJveHk6OmNsZWFyQ2FjaGVGb3JBbGxIb3N0bmFtZXMoKQogewotICAgIG1fd2Vi Q29udGV4dC0+cmVsYXVuY2hQcm9jZXNzSWZOZWNlc3NhcnkoKTsKLSAgICBtX3dlYkNvbnRleHQt PnByb2Nlc3MoKS0+c2VuZChNZXNzYWdlczo6V2ViTWVkaWFDYWNoZU1hbmFnZXI6OkNsZWFyQ2Fj aGVGb3JBbGxIb3N0bmFtZXMoKSwgMCk7CisgICAgbV93ZWJDb250ZXh0LT5zZW5kVG9BbGxQcm9j ZXNzZXNSZWxhdW5jaGluZ1RoZW1JZk5lY2Vzc2FyeShNZXNzYWdlczo6V2ViTWVkaWFDYWNoZU1h bmFnZXI6OkNsZWFyQ2FjaGVGb3JBbGxIb3N0bmFtZXMoKSk7CiB9CiAKIH0gLy8gbmFtZXNwYWNl IFdlYktpdApJbmRleDogU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlJlc291cmNlQ2FjaGVN YW5hZ2VyUHJveHkuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9X ZWJSZXNvdXJjZUNhY2hlTWFuYWdlclByb3h5LmNwcAkocmV2aXNpb24gODI4NjcpCisrKyBTb3Vy Y2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUmVzb3VyY2VDYWNoZU1hbmFnZXJQcm94eS5jcHAJKHdv cmtpbmcgY29weSkKQEAgLTY3LDcgKzY3LDkgQEAgdm9pZCBXZWJSZXNvdXJjZUNhY2hlTWFuYWdl clByb3h5OjpnZXRDYQogICAgIG1fd2ViQ29udGV4dC0+cmVsYXVuY2hQcm9jZXNzSWZOZWNlc3Nh cnkoKTsKICAgICB1aW50NjRfdCBjYWxsYmFja0lEID0gY2FsbGJhY2stPmNhbGxiYWNrSUQoKTsK ICAgICBtX2FycmF5Q2FsbGJhY2tzLnNldChjYWxsYmFja0lELCBjYWxsYmFjay5yZWxlYXNlKCkp OwotICAgIG1fd2ViQ29udGV4dC0+cHJvY2VzcygpLT5zZW5kKE1lc3NhZ2VzOjpXZWJSZXNvdXJj ZUNhY2hlTWFuYWdlcjo6R2V0Q2FjaGVPcmlnaW5zKGNhbGxiYWNrSUQpLCAwKTsKKworICAgIC8v IEZJWE1FIChNdWx0aS1wcm9jZXNzKTogV2hlbiBtdWx0aS1wcm9jZXNzIGlzIGVuYWJsZWQsIHdl IG5lZWQgdG8gYWdncmVnYXRlIHRoZSBjYWxsYmFjayBkYXRhIGZyb20gYWxsIHByb2Nlc3Nlcy4K KyAgICBtX3dlYkNvbnRleHQtPnNlbmRUb0FsbFByb2Nlc3Nlc1JlbGF1bmNoaW5nVGhlbUlmTmVj ZXNzYXJ5KE1lc3NhZ2VzOjpXZWJSZXNvdXJjZUNhY2hlTWFuYWdlcjo6R2V0Q2FjaGVPcmlnaW5z KGNhbGxiYWNrSUQpKTsKIH0KIAogdm9pZCBXZWJSZXNvdXJjZUNhY2hlTWFuYWdlclByb3h5Ojpk aWRHZXRDYWNoZU9yaWdpbnMoY29uc3QgVmVjdG9yPFNlY3VyaXR5T3JpZ2luRGF0YT4mIG9yaWdp bnMsIHVpbnQ2NF90IGNhbGxiYWNrSUQpCkBAIC03OCwxOSArODAsMTcgQEAgdm9pZCBXZWJSZXNv dXJjZUNhY2hlTWFuYWdlclByb3h5OjpkaWRHZQogCiB2b2lkIFdlYlJlc291cmNlQ2FjaGVNYW5h Z2VyUHJveHk6OmNsZWFyQ2FjaGVGb3JPcmlnaW4oV2ViU2VjdXJpdHlPcmlnaW4qIG9yaWdpbikK IHsKLSAgICBtX3dlYkNvbnRleHQtPnJlbGF1bmNoUHJvY2Vzc0lmTmVjZXNzYXJ5KCk7Ci0KICAg ICBTZWN1cml0eU9yaWdpbkRhdGEgc2VjdXJpdHlPcmlnaW47CiAgICAgc2VjdXJpdHlPcmlnaW4u cHJvdG9jb2wgPSBvcmlnaW4tPnByb3RvY29sKCk7CiAgICAgc2VjdXJpdHlPcmlnaW4uaG9zdCA9 IG9yaWdpbi0+aG9zdCgpOwogICAgIHNlY3VyaXR5T3JpZ2luLnBvcnQgPSBvcmlnaW4tPnBvcnQo KTsKLSAgICBtX3dlYkNvbnRleHQtPnByb2Nlc3MoKS0+c2VuZChNZXNzYWdlczo6V2ViUmVzb3Vy Y2VDYWNoZU1hbmFnZXI6OkNsZWFyQ2FjaGVGb3JPcmlnaW4oc2VjdXJpdHlPcmlnaW4pLCAwKTsK KworICAgIG1fd2ViQ29udGV4dC0+c2VuZFRvQWxsUHJvY2Vzc2VzUmVsYXVuY2hpbmdUaGVtSWZO ZWNlc3NhcnkoTWVzc2FnZXM6OldlYlJlc291cmNlQ2FjaGVNYW5hZ2VyOjpDbGVhckNhY2hlRm9y T3JpZ2luKHNlY3VyaXR5T3JpZ2luKSk7CiB9CiAKIHZvaWQgV2ViUmVzb3VyY2VDYWNoZU1hbmFn ZXJQcm94eTo6Y2xlYXJDYWNoZUZvckFsbE9yaWdpbnMoKQogewotICAgIG1fd2ViQ29udGV4dC0+ cmVsYXVuY2hQcm9jZXNzSWZOZWNlc3NhcnkoKTsKLSAgICBtX3dlYkNvbnRleHQtPnByb2Nlc3Mo KS0+c2VuZChNZXNzYWdlczo6V2ViUmVzb3VyY2VDYWNoZU1hbmFnZXI6OkNsZWFyQ2FjaGVGb3JB bGxPcmlnaW5zKCksIDApOworICAgIG1fd2ViQ29udGV4dC0+c2VuZFRvQWxsUHJvY2Vzc2VzUmVs YXVuY2hpbmdUaGVtSWZOZWNlc3NhcnkoTWVzc2FnZXM6OldlYlJlc291cmNlQ2FjaGVNYW5hZ2Vy OjpDbGVhckNhY2hlRm9yQWxsT3JpZ2lucygpKTsKIH0KIAogfSAvLyBuYW1lc3BhY2UgV2ViS2l0 CkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvRG93bmxvYWRzL0Rvd25sb2FkUHJveHku Y3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9Eb3dubG9hZHMvRG93 bmxvYWRQcm94eS5jcHAJKHJldmlzaW9uIDgyODY3KQorKysgU291cmNlL1dlYktpdDIvVUlQcm9j ZXNzL0Rvd25sb2Fkcy9Eb3dubG9hZFByb3h5LmNwcAkod29ya2luZyBjb3B5KQpAQCAtNjUsNyAr NjUsOCBAQCB2b2lkIERvd25sb2FkUHJveHk6OmNhbmNlbCgpCiAgICAgaWYgKCFtX3dlYkNvbnRl eHQpCiAgICAgICAgIHJldHVybjsKIAotICAgIG1fd2ViQ29udGV4dC0+cHJvY2VzcygpLT5zZW5k KE1lc3NhZ2VzOjpXZWJQcm9jZXNzOjpDYW5jZWxEb3dubG9hZChtX2Rvd25sb2FkSUQpLCAwKTsK KyAgICAvLyBGSVhNRSAoTXVsdGktcHJvY2Vzcyk6IERvd25sb2FkcyBzaG91bGRuJ3QgYmUgaGFu ZGxlZCBpbiB0aGUgd2ViIHByb2Nlc3MuCisgICAgbV93ZWJDb250ZXh0LT5zZW5kVG9BbGxQcm9j ZXNzZXMoTWVzc2FnZXM6OldlYlByb2Nlc3M6OkNhbmNlbERvd25sb2FkKG1fZG93bmxvYWRJRCkp OwogfQogCiB2b2lkIERvd25sb2FkUHJveHk6OmludmFsaWRhdGUoKQpJbmRleDogU291cmNlL1dl YktpdDIvVUlQcm9jZXNzL1BsdWdpbnMvV2ViUGx1Z2luU2l0ZURhdGFNYW5hZ2VyLmNwcAo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvUGx1Z2lucy9XZWJQbHVnaW5TaXRl RGF0YU1hbmFnZXIuY3BwCShyZXZpc2lvbiA4Mjg2NykKKysrIFNvdXJjZS9XZWJLaXQyL1VJUHJv Y2Vzcy9QbHVnaW5zL1dlYlBsdWdpblNpdGVEYXRhTWFuYWdlci5jcHAJKHdvcmtpbmcgY29weSkK QEAgLTE2Nyw4ICsxNjcsMTAgQEAgdm9pZCBXZWJQbHVnaW5TaXRlRGF0YU1hbmFnZXI6OmdldFNp dGVzVwogCiAgICAgVmVjdG9yPFN0cmluZz4gcGx1Z2luUGF0aHM7CiAgICAgbV93ZWJDb250ZXh0 LT5wbHVnaW5JbmZvU3RvcmUoKS0+Z2V0UGx1Z2luUGF0aHMocGx1Z2luUGF0aHMpOwotICAgIG1f d2ViQ29udGV4dC0+ZW5zdXJlV2ViUHJvY2VzcygpOyAgICAKLSAgICBtX3dlYkNvbnRleHQtPnBy b2Nlc3MoKS0+c2VuZChNZXNzYWdlczo6V2ViUHJvY2Vzczo6R2V0U2l0ZXNXaXRoUGx1Z2luRGF0 YShwbHVnaW5QYXRocywgY2FsbGJhY2tJRCksIDApOworCisgICAgLy8gRklYTUUgKE11bHRpLXBy b2Nlc3MpOiBXaGVuIG11bHRpLXByb2Nlc3MgaXMgZW5hYmxlZCwgd2UgbXVzdCBhbHdheXMgdXNl IGEgcGx1Zy1pbiBwcm9jZXNzIGZvciB0aGlzLAorICAgIC8vIHNvIHRoaXMgY29kZSBzaG91bGQg anVzdCBiZSByZW1vdmVkLgorICAgIG1fd2ViQ29udGV4dC0+c2VuZFRvQWxsUHJvY2Vzc2VzUmVs YXVuY2hpbmdUaGVtSWZOZWNlc3NhcnkoTWVzc2FnZXM6OldlYlByb2Nlc3M6OkdldFNpdGVzV2l0 aFBsdWdpbkRhdGEocGx1Z2luUGF0aHMsIGNhbGxiYWNrSUQpKTsKICNlbmRpZgogfQogCkBAIC0y MjYsOCArMjI4LDEwIEBAIHZvaWQgV2ViUGx1Z2luU2l0ZURhdGFNYW5hZ2VyOjpjbGVhclNpdGUK ICAgICBtX3dlYkNvbnRleHQtPnJlbGF1bmNoUHJvY2Vzc0lmTmVjZXNzYXJ5KCk7CiAgICAgVmVj dG9yPFN0cmluZz4gcGx1Z2luUGF0aHM7CiAgICAgbV93ZWJDb250ZXh0LT5wbHVnaW5JbmZvU3Rv cmUoKS0+Z2V0UGx1Z2luUGF0aHMocGx1Z2luUGF0aHMpOwotICAgIG1fd2ViQ29udGV4dC0+ZW5z dXJlV2ViUHJvY2VzcygpOyAgICAKLSAgICBtX3dlYkNvbnRleHQtPnByb2Nlc3MoKS0+c2VuZChN ZXNzYWdlczo6V2ViUHJvY2Vzczo6Q2xlYXJQbHVnaW5TaXRlRGF0YShwbHVnaW5QYXRocywgc2l0 ZXNWZWN0b3IsIGZsYWdzLCBtYXhBZ2VJblNlY29uZHMsIGNhbGxiYWNrSUQpLCAwKTsKKworICAg IC8vIEZJWE1FIChNdWx0aS1wcm9jZXNzKTogV2hlbiBtdWx0aS1wcm9jZXNzIGlzIGVuYWJsZWQs IHdlIG11c3QgYWx3YXlzIHVzZSBhIHBsdWctaW4gcHJvY2VzcyBmb3IgdGhpcywKKyAgICAvLyBz byB0aGlzIGNvZGUgc2hvdWxkIGp1c3QgYmUgcmVtb3ZlZC4KKyAgICBtX3dlYkNvbnRleHQtPnNl bmRUb0FsbFByb2Nlc3Nlc1JlbGF1bmNoaW5nVGhlbUlmTmVjZXNzYXJ5KE1lc3NhZ2VzOjpXZWJQ cm9jZXNzOjpDbGVhclBsdWdpblNpdGVEYXRhKHBsdWdpblBhdGhzLCBzaXRlc1ZlY3RvciwgZmxh Z3MsIG1heEFnZUluU2Vjb25kcywgY2FsbGJhY2tJRCkpOwogI2VuZGlmCiB9CiAK