139991 2014-12-29 10:48:25 -0800 Convert all variadic web process messages to UserData 2014-12-29 11:02:09 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 andersca andersca oldest_to_newest 1058111 0 andersca 2014-12-29 10:48:25 -0800 Convert all variadic web process messages to UserData 1058112 1 243801 andersca 2014-12-29 10:49:17 -0800 Created attachment 243801 Patch 1058115 2 andersca 2014-12-29 11:02:09 -0800 Committed r177796: <http://trac.webkit.org/changeset/177796> 243801 2014-12-29 10:49:17 -0800 2014-12-29 10:59:02 -0800 Patch bug-139991-20141229104922.patch text/plain 21479 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogMTc3Nzk1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggYTkyMmFjNjc5MGM0Mjlh ZGViYTYyMDc5NzhkNTBhYjA3YjlhZjhlOC4uZGJjYmU4MDU5NzdkMzc5NmI2MThiNWE4NGU5YTVk YjRhMDg5NDAyOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDM0IEBACiAyMDE0LTEyLTI5ICBBbmRl cnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CiAKKyAgICAgICAgQ29udmVydCBhbGwg dmFyaWFkaWMgd2ViIHByb2Nlc3MgbWVzc2FnZXMgdG8gVXNlckRhdGEKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEzOTk5MQorCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogVUlQcm9jZXNzL1dlYlBhZ2VQcm94 eS5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2VQcm94eTo6bG9hZFJlcXVlc3QpOgorICAg ICAgICAoV2ViS2l0OjpXZWJQYWdlUHJveHk6OmxvYWRGaWxlKToKKyAgICAgICAgKFdlYktpdDo6 V2ViUGFnZVByb3h5Ojpsb2FkRGF0YSk6CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2VQcm94eTo6 bG9hZEhUTUxTdHJpbmcpOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlUHJveHk6OmxvYWRBbHRl cm5hdGVIVE1MU3RyaW5nKToKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZVByb3h5Ojpsb2FkUGxh aW5UZXh0U3RyaW5nKToKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZVByb3h5Ojpsb2FkV2ViQXJj aGl2ZURhdGEpOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlUHJveHk6OnBvc3RNZXNzYWdlVG9J bmplY3RlZEJ1bmRsZSk6CisgICAgICAgICogV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3Bw OgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlOjpsb2FkUmVxdWVzdCk6CisgICAgICAgIChXZWJL aXQ6OldlYlBhZ2U6OmxvYWREYXRhSW1wbCk6CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2U6Omxv YWRTdHJpbmcpOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlOjpsb2FkRGF0YSk6CisgICAgICAg IChXZWJLaXQ6OldlYlBhZ2U6OmxvYWRIVE1MU3RyaW5nKToKKyAgICAgICAgKFdlYktpdDo6V2Vi UGFnZTo6bG9hZEFsdGVybmF0ZUhUTUxTdHJpbmcpOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdl Ojpsb2FkUGxhaW5UZXh0U3RyaW5nKToKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZTo6bG9hZFdl YkFyY2hpdmVEYXRhKToKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZTo6cG9zdEluamVjdGVkQnVu ZGxlTWVzc2FnZSk6CisgICAgICAgICogV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuaDoKKyAg ICAgICAgKiBXZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5tZXNzYWdlcy5pbjoKKworMjAxNC0x Mi0yOSAgQW5kZXJzIENhcmxzc29uICA8YW5kZXJzY2FAYXBwbGUuY29tPgorCiAgICAgICAgIENv bnZlcnQgYWxsIHZhcmlhZGljIFdlYlByb2Nlc3NQcm94eSBtZXNzYWdlIG92ZXIgdG8gVXNlckRh dGEKICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEzOTk5 MAogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNw cCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwCmluZGV4IDc3ZTlj ZGZhN2E3NmQwYzY2YTA0YWExYzhjNTRiYjAwM2E3ODkyYjQuLmRmNWQ2ODEzY2UxYTFiMDM3MWEw NjM1YjVlMDJmNDgxMjk1ZTM2NzkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vz cy9XZWJQYWdlUHJveHkuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdl UHJveHkuY3BwCkBAIC03NDMsNyArNzQzLDcgQEAgdWludDY0X3QgV2ViUGFnZVByb3h5Ojpsb2Fk UmVxdWVzdChjb25zdCBSZXNvdXJjZVJlcXVlc3QmIHJlcXVlc3QsIEFQSTo6T2JqZWN0KgogICAg IGJvb2wgY3JlYXRlZEV4dGVuc2lvbiA9IG1heWJlSW5pdGlhbGl6ZVNhbmRib3hFeHRlbnNpb25I YW5kbGUocmVxdWVzdC51cmwoKSwgc2FuZGJveEV4dGVuc2lvbkhhbmRsZSk7CiAgICAgaWYgKGNy ZWF0ZWRFeHRlbnNpb24pCiAgICAgICAgIG1fcHJvY2Vzcy0+d2lsbEFjcXVpcmVVbml2ZXJzYWxG aWxlUmVhZFNhbmRib3hFeHRlbnNpb24oKTsKLSAgICBtX3Byb2Nlc3MtPnNlbmQoTWVzc2FnZXM6 OldlYlBhZ2U6OkxvYWRSZXF1ZXN0KG5hdmlnYXRpb25JRCwgcmVxdWVzdCwgc2FuZGJveEV4dGVu c2lvbkhhbmRsZSwgV2ViQ29udGV4dFVzZXJNZXNzYWdlRW5jb2Rlcih1c2VyRGF0YSwgcHJvY2Vz cygpKSksIG1fcGFnZUlEKTsKKyAgICBtX3Byb2Nlc3MtPnNlbmQoTWVzc2FnZXM6OldlYlBhZ2U6 OkxvYWRSZXF1ZXN0KG5hdmlnYXRpb25JRCwgcmVxdWVzdCwgc2FuZGJveEV4dGVuc2lvbkhhbmRs ZSwgVXNlckRhdGEocHJvY2VzcygpLnRyYW5zZm9ybU9iamVjdHNUb0hhbmRsZXModXNlckRhdGEp LmdldCgpKSksIG1fcGFnZUlEKTsKICAgICBtX3Byb2Nlc3MtPnJlc3BvbnNpdmVuZXNzVGltZXIo KS0+c3RhcnQoKTsKIAogICAgIHJldHVybiBuYXZpZ2F0aW9uSUQ7CkBAIC03ODEsNyArNzgxLDcg QEAgdWludDY0X3QgV2ViUGFnZVByb3h5Ojpsb2FkRmlsZShjb25zdCBTdHJpbmcmIGZpbGVVUkxT dHJpbmcsIGNvbnN0IFN0cmluZyYgcmVzb3UKICAgICBTYW5kYm94RXh0ZW5zaW9uOjpIYW5kbGUg c2FuZGJveEV4dGVuc2lvbkhhbmRsZTsKICAgICBTYW5kYm94RXh0ZW5zaW9uOjpjcmVhdGVIYW5k bGUocmVzb3VyY2VEaXJlY3RvcnlQYXRoLCBTYW5kYm94RXh0ZW5zaW9uOjpSZWFkT25seSwgc2Fu ZGJveEV4dGVuc2lvbkhhbmRsZSk7CiAgICAgbV9wcm9jZXNzLT5hc3N1bWVSZWFkQWNjZXNzVG9C YXNlVVJMKHJlc291cmNlRGlyZWN0b3J5VVJMKTsKLSAgICBtX3Byb2Nlc3MtPnNlbmQoTWVzc2Fn ZXM6OldlYlBhZ2U6OkxvYWRSZXF1ZXN0KG5hdmlnYXRpb25JRCwgZmlsZVVSTCwgc2FuZGJveEV4 dGVuc2lvbkhhbmRsZSwgV2ViQ29udGV4dFVzZXJNZXNzYWdlRW5jb2Rlcih1c2VyRGF0YSwgcHJv Y2VzcygpKSksIG1fcGFnZUlEKTsKKyAgICBtX3Byb2Nlc3MtPnNlbmQoTWVzc2FnZXM6OldlYlBh Z2U6OkxvYWRSZXF1ZXN0KG5hdmlnYXRpb25JRCwgZmlsZVVSTCwgc2FuZGJveEV4dGVuc2lvbkhh bmRsZSwgVXNlckRhdGEocHJvY2VzcygpLnRyYW5zZm9ybU9iamVjdHNUb0hhbmRsZXModXNlckRh dGEpLmdldCgpKSksIG1fcGFnZUlEKTsKICAgICBtX3Byb2Nlc3MtPnJlc3BvbnNpdmVuZXNzVGlt ZXIoKS0+c3RhcnQoKTsKIAogICAgIHJldHVybiBuYXZpZ2F0aW9uSUQ7CkBAIC04MDIsNyArODAy LDcgQEAgdWludDY0X3QgV2ViUGFnZVByb3h5Ojpsb2FkRGF0YShBUEk6OkRhdGEqIGRhdGEsIGNv bnN0IFN0cmluZyYgTUlNRVR5cGUsIGNvbnN0IFMKICAgICAgICAgcmVhdHRhY2hUb1dlYlByb2Nl c3MoKTsKIAogICAgIG1fcHJvY2Vzcy0+YXNzdW1lUmVhZEFjY2Vzc1RvQmFzZVVSTChiYXNlVVJM KTsKLSAgICBtX3Byb2Nlc3MtPnNlbmQoTWVzc2FnZXM6OldlYlBhZ2U6OkxvYWREYXRhKGRhdGEt PmRhdGFSZWZlcmVuY2UoKSwgTUlNRVR5cGUsIGVuY29kaW5nLCBiYXNlVVJMLCBXZWJDb250ZXh0 VXNlck1lc3NhZ2VFbmNvZGVyKHVzZXJEYXRhLCBwcm9jZXNzKCkpKSwgbV9wYWdlSUQpOworICAg IG1fcHJvY2Vzcy0+c2VuZChNZXNzYWdlczo6V2ViUGFnZTo6TG9hZERhdGEoZGF0YS0+ZGF0YVJl ZmVyZW5jZSgpLCBNSU1FVHlwZSwgZW5jb2RpbmcsIGJhc2VVUkwsIFVzZXJEYXRhKHByb2Nlc3Mo KS50cmFuc2Zvcm1PYmplY3RzVG9IYW5kbGVzKHVzZXJEYXRhKS5nZXQoKSkpLCBtX3BhZ2VJRCk7 CiAgICAgbV9wcm9jZXNzLT5yZXNwb25zaXZlbmVzc1RpbWVyKCktPnN0YXJ0KCk7CiAKICAgICBy ZXR1cm4gbmF2aWdhdGlvbklEOwpAQCAtODI0LDcgKzgyNCw3IEBAIHVpbnQ2NF90IFdlYlBhZ2VQ cm94eTo6bG9hZEhUTUxTdHJpbmcoY29uc3QgU3RyaW5nJiBodG1sU3RyaW5nLCBjb25zdCBTdHJp bmcmIGJhCiAgICAgICAgIHJlYXR0YWNoVG9XZWJQcm9jZXNzKCk7CiAKICAgICBtX3Byb2Nlc3Mt PmFzc3VtZVJlYWRBY2Nlc3NUb0Jhc2VVUkwoYmFzZVVSTCk7Ci0gICAgbV9wcm9jZXNzLT5zZW5k KE1lc3NhZ2VzOjpXZWJQYWdlOjpMb2FkSFRNTFN0cmluZyhuYXZpZ2F0aW9uSUQsIGh0bWxTdHJp bmcsIGJhc2VVUkwsIFdlYkNvbnRleHRVc2VyTWVzc2FnZUVuY29kZXIodXNlckRhdGEsIHByb2Nl c3MoKSkpLCBtX3BhZ2VJRCk7CisgICAgbV9wcm9jZXNzLT5zZW5kKE1lc3NhZ2VzOjpXZWJQYWdl OjpMb2FkSFRNTFN0cmluZyhuYXZpZ2F0aW9uSUQsIGh0bWxTdHJpbmcsIGJhc2VVUkwsIFVzZXJE YXRhKHByb2Nlc3MoKS50cmFuc2Zvcm1PYmplY3RzVG9IYW5kbGVzKHVzZXJEYXRhKS5nZXQoKSkp LCBtX3BhZ2VJRCk7CiAgICAgbV9wcm9jZXNzLT5yZXNwb25zaXZlbmVzc1RpbWVyKCktPnN0YXJ0 KCk7CiAKICAgICByZXR1cm4gbmF2aWdhdGlvbklEOwpAQCAtODQ2LDcgKzg0Niw3IEBAIHZvaWQg V2ViUGFnZVByb3h5Ojpsb2FkQWx0ZXJuYXRlSFRNTFN0cmluZyhjb25zdCBTdHJpbmcmIGh0bWxT dHJpbmcsIGNvbnN0IFN0cmluCiAgICAgICAgIG1fbWFpbkZyYW1lLT5zZXRVbnJlYWNoYWJsZVVS TCh1bnJlYWNoYWJsZVVSTCk7CiAKICAgICBtX3Byb2Nlc3MtPmFzc3VtZVJlYWRBY2Nlc3NUb0Jh c2VVUkwoYmFzZVVSTCk7Ci0gICAgbV9wcm9jZXNzLT5zZW5kKE1lc3NhZ2VzOjpXZWJQYWdlOjpM b2FkQWx0ZXJuYXRlSFRNTFN0cmluZyhodG1sU3RyaW5nLCBiYXNlVVJMLCB1bnJlYWNoYWJsZVVS TCwgV2ViQ29udGV4dFVzZXJNZXNzYWdlRW5jb2Rlcih1c2VyRGF0YSwgcHJvY2VzcygpKSksIG1f cGFnZUlEKTsKKyAgICBtX3Byb2Nlc3MtPnNlbmQoTWVzc2FnZXM6OldlYlBhZ2U6OkxvYWRBbHRl cm5hdGVIVE1MU3RyaW5nKGh0bWxTdHJpbmcsIGJhc2VVUkwsIHVucmVhY2hhYmxlVVJMLCBVc2Vy RGF0YShwcm9jZXNzKCkudHJhbnNmb3JtT2JqZWN0c1RvSGFuZGxlcyh1c2VyRGF0YSkuZ2V0KCkp KSwgbV9wYWdlSUQpOwogICAgIG1fcHJvY2Vzcy0+cmVzcG9uc2l2ZW5lc3NUaW1lcigpLT5zdGFy dCgpOwogfQogCkBAIC04NTgsNyArODU4LDcgQEAgdm9pZCBXZWJQYWdlUHJveHk6OmxvYWRQbGFp blRleHRTdHJpbmcoY29uc3QgU3RyaW5nJiBzdHJpbmcsIEFQSTo6T2JqZWN0KiB1c2VyRGEKICAg ICBpZiAoIWlzVmFsaWQoKSkKICAgICAgICAgcmVhdHRhY2hUb1dlYlByb2Nlc3MoKTsKIAotICAg IG1fcHJvY2Vzcy0+c2VuZChNZXNzYWdlczo6V2ViUGFnZTo6TG9hZFBsYWluVGV4dFN0cmluZyhz dHJpbmcsIFdlYkNvbnRleHRVc2VyTWVzc2FnZUVuY29kZXIodXNlckRhdGEsIHByb2Nlc3MoKSkp LCBtX3BhZ2VJRCk7CisgICAgbV9wcm9jZXNzLT5zZW5kKE1lc3NhZ2VzOjpXZWJQYWdlOjpMb2Fk UGxhaW5UZXh0U3RyaW5nKHN0cmluZywgVXNlckRhdGEocHJvY2VzcygpLnRyYW5zZm9ybU9iamVj dHNUb0hhbmRsZXModXNlckRhdGEpLmdldCgpKSksIG1fcGFnZUlEKTsKICAgICBtX3Byb2Nlc3Mt PnJlc3BvbnNpdmVuZXNzVGltZXIoKS0+c3RhcnQoKTsKIH0KIApAQCAtODcwLDcgKzg3MCw3IEBA IHZvaWQgV2ViUGFnZVByb3h5Ojpsb2FkV2ViQXJjaGl2ZURhdGEoQVBJOjpEYXRhKiB3ZWJBcmNo aXZlRGF0YSwgQVBJOjpPYmplY3QqIHVzCiAgICAgaWYgKCFpc1ZhbGlkKCkpCiAgICAgICAgIHJl YXR0YWNoVG9XZWJQcm9jZXNzKCk7CiAKLSAgICBtX3Byb2Nlc3MtPnNlbmQoTWVzc2FnZXM6Oldl YlBhZ2U6OkxvYWRXZWJBcmNoaXZlRGF0YSh3ZWJBcmNoaXZlRGF0YS0+ZGF0YVJlZmVyZW5jZSgp LCBXZWJDb250ZXh0VXNlck1lc3NhZ2VFbmNvZGVyKHVzZXJEYXRhLCBwcm9jZXNzKCkpKSwgbV9w YWdlSUQpOworICAgIG1fcHJvY2Vzcy0+c2VuZChNZXNzYWdlczo6V2ViUGFnZTo6TG9hZFdlYkFy Y2hpdmVEYXRhKHdlYkFyY2hpdmVEYXRhLT5kYXRhUmVmZXJlbmNlKCksIFVzZXJEYXRhKHByb2Nl c3MoKS50cmFuc2Zvcm1PYmplY3RzVG9IYW5kbGVzKHVzZXJEYXRhKS5nZXQoKSkpLCBtX3BhZ2VJ RCk7CiAgICAgbV9wcm9jZXNzLT5yZXNwb25zaXZlbmVzc1RpbWVyKCktPnN0YXJ0KCk7CiB9CiAK QEAgLTM2ODksNyArMzY4OSw3IEBAIE5hdGl2ZVdlYk1vdXNlRXZlbnQqIFdlYlBhZ2VQcm94eTo6 Y3VycmVudGx5UHJvY2Vzc2VkTW91c2VEb3duRXZlbnQoKQogCiB2b2lkIFdlYlBhZ2VQcm94eTo6 cG9zdE1lc3NhZ2VUb0luamVjdGVkQnVuZGxlKGNvbnN0IFN0cmluZyYgbWVzc2FnZU5hbWUsIEFQ STo6T2JqZWN0KiBtZXNzYWdlQm9keSkKIHsKLSAgICBwcm9jZXNzKCkuc2VuZChNZXNzYWdlczo6 V2ViUGFnZTo6UG9zdEluamVjdGVkQnVuZGxlTWVzc2FnZShtZXNzYWdlTmFtZSwgV2ViQ29udGV4 dFVzZXJNZXNzYWdlRW5jb2RlcihtZXNzYWdlQm9keSwgcHJvY2VzcygpKSksIG1fcGFnZUlEKTsK KyAgICBwcm9jZXNzKCkuc2VuZChNZXNzYWdlczo6V2ViUGFnZTo6UG9zdEluamVjdGVkQnVuZGxl TWVzc2FnZShtZXNzYWdlTmFtZSwgVXNlckRhdGEocHJvY2VzcygpLnRyYW5zZm9ybU9iamVjdHNU b0hhbmRsZXMobWVzc2FnZUJvZHkpLmdldCgpKSksIG1fcGFnZUlEKTsKIH0KIAogI2lmIFBMQVRG T1JNKEdUSykKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9X ZWJQYWdlLmNwcCBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNw cAppbmRleCA1NGFmZWYzNjhmZjViYmUyY2Q4MmRkM2FiYTg5MDc1MzY5MWViNDkyLi4zNTZiMzE2 NTQzODIxZmVkY2Q1NGJkZGM4OTQ0Mzk4OWUwYTBiN2ZhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi S2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHAKKysrIGIvU291cmNlL1dlYktpdDIv V2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwCkBAIC0xMDUyLDIyICsxMDUyLDE3IEBAIHZv aWQgV2ViUGFnZTo6bG9hZFVSTEluRnJhbWUoY29uc3QgU3RyaW5nJiB1cmwsIHVpbnQ2NF90IGZy YW1lSUQpCiAgICAgZnJhbWUtPmNvcmVGcmFtZSgpLT5sb2FkZXIoKS5sb2FkKEZyYW1lTG9hZFJl cXVlc3QoZnJhbWUtPmNvcmVGcmFtZSgpLCBSZXNvdXJjZVJlcXVlc3QoVVJMKFVSTCgpLCB1cmwp KSkpOwogfQogCi12b2lkIFdlYlBhZ2U6OmxvYWRSZXF1ZXN0KHVpbnQ2NF90IG5hdmlnYXRpb25J RCwgY29uc3QgUmVzb3VyY2VSZXF1ZXN0JiByZXF1ZXN0LCBjb25zdCBTYW5kYm94RXh0ZW5zaW9u OjpIYW5kbGUmIHNhbmRib3hFeHRlbnNpb25IYW5kbGUsIElQQzo6TWVzc2FnZURlY29kZXImIGRl Y29kZXIpCit2b2lkIFdlYlBhZ2U6OmxvYWRSZXF1ZXN0KHVpbnQ2NF90IG5hdmlnYXRpb25JRCwg Y29uc3QgUmVzb3VyY2VSZXF1ZXN0JiByZXF1ZXN0LCBjb25zdCBTYW5kYm94RXh0ZW5zaW9uOjpI YW5kbGUmIHNhbmRib3hFeHRlbnNpb25IYW5kbGUsIGNvbnN0IFVzZXJEYXRhJiB1c2VyRGF0YSkK IHsKICAgICBTZW5kU3RvcFJlc3BvbnNpdmVuZXNzVGltZXIgc3RvcHBlcih0aGlzKTsKIAotICAg IFJlZlB0cjxBUEk6Ok9iamVjdD4gdXNlckRhdGE7Ci0gICAgSW5qZWN0ZWRCdW5kbGVVc2VyTWVz c2FnZURlY29kZXIgdXNlck1lc3NhZ2VEZWNvZGVyKHVzZXJEYXRhKTsKLSAgICBpZiAoIWRlY29k ZXIuZGVjb2RlKHVzZXJNZXNzYWdlRGVjb2RlcikpCi0gICAgICAgIHJldHVybjsKLQogICAgIG1f cGVuZGluZ05hdmlnYXRpb25JRCA9IG5hdmlnYXRpb25JRDsKIAogICAgIG1fc2FuZGJveEV4dGVu c2lvblRyYWNrZXIuYmVnaW5Mb2FkKG1fbWFpbkZyYW1lLmdldCgpLCBzYW5kYm94RXh0ZW5zaW9u SGFuZGxlKTsKIAogICAgIC8vIExldCB0aGUgSW5qZWN0ZWRCdW5kbGUga25vdyB3ZSBhcmUgYWJv dXQgdG8gc3RhcnQgdGhlIGxvYWQsIHBhc3NpbmcgdGhlIHVzZXIgZGF0YSBmcm9tIHRoZSBVSVBy b2Nlc3MKICAgICAvLyB0byBhbGwgdGhlIGNsaWVudCB0byBzZXQgdXAgYW55IG5lZWRlZCBzdGF0 ZS4KLSAgICBtX2xvYWRlckNsaWVudC53aWxsTG9hZFVSTFJlcXVlc3QodGhpcywgcmVxdWVzdCwg dXNlckRhdGEuZ2V0KCkpOworICAgIG1fbG9hZGVyQ2xpZW50LndpbGxMb2FkVVJMUmVxdWVzdCh0 aGlzLCByZXF1ZXN0LCBXZWJQcm9jZXNzOjpzaGFyZWQoKS50cmFuc2Zvcm1IYW5kbGVzVG9PYmpl Y3RzKHVzZXJEYXRhLm9iamVjdCgpKS5nZXQoKSk7CiAKICAgICAvLyBJbml0YXRlIHRoZSBsb2Fk IGluIFdlYkNvcmUuCiAgICAgY29yZVBhZ2UoKS0+dXNlcklucHV0QnJpZGdlKCkubG9hZFJlcXVl c3QoRnJhbWVMb2FkUmVxdWVzdChtX21haW5GcmFtZS0+Y29yZUZyYW1lKCksIHJlcXVlc3QpKTsK QEAgLTEwNzUsMTUgKzEwNzAsMTAgQEAgdm9pZCBXZWJQYWdlOjpsb2FkUmVxdWVzdCh1aW50NjRf dCBuYXZpZ2F0aW9uSUQsIGNvbnN0IFJlc291cmNlUmVxdWVzdCYgcmVxdWVzdCwKICAgICBBU1NF UlQoIW1fcGVuZGluZ05hdmlnYXRpb25JRCk7CiB9CiAKLXZvaWQgV2ViUGFnZTo6bG9hZERhdGFJ bXBsKHVpbnQ2NF90IG5hdmlnYXRpb25JRCwgUGFzc1JlZlB0cjxTaGFyZWRCdWZmZXI+IHNoYXJl ZEJ1ZmZlciwgY29uc3QgU3RyaW5nJiBNSU1FVHlwZSwgY29uc3QgU3RyaW5nJiBlbmNvZGluZ05h bWUsIGNvbnN0IFVSTCYgYmFzZVVSTCwgY29uc3QgVVJMJiB1bnJlYWNoYWJsZVVSTCwgSVBDOjpN ZXNzYWdlRGVjb2RlciYgZGVjb2RlcikKK3ZvaWQgV2ViUGFnZTo6bG9hZERhdGFJbXBsKHVpbnQ2 NF90IG5hdmlnYXRpb25JRCwgUGFzc1JlZlB0cjxTaGFyZWRCdWZmZXI+IHNoYXJlZEJ1ZmZlciwg Y29uc3QgU3RyaW5nJiBNSU1FVHlwZSwgY29uc3QgU3RyaW5nJiBlbmNvZGluZ05hbWUsIGNvbnN0 IFVSTCYgYmFzZVVSTCwgY29uc3QgVVJMJiB1bnJlYWNoYWJsZVVSTCwgY29uc3QgVXNlckRhdGEm IHVzZXJEYXRhKQogewogICAgIFNlbmRTdG9wUmVzcG9uc2l2ZW5lc3NUaW1lciBzdG9wcGVyKHRo aXMpOwogCi0gICAgUmVmUHRyPEFQSTo6T2JqZWN0PiB1c2VyRGF0YTsKLSAgICBJbmplY3RlZEJ1 bmRsZVVzZXJNZXNzYWdlRGVjb2RlciB1c2VyTWVzc2FnZURlY29kZXIodXNlckRhdGEpOwotICAg IGlmICghZGVjb2Rlci5kZWNvZGUodXNlck1lc3NhZ2VEZWNvZGVyKSkKLSAgICAgICAgcmV0dXJu OwotCiAgICAgbV9wZW5kaW5nTmF2aWdhdGlvbklEID0gbmF2aWdhdGlvbklEOwogCiAgICAgUmVz b3VyY2VSZXF1ZXN0IHJlcXVlc3QoYmFzZVVSTCk7CkBAIC0xMDkxLDUyICsxMDgxLDUyIEBAIHZv aWQgV2ViUGFnZTo6bG9hZERhdGFJbXBsKHVpbnQ2NF90IG5hdmlnYXRpb25JRCwgUGFzc1JlZlB0 cjxTaGFyZWRCdWZmZXI+IHNoYXJlCiAKICAgICAvLyBMZXQgdGhlIEluamVjdGVkQnVuZGxlIGtu b3cgd2UgYXJlIGFib3V0IHRvIHN0YXJ0IHRoZSBsb2FkLCBwYXNzaW5nIHRoZSB1c2VyIGRhdGEg ZnJvbSB0aGUgVUlQcm9jZXNzCiAgICAgLy8gdG8gYWxsIHRoZSBjbGllbnQgdG8gc2V0IHVwIGFu eSBuZWVkZWQgc3RhdGUuCi0gICAgbV9sb2FkZXJDbGllbnQud2lsbExvYWREYXRhUmVxdWVzdCh0 aGlzLCByZXF1ZXN0LCBjb25zdF9jYXN0PFNoYXJlZEJ1ZmZlcio+KHN1YnN0aXR1dGVEYXRhLmNv bnRlbnQoKSksIHN1YnN0aXR1dGVEYXRhLm1pbWVUeXBlKCksIHN1YnN0aXR1dGVEYXRhLnRleHRF bmNvZGluZygpLCBzdWJzdGl0dXRlRGF0YS5mYWlsaW5nVVJMKCksIHVzZXJEYXRhLmdldCgpKTsK KyAgICBtX2xvYWRlckNsaWVudC53aWxsTG9hZERhdGFSZXF1ZXN0KHRoaXMsIHJlcXVlc3QsIGNv bnN0X2Nhc3Q8U2hhcmVkQnVmZmVyKj4oc3Vic3RpdHV0ZURhdGEuY29udGVudCgpKSwgc3Vic3Rp dHV0ZURhdGEubWltZVR5cGUoKSwgc3Vic3RpdHV0ZURhdGEudGV4dEVuY29kaW5nKCksIHN1YnN0 aXR1dGVEYXRhLmZhaWxpbmdVUkwoKSwgV2ViUHJvY2Vzczo6c2hhcmVkKCkudHJhbnNmb3JtSGFu ZGxlc1RvT2JqZWN0cyh1c2VyRGF0YS5vYmplY3QoKSkuZ2V0KCkpOwogCiAgICAgLy8gSW5pdGF0 ZSB0aGUgbG9hZCBpbiBXZWJDb3JlLgogICAgIG1fbWFpbkZyYW1lLT5jb3JlRnJhbWUoKS0+bG9h ZGVyKCkubG9hZChGcmFtZUxvYWRSZXF1ZXN0KG1fbWFpbkZyYW1lLT5jb3JlRnJhbWUoKSwgcmVx dWVzdCwgc3Vic3RpdHV0ZURhdGEpKTsKIH0KIAotdm9pZCBXZWJQYWdlOjpsb2FkU3RyaW5nKHVp bnQ2NF90IG5hdmlnYXRpb25JRCwgY29uc3QgU3RyaW5nJiBodG1sU3RyaW5nLCBjb25zdCBTdHJp bmcmIE1JTUVUeXBlLCBjb25zdCBVUkwmIGJhc2VVUkwsIGNvbnN0IFVSTCYgdW5yZWFjaGFibGVV UkwsIElQQzo6TWVzc2FnZURlY29kZXImIGRlY29kZXIpCit2b2lkIFdlYlBhZ2U6OmxvYWRTdHJp bmcodWludDY0X3QgbmF2aWdhdGlvbklELCBjb25zdCBTdHJpbmcmIGh0bWxTdHJpbmcsIGNvbnN0 IFN0cmluZyYgTUlNRVR5cGUsIGNvbnN0IFVSTCYgYmFzZVVSTCwgY29uc3QgVVJMJiB1bnJlYWNo YWJsZVVSTCwgY29uc3QgVXNlckRhdGEmIHVzZXJEYXRhKQogewogICAgIGlmICghaHRtbFN0cmlu Zy5pc051bGwoKSAmJiBodG1sU3RyaW5nLmlzOEJpdCgpKSB7CiAgICAgICAgIFJlZlB0cjxTaGFy ZWRCdWZmZXI+IHNoYXJlZEJ1ZmZlciA9IFNoYXJlZEJ1ZmZlcjo6Y3JlYXRlKHJlaW50ZXJwcmV0 X2Nhc3Q8Y29uc3QgY2hhcio+KGh0bWxTdHJpbmcuY2hhcmFjdGVyczgoKSksIGh0bWxTdHJpbmcu bGVuZ3RoKCkgKiBzaXplb2YoTENoYXIpKTsKLSAgICAgICAgbG9hZERhdGFJbXBsKG5hdmlnYXRp b25JRCwgc2hhcmVkQnVmZmVyLCBNSU1FVHlwZSwgQVNDSUlMaXRlcmFsKCJsYXRpbjEiKSwgYmFz ZVVSTCwgdW5yZWFjaGFibGVVUkwsIGRlY29kZXIpOworICAgICAgICBsb2FkRGF0YUltcGwobmF2 aWdhdGlvbklELCBzaGFyZWRCdWZmZXIsIE1JTUVUeXBlLCBBU0NJSUxpdGVyYWwoImxhdGluMSIp LCBiYXNlVVJMLCB1bnJlYWNoYWJsZVVSTCwgdXNlckRhdGEpOwogICAgIH0gZWxzZSB7CiAgICAg ICAgIFJlZlB0cjxTaGFyZWRCdWZmZXI+IHNoYXJlZEJ1ZmZlciA9IFNoYXJlZEJ1ZmZlcjo6Y3Jl YXRlKHJlaW50ZXJwcmV0X2Nhc3Q8Y29uc3QgY2hhcio+KGh0bWxTdHJpbmcuY2hhcmFjdGVyczE2 KCkpLCBodG1sU3RyaW5nLmxlbmd0aCgpICogc2l6ZW9mKFVDaGFyKSk7Ci0gICAgICAgIGxvYWRE YXRhSW1wbChuYXZpZ2F0aW9uSUQsIHNoYXJlZEJ1ZmZlciwgTUlNRVR5cGUsIEFTQ0lJTGl0ZXJh bCgidXRmLTE2IiksIGJhc2VVUkwsIHVucmVhY2hhYmxlVVJMLCBkZWNvZGVyKTsKKyAgICAgICAg bG9hZERhdGFJbXBsKG5hdmlnYXRpb25JRCwgc2hhcmVkQnVmZmVyLCBNSU1FVHlwZSwgQVNDSUlM aXRlcmFsKCJ1dGYtMTYiKSwgYmFzZVVSTCwgdW5yZWFjaGFibGVVUkwsIHVzZXJEYXRhKTsKICAg ICB9CiB9CiAKLXZvaWQgV2ViUGFnZTo6bG9hZERhdGEoY29uc3QgSVBDOjpEYXRhUmVmZXJlbmNl JiBkYXRhLCBjb25zdCBTdHJpbmcmIE1JTUVUeXBlLCBjb25zdCBTdHJpbmcmIGVuY29kaW5nTmFt ZSwgY29uc3QgU3RyaW5nJiBiYXNlVVJMU3RyaW5nLCBJUEM6Ok1lc3NhZ2VEZWNvZGVyJiBkZWNv ZGVyKQordm9pZCBXZWJQYWdlOjpsb2FkRGF0YShjb25zdCBJUEM6OkRhdGFSZWZlcmVuY2UmIGRh dGEsIGNvbnN0IFN0cmluZyYgTUlNRVR5cGUsIGNvbnN0IFN0cmluZyYgZW5jb2RpbmdOYW1lLCBj b25zdCBTdHJpbmcmIGJhc2VVUkxTdHJpbmcsIGNvbnN0IFVzZXJEYXRhJiB1c2VyRGF0YSkKIHsK ICAgICBSZWZQdHI8U2hhcmVkQnVmZmVyPiBzaGFyZWRCdWZmZXIgPSBTaGFyZWRCdWZmZXI6OmNy ZWF0ZShyZWludGVycHJldF9jYXN0PGNvbnN0IGNoYXIqPihkYXRhLmRhdGEoKSksIGRhdGEuc2l6 ZSgpKTsKICAgICBVUkwgYmFzZVVSTCA9IGJhc2VVUkxTdHJpbmcuaXNFbXB0eSgpID8gYmxhbmtV UkwoKSA6IFVSTChVUkwoKSwgYmFzZVVSTFN0cmluZyk7Ci0gICAgbG9hZERhdGFJbXBsKDAsIHNo YXJlZEJ1ZmZlciwgTUlNRVR5cGUsIGVuY29kaW5nTmFtZSwgYmFzZVVSTCwgVVJMKCksIGRlY29k ZXIpOworICAgIGxvYWREYXRhSW1wbCgwLCBzaGFyZWRCdWZmZXIsIE1JTUVUeXBlLCBlbmNvZGlu Z05hbWUsIGJhc2VVUkwsIFVSTCgpLCB1c2VyRGF0YSk7CiB9CiAKLXZvaWQgV2ViUGFnZTo6bG9h ZEhUTUxTdHJpbmcodWludDY0X3QgbmF2aWdhdGlvbklELCBjb25zdCBTdHJpbmcmIGh0bWxTdHJp bmcsIGNvbnN0IFN0cmluZyYgYmFzZVVSTFN0cmluZywgSVBDOjpNZXNzYWdlRGVjb2RlciYgZGVj b2RlcikKK3ZvaWQgV2ViUGFnZTo6bG9hZEhUTUxTdHJpbmcodWludDY0X3QgbmF2aWdhdGlvbklE LCBjb25zdCBTdHJpbmcmIGh0bWxTdHJpbmcsIGNvbnN0IFN0cmluZyYgYmFzZVVSTFN0cmluZywg Y29uc3QgVXNlckRhdGEmIHVzZXJEYXRhKQogewogICAgIFVSTCBiYXNlVVJMID0gYmFzZVVSTFN0 cmluZy5pc0VtcHR5KCkgPyBibGFua1VSTCgpIDogVVJMKFVSTCgpLCBiYXNlVVJMU3RyaW5nKTsK LSAgICBsb2FkU3RyaW5nKG5hdmlnYXRpb25JRCwgaHRtbFN0cmluZywgQVNDSUlMaXRlcmFsKCJ0 ZXh0L2h0bWwiKSwgYmFzZVVSTCwgVVJMKCksIGRlY29kZXIpOworICAgIGxvYWRTdHJpbmcobmF2 aWdhdGlvbklELCBodG1sU3RyaW5nLCBBU0NJSUxpdGVyYWwoInRleHQvaHRtbCIpLCBiYXNlVVJM LCBVUkwoKSwgdXNlckRhdGEpOwogfQogCi12b2lkIFdlYlBhZ2U6OmxvYWRBbHRlcm5hdGVIVE1M U3RyaW5nKGNvbnN0IFN0cmluZyYgaHRtbFN0cmluZywgY29uc3QgU3RyaW5nJiBiYXNlVVJMU3Ry aW5nLCBjb25zdCBTdHJpbmcmIHVucmVhY2hhYmxlVVJMU3RyaW5nLCBJUEM6Ok1lc3NhZ2VEZWNv ZGVyJiBkZWNvZGVyKQordm9pZCBXZWJQYWdlOjpsb2FkQWx0ZXJuYXRlSFRNTFN0cmluZyhjb25z dCBTdHJpbmcmIGh0bWxTdHJpbmcsIGNvbnN0IFN0cmluZyYgYmFzZVVSTFN0cmluZywgY29uc3Qg U3RyaW5nJiB1bnJlYWNoYWJsZVVSTFN0cmluZywgY29uc3QgVXNlckRhdGEmIHVzZXJEYXRhKQog ewogICAgIFVSTCBiYXNlVVJMID0gYmFzZVVSTFN0cmluZy5pc0VtcHR5KCkgPyBibGFua1VSTCgp IDogVVJMKFVSTCgpLCBiYXNlVVJMU3RyaW5nKTsKICAgICBVUkwgdW5yZWFjaGFibGVVUkwgPSB1 bnJlYWNoYWJsZVVSTFN0cmluZy5pc0VtcHR5KCkgPyBVUkwoKSA6IFVSTChVUkwoKSwgdW5yZWFj aGFibGVVUkxTdHJpbmcpOwotICAgIGxvYWRTdHJpbmcoMCwgaHRtbFN0cmluZywgQVNDSUlMaXRl cmFsKCJ0ZXh0L2h0bWwiKSwgYmFzZVVSTCwgdW5yZWFjaGFibGVVUkwsIGRlY29kZXIpOworICAg IGxvYWRTdHJpbmcoMCwgaHRtbFN0cmluZywgQVNDSUlMaXRlcmFsKCJ0ZXh0L2h0bWwiKSwgYmFz ZVVSTCwgdW5yZWFjaGFibGVVUkwsIHVzZXJEYXRhKTsKIH0KIAotdm9pZCBXZWJQYWdlOjpsb2Fk UGxhaW5UZXh0U3RyaW5nKGNvbnN0IFN0cmluZyYgc3RyaW5nLCBJUEM6Ok1lc3NhZ2VEZWNvZGVy JiBkZWNvZGVyKQordm9pZCBXZWJQYWdlOjpsb2FkUGxhaW5UZXh0U3RyaW5nKGNvbnN0IFN0cmlu ZyYgc3RyaW5nLCBjb25zdCBVc2VyRGF0YSYgdXNlckRhdGEpCiB7Ci0gICAgbG9hZFN0cmluZygw LCBzdHJpbmcsIEFTQ0lJTGl0ZXJhbCgidGV4dC9wbGFpbiIpLCBibGFua1VSTCgpLCBVUkwoKSwg ZGVjb2Rlcik7CisgICAgbG9hZFN0cmluZygwLCBzdHJpbmcsIEFTQ0lJTGl0ZXJhbCgidGV4dC9w bGFpbiIpLCBibGFua1VSTCgpLCBVUkwoKSwgdXNlckRhdGEpOwogfQogCi12b2lkIFdlYlBhZ2U6 OmxvYWRXZWJBcmNoaXZlRGF0YShjb25zdCBJUEM6OkRhdGFSZWZlcmVuY2UmIHdlYkFyY2hpdmVE YXRhLCBJUEM6Ok1lc3NhZ2VEZWNvZGVyJiBkZWNvZGVyKQordm9pZCBXZWJQYWdlOjpsb2FkV2Vi QXJjaGl2ZURhdGEoY29uc3QgSVBDOjpEYXRhUmVmZXJlbmNlJiB3ZWJBcmNoaXZlRGF0YSwgY29u c3QgVXNlckRhdGEmIHVzZXJEYXRhKQogewogICAgIFJlZlB0cjxTaGFyZWRCdWZmZXI+IHNoYXJl ZEJ1ZmZlciA9IFNoYXJlZEJ1ZmZlcjo6Y3JlYXRlKHJlaW50ZXJwcmV0X2Nhc3Q8Y29uc3QgY2hh cio+KHdlYkFyY2hpdmVEYXRhLmRhdGEoKSksIHdlYkFyY2hpdmVEYXRhLnNpemUoKSAqIHNpemVv Zih1aW50OF90KSk7Ci0gICAgbG9hZERhdGFJbXBsKDAsIHNoYXJlZEJ1ZmZlciwgQVNDSUlMaXRl cmFsKCJhcHBsaWNhdGlvbi94LXdlYmFyY2hpdmUiKSwgQVNDSUlMaXRlcmFsKCJ1dGYtMTYiKSwg YmxhbmtVUkwoKSwgVVJMKCksIGRlY29kZXIpOworICAgIGxvYWREYXRhSW1wbCgwLCBzaGFyZWRC dWZmZXIsIEFTQ0lJTGl0ZXJhbCgiYXBwbGljYXRpb24veC13ZWJhcmNoaXZlIiksIEFTQ0lJTGl0 ZXJhbCgidXRmLTE2IiksIGJsYW5rVVJMKCksIFVSTCgpLCB1c2VyRGF0YSk7CiB9CiAKIHZvaWQg V2ViUGFnZTo6bmF2aWdhdGVUb1VSTFdpdGhTaW11bGF0ZWRDbGljayhjb25zdCBTdHJpbmcmIHVy bCwgSW50UG9pbnQgZG9jdW1lbnRQb2ludCwgSW50UG9pbnQgc2NyZWVuUG9pbnQpCkBAIC0xNjAw LDE4ICsxNTkwLDEzIEBAIHZvaWQgV2ViUGFnZTo6c2V0R2FwQmV0d2VlblBhZ2VzKGRvdWJsZSBn YXApCiAgICAgbV9wYWdlLT5zZXRQYWdpbmF0aW9uKHBhZ2luYXRpb24pOwogfQogCi12b2lkIFdl YlBhZ2U6OnBvc3RJbmplY3RlZEJ1bmRsZU1lc3NhZ2UoY29uc3QgU3RyaW5nJiBtZXNzYWdlTmFt ZSwgSVBDOjpNZXNzYWdlRGVjb2RlciYgZGVjb2RlcikKK3ZvaWQgV2ViUGFnZTo6cG9zdEluamVj dGVkQnVuZGxlTWVzc2FnZShjb25zdCBTdHJpbmcmIG1lc3NhZ2VOYW1lLCBjb25zdCBVc2VyRGF0 YSYgdXNlckRhdGEpCiB7CiAgICAgSW5qZWN0ZWRCdW5kbGUqIGluamVjdGVkQnVuZGxlID0gV2Vi UHJvY2Vzczo6c2hhcmVkKCkuaW5qZWN0ZWRCdW5kbGUoKTsKICAgICBpZiAoIWluamVjdGVkQnVu ZGxlKQogICAgICAgICByZXR1cm47CiAKLSAgICBSZWZQdHI8QVBJOjpPYmplY3Q+IG1lc3NhZ2VC b2R5OwotICAgIEluamVjdGVkQnVuZGxlVXNlck1lc3NhZ2VEZWNvZGVyIG1lc3NhZ2VCb2R5RGVj b2RlcihtZXNzYWdlQm9keSk7Ci0gICAgaWYgKCFkZWNvZGVyLmRlY29kZShtZXNzYWdlQm9keURl Y29kZXIpKQotICAgICAgICByZXR1cm47Ci0KLSAgICBpbmplY3RlZEJ1bmRsZS0+ZGlkUmVjZWl2 ZU1lc3NhZ2VUb1BhZ2UodGhpcywgbWVzc2FnZU5hbWUsIG1lc3NhZ2VCb2R5LmdldCgpKTsKKyAg ICBpbmplY3RlZEJ1bmRsZS0+ZGlkUmVjZWl2ZU1lc3NhZ2VUb1BhZ2UodGhpcywgbWVzc2FnZU5h bWUsIFdlYlByb2Nlc3M6OnNoYXJlZCgpLnRyYW5zZm9ybUhhbmRsZXNUb09iamVjdHModXNlckRh dGEub2JqZWN0KCkpLmdldCgpKTsKIH0KIAogI2lmICFQTEFURk9STShJT1MpCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5oIGIvU291cmNlL1dl YktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuaAppbmRleCA5MjcyYTJhNDA1MzE4YmM1 NjAxNWYwMTllMDA0ODc3ZWVmNWMzN2QyLi5kNGE1MmM3YWVlOWUzMzRhMWI3NzIyNjkwZWI5Y2Zj NzRhNDUyODRkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2Uv V2ViUGFnZS5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdl LmgKQEAgLTQ1LDYgKzQ1LDcgQEAKICNpbmNsdWRlICJQbHVnaW4uaCIKICNpbmNsdWRlICJTYW5k Ym94RXh0ZW5zaW9uLmgiCiAjaW5jbHVkZSAiU2hhcmVhYmxlQml0bWFwLmgiCisjaW5jbHVkZSAi VXNlckRhdGEuaCIKICNpbmNsdWRlICJVc2VyTWVkaWFQZXJtaXNzaW9uUmVxdWVzdE1hbmFnZXIu aCIKICNpbmNsdWRlIDxXZWJDb3JlL0RpY3RhdGlvbkFsdGVybmF0aXZlLmg+CiAjaW5jbHVkZSA8 V2ViQ29yZS9EcmFnRGF0YS5oPgpAQCAtMzc0LDcgKzM3NSw3IEBAIHB1YmxpYzoKICAgICB2b2lk IHNldFBhZ2VMZW5ndGgoZG91YmxlKTsKICAgICB2b2lkIHNldEdhcEJldHdlZW5QYWdlcyhkb3Vi bGUpOwogCi0gICAgdm9pZCBwb3N0SW5qZWN0ZWRCdW5kbGVNZXNzYWdlKGNvbnN0IFN0cmluZyYg bWVzc2FnZU5hbWUsIElQQzo6TWVzc2FnZURlY29kZXImKTsKKyAgICB2b2lkIHBvc3RJbmplY3Rl ZEJ1bmRsZU1lc3NhZ2UoY29uc3QgU3RyaW5nJiBtZXNzYWdlTmFtZSwgY29uc3QgVXNlckRhdGEm KTsKIAogICAgIGJvb2wgZHJhd3NCYWNrZ3JvdW5kKCkgY29uc3QgeyByZXR1cm4gbV9kcmF3c0Jh Y2tncm91bmQ7IH0KICAgICBib29sIGRyYXdzVHJhbnNwYXJlbnRCYWNrZ3JvdW5kKCkgY29uc3Qg eyByZXR1cm4gbV9kcmF3c1RyYW5zcGFyZW50QmFja2dyb3VuZDsgfQpAQCAtOTA3LDE5ICs5MDgs MTkgQEAgcHJpdmF0ZToKIAogICAgIFN0cmluZyBzb3VyY2VGb3JGcmFtZShXZWJGcmFtZSopOwog Ci0gICAgdm9pZCBsb2FkRGF0YUltcGwodWludDY0X3QgbmF2aWdhdGlvbklELCBQYXNzUmVmUHRy PFdlYkNvcmU6OlNoYXJlZEJ1ZmZlcj4sIGNvbnN0IFN0cmluZyYgTUlNRVR5cGUsIGNvbnN0IFN0 cmluZyYgZW5jb2RpbmdOYW1lLCBjb25zdCBXZWJDb3JlOjpVUkwmIGJhc2VVUkwsIGNvbnN0IFdl YkNvcmU6OlVSTCYgZmFpbGluZ1VSTCwgSVBDOjpNZXNzYWdlRGVjb2RlciYpOwotICAgIHZvaWQg bG9hZFN0cmluZyh1aW50NjRfdCBuYXZpZ2F0aW9uSUQsIGNvbnN0IFN0cmluZyYsIGNvbnN0IFN0 cmluZyYgTUlNRVR5cGUsIGNvbnN0IFdlYkNvcmU6OlVSTCYgYmFzZVVSTCwgY29uc3QgV2ViQ29y ZTo6VVJMJiBmYWlsaW5nVVJMLCBJUEM6Ok1lc3NhZ2VEZWNvZGVyJik7CisgICAgdm9pZCBsb2Fk RGF0YUltcGwodWludDY0X3QgbmF2aWdhdGlvbklELCBQYXNzUmVmUHRyPFdlYkNvcmU6OlNoYXJl ZEJ1ZmZlcj4sIGNvbnN0IFN0cmluZyYgTUlNRVR5cGUsIGNvbnN0IFN0cmluZyYgZW5jb2RpbmdO YW1lLCBjb25zdCBXZWJDb3JlOjpVUkwmIGJhc2VVUkwsIGNvbnN0IFdlYkNvcmU6OlVSTCYgZmFp bGluZ1VSTCwgY29uc3QgVXNlckRhdGEmKTsKKyAgICB2b2lkIGxvYWRTdHJpbmcodWludDY0X3Qg bmF2aWdhdGlvbklELCBjb25zdCBTdHJpbmcmLCBjb25zdCBTdHJpbmcmIE1JTUVUeXBlLCBjb25z dCBXZWJDb3JlOjpVUkwmIGJhc2VVUkwsIGNvbnN0IFdlYkNvcmU6OlVSTCYgZmFpbGluZ1VSTCwg Y29uc3QgVXNlckRhdGEmKTsKIAogICAgIGJvb2wgcGxhdGZvcm1IYXNMb2NhbERhdGFGb3JVUkwo Y29uc3QgV2ViQ29yZTo6VVJMJik7CiAKICAgICAvLyBBY3Rpb25zCiAgICAgdm9pZCB0cnlDbG9z ZSgpOwotICAgIHZvaWQgbG9hZFJlcXVlc3QodWludDY0X3QgbmF2aWdhdGlvbklELCBjb25zdCBX ZWJDb3JlOjpSZXNvdXJjZVJlcXVlc3QmLCBjb25zdCBTYW5kYm94RXh0ZW5zaW9uOjpIYW5kbGUm LCBJUEM6Ok1lc3NhZ2VEZWNvZGVyJik7Ci0gICAgdm9pZCBsb2FkRGF0YShjb25zdCBJUEM6OkRh dGFSZWZlcmVuY2UmLCBjb25zdCBTdHJpbmcmIE1JTUVUeXBlLCBjb25zdCBTdHJpbmcmIGVuY29k aW5nTmFtZSwgY29uc3QgU3RyaW5nJiBiYXNlVVJMLCBJUEM6Ok1lc3NhZ2VEZWNvZGVyJik7Ci0g ICAgdm9pZCBsb2FkSFRNTFN0cmluZyh1aW50NjRfdCBuYXZpZ2F0aW9uSUQsIGNvbnN0IFN0cmlu ZyYgaHRtbFN0cmluZywgY29uc3QgU3RyaW5nJiBiYXNlVVJMLCBJUEM6Ok1lc3NhZ2VEZWNvZGVy Jik7Ci0gICAgdm9pZCBsb2FkQWx0ZXJuYXRlSFRNTFN0cmluZyhjb25zdCBTdHJpbmcmIGh0bWxT dHJpbmcsIGNvbnN0IFN0cmluZyYgYmFzZVVSTCwgY29uc3QgU3RyaW5nJiB1bnJlYWNoYWJsZVVS TCwgSVBDOjpNZXNzYWdlRGVjb2RlciYpOwotICAgIHZvaWQgbG9hZFBsYWluVGV4dFN0cmluZyhj b25zdCBTdHJpbmcmLCBJUEM6Ok1lc3NhZ2VEZWNvZGVyJik7Ci0gICAgdm9pZCBsb2FkV2ViQXJj aGl2ZURhdGEoY29uc3QgSVBDOjpEYXRhUmVmZXJlbmNlJiwgSVBDOjpNZXNzYWdlRGVjb2RlciYp OworICAgIHZvaWQgbG9hZFJlcXVlc3QodWludDY0X3QgbmF2aWdhdGlvbklELCBjb25zdCBXZWJD b3JlOjpSZXNvdXJjZVJlcXVlc3QmLCBjb25zdCBTYW5kYm94RXh0ZW5zaW9uOjpIYW5kbGUmLCBj b25zdCBVc2VyRGF0YSYpOworICAgIHZvaWQgbG9hZERhdGEoY29uc3QgSVBDOjpEYXRhUmVmZXJl bmNlJiwgY29uc3QgU3RyaW5nJiBNSU1FVHlwZSwgY29uc3QgU3RyaW5nJiBlbmNvZGluZ05hbWUs IGNvbnN0IFN0cmluZyYgYmFzZVVSTCwgY29uc3QgVXNlckRhdGEmKTsKKyAgICB2b2lkIGxvYWRI VE1MU3RyaW5nKHVpbnQ2NF90IG5hdmlnYXRpb25JRCwgY29uc3QgU3RyaW5nJiBodG1sU3RyaW5n LCBjb25zdCBTdHJpbmcmIGJhc2VVUkwsIGNvbnN0IFVzZXJEYXRhJik7CisgICAgdm9pZCBsb2Fk QWx0ZXJuYXRlSFRNTFN0cmluZyhjb25zdCBTdHJpbmcmIGh0bWxTdHJpbmcsIGNvbnN0IFN0cmlu ZyYgYmFzZVVSTCwgY29uc3QgU3RyaW5nJiB1bnJlYWNoYWJsZVVSTCwgY29uc3QgVXNlckRhdGEm KTsKKyAgICB2b2lkIGxvYWRQbGFpblRleHRTdHJpbmcoY29uc3QgU3RyaW5nJiwgY29uc3QgVXNl ckRhdGEmKTsKKyAgICB2b2lkIGxvYWRXZWJBcmNoaXZlRGF0YShjb25zdCBJUEM6OkRhdGFSZWZl cmVuY2UmLCBjb25zdCBVc2VyRGF0YSYpOwogICAgIHZvaWQgbmF2aWdhdGVUb1VSTFdpdGhTaW11 bGF0ZWRDbGljayhjb25zdCBTdHJpbmcmIHVybCwgV2ViQ29yZTo6SW50UG9pbnQgZG9jdW1lbnRQ b2ludCwgV2ViQ29yZTo6SW50UG9pbnQgc2NyZWVuUG9pbnQpOwogICAgIHZvaWQgcmVsb2FkKHVp bnQ2NF90IG5hdmlnYXRpb25JRCwgYm9vbCByZWxvYWRGcm9tT3JpZ2luLCBjb25zdCBTYW5kYm94 RXh0ZW5zaW9uOjpIYW5kbGUmKTsKICAgICB2b2lkIGdvRm9yd2FyZCh1aW50NjRfdCBuYXZpZ2F0 aW9uSUQsIHVpbnQ2NF90KTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3Mv V2ViUGFnZS9XZWJQYWdlLm1lc3NhZ2VzLmluIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9X ZWJQYWdlL1dlYlBhZ2UubWVzc2FnZXMuaW4KaW5kZXggNDhkYTU2ZWIyNjgwNTkzNGMwMDBhNDM2 ZmQ1ZmY2YzNlOTlmMWNiMS4uMGRiMTUzMGUzNTkzZWJkNTM5MGJjMWEzOWEwNzNlYmQwZTJhZmQz YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2Uu bWVzc2FnZXMuaW4KKysrIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBh Z2UubWVzc2FnZXMuaW4KQEAgLTEyMywxMiArMTIzLDEyIEBAIG1lc3NhZ2VzIC0+IFdlYlBhZ2Ug TGVnYWN5UmVjZWl2ZXIgewogICAgIFRyeVJlc3RvcmVTY3JvbGxQb3NpdGlvbigpCiAKICAgICBM b2FkVVJMSW5GcmFtZShTdHJpbmcgdXJsLCB1aW50NjRfdCBmcmFtZUlEKQotICAgIExvYWRSZXF1 ZXN0KHVpbnQ2NF90IG5hdmlnYXRpb25JRCwgV2ViQ29yZTo6UmVzb3VyY2VSZXF1ZXN0IHJlcXVl c3QsIFdlYktpdDo6U2FuZGJveEV4dGVuc2lvbjo6SGFuZGxlIHNhbmRib3hFeHRlbnNpb25IYW5k bGUsIFdlYktpdDo6V2ViQ29udGV4dFVzZXJNZXNzYWdlRW5jb2RlciB1c2VyRGF0YSkgVmFyaWFk aWMKLSAgICBMb2FkRGF0YShJUEM6OkRhdGFSZWZlcmVuY2UgZGF0YSwgU3RyaW5nIE1JTUVUeXBl LCBTdHJpbmcgZW5jb2RpbmcsIFN0cmluZyBiYXNlVVJMLCBXZWJLaXQ6OldlYkNvbnRleHRVc2Vy TWVzc2FnZUVuY29kZXIgdXNlckRhdGEpIFZhcmlhZGljCi0gICAgTG9hZEhUTUxTdHJpbmcodWlu dDY0X3QgbmF2aWdhdGlvbklELCBTdHJpbmcgaHRtbFN0cmluZywgU3RyaW5nIGJhc2VVUkwsIFdl YktpdDo6V2ViQ29udGV4dFVzZXJNZXNzYWdlRW5jb2RlciB1c2VyRGF0YSkgVmFyaWFkaWMKLSAg ICBMb2FkQWx0ZXJuYXRlSFRNTFN0cmluZyhTdHJpbmcgaHRtbFN0cmluZywgU3RyaW5nIGJhc2VV UkwsIFN0cmluZyB1bnJlYWNoYWJsZVVSTCwgV2ViS2l0OjpXZWJDb250ZXh0VXNlck1lc3NhZ2VF bmNvZGVyIHVzZXJEYXRhKSBWYXJpYWRpYwotICAgIExvYWRQbGFpblRleHRTdHJpbmcoU3RyaW5n IHN0cmluZywgV2ViS2l0OjpXZWJDb250ZXh0VXNlck1lc3NhZ2VFbmNvZGVyIHVzZXJEYXRhKSBW YXJpYWRpYwotICAgIExvYWRXZWJBcmNoaXZlRGF0YShJUEM6OkRhdGFSZWZlcmVuY2Ugd2ViQXJj aGl2ZURhdGEsIFdlYktpdDo6V2ViQ29udGV4dFVzZXJNZXNzYWdlRW5jb2RlciB1c2VyRGF0YSkg VmFyaWFkaWMKKyAgICBMb2FkUmVxdWVzdCh1aW50NjRfdCBuYXZpZ2F0aW9uSUQsIFdlYkNvcmU6 OlJlc291cmNlUmVxdWVzdCByZXF1ZXN0LCBXZWJLaXQ6OlNhbmRib3hFeHRlbnNpb246OkhhbmRs ZSBzYW5kYm94RXh0ZW5zaW9uSGFuZGxlLCBXZWJLaXQ6OlVzZXJEYXRhIHVzZXJEYXRhKQorICAg IExvYWREYXRhKElQQzo6RGF0YVJlZmVyZW5jZSBkYXRhLCBTdHJpbmcgTUlNRVR5cGUsIFN0cmlu ZyBlbmNvZGluZywgU3RyaW5nIGJhc2VVUkwsIFdlYktpdDo6VXNlckRhdGEgdXNlckRhdGEpCisg ICAgTG9hZEhUTUxTdHJpbmcodWludDY0X3QgbmF2aWdhdGlvbklELCBTdHJpbmcgaHRtbFN0cmlu ZywgU3RyaW5nIGJhc2VVUkwsIFdlYktpdDo6VXNlckRhdGEgdXNlckRhdGEpCisgICAgTG9hZEFs dGVybmF0ZUhUTUxTdHJpbmcoU3RyaW5nIGh0bWxTdHJpbmcsIFN0cmluZyBiYXNlVVJMLCBTdHJp bmcgdW5yZWFjaGFibGVVUkwsIFdlYktpdDo6VXNlckRhdGEgdXNlckRhdGEpCisgICAgTG9hZFBs YWluVGV4dFN0cmluZyhTdHJpbmcgc3RyaW5nLCBXZWJLaXQ6OlVzZXJEYXRhIHVzZXJEYXRhKQor ICAgIExvYWRXZWJBcmNoaXZlRGF0YShJUEM6OkRhdGFSZWZlcmVuY2Ugd2ViQXJjaGl2ZURhdGEs IFdlYktpdDo6VXNlckRhdGEgdXNlckRhdGEpCiAgICAgTmF2aWdhdGVUb1VSTFdpdGhTaW11bGF0 ZWRDbGljayhTdHJpbmcgdXJsLCBXZWJDb3JlOjpJbnRQb2ludCBkb2N1bWVudFBvaW50LCBXZWJD b3JlOjpJbnRQb2ludCBzY3JlZW5Qb2ludCkKIAogICAgIFJlbG9hZCh1aW50NjRfdCBuYXZpZ2F0 aW9uSUQsIGJvb2wgcmVsb2FkRnJvbU9yaWdpbiwgV2ViS2l0OjpTYW5kYm94RXh0ZW5zaW9uOjpI YW5kbGUgc2FuZGJveEV4dGVuc2lvbkhhbmRsZSkKQEAgLTIwOSw3ICsyMDksNyBAQCBtZXNzYWdl cyAtPiBXZWJQYWdlIExlZ2FjeVJlY2VpdmVyIHsKICAgICBTZXRQYWdlTGVuZ3RoKGRvdWJsZSBw YWdlTGVuZ3RoKQogICAgIFNldEdhcEJldHdlZW5QYWdlcyhkb3VibGUgZ2FwKQogCi0gICAgUG9z dEluamVjdGVkQnVuZGxlTWVzc2FnZShTdHJpbmcgbWVzc2FnZU5hbWUsIFdlYktpdDo6V2ViQ29u dGV4dFVzZXJNZXNzYWdlRW5jb2RlciBtZXNzYWdlQm9keSkgVmFyaWFkaWMKKyAgICBQb3N0SW5q ZWN0ZWRCdW5kbGVNZXNzYWdlKFN0cmluZyBtZXNzYWdlTmFtZSwgV2ViS2l0OjpVc2VyRGF0YSBt ZXNzYWdlQm9keSkKIAogICAgICMgRmluZC4KICAgICBGaW5kU3RyaW5nKFN0cmluZyBzdHJpbmcs IHVpbnQzMl90IGZpbmRPcHRpb25zLCB1bnNpZ25lZCBtYXhNYXRjaENvdW50KQo=