171646 2017-05-03 22:59:09 -0700 [Cocoa] Add an optional width parameter to -[WKWebProcessPlugInNodeHandle renderedImageWithOptions:] 2017-05-04 07:41:08 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 aestes aestes andersca bdakin commit-queue simon.fraser thorton webkit-bug-importer wenson_hsieh oldest_to_newest 1304522 0 aestes 2017-05-03 22:59:09 -0700 [Cocoa] Add an optional width parameter to -[WKWebProcessPlugInNodeHandle renderedImageWithOptions:] 1304523 1 aestes 2017-05-03 23:00:24 -0700 rdar://problem/30306321 1304525 2 309019 aestes 2017-05-03 23:05:55 -0700 Created attachment 309019 Patch 1304615 3 309019 commit-queue 2017-05-04 07:41:07 -0700 Comment on attachment 309019 Patch Clearing flags on attachment: 309019 Committed r216185: <http://trac.webkit.org/changeset/216185> 1304616 4 commit-queue 2017-05-04 07:41:08 -0700 All reviewed patches have been landed. Closing bug. 309019 2017-05-03 23:05:55 -0700 2017-05-04 07:41:07 -0700 Patch bug-171646-20170503230551.patch text/plain 17995 aestes U3VidmVyc2lvbiBSZXZpc2lvbjogMjE2MTU0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggZWViM2RiZjFkZGVhOGFh MjUyMGIwM2FiNmYwZGY3ZDAxY2Q2MWI0ZC4uNmZjMDczNGJiMzIyY2UxMzFlMGQ4YTM3OTI2YzJh NjNkN2ZhMGQ0NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDE3LTA1LTAzICBBbmR5 IEVzdGVzICA8YWVzdGVzQGFwcGxlLmNvbT4KKworICAgICAgICBbQ29jb2FdIEFkZCBhbiBvcHRp b25hbCB3aWR0aCBwYXJhbWV0ZXIgdG8gLVtXS1dlYlByb2Nlc3NQbHVnSW5Ob2RlSGFuZGxlIHJl bmRlcmVkSW1hZ2VXaXRoT3B0aW9uczpdCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD0xNzE2NDYKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzMwMzA2MzIx PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogV2Vi UHJvY2Vzcy9JbmplY3RlZEJ1bmRsZS9BUEkvQ29jb2EvV0tXZWJQcm9jZXNzUGx1Z0luTm9kZUhh bmRsZS5oOgorICAgICAgICAqIFdlYlByb2Nlc3MvSW5qZWN0ZWRCdW5kbGUvQVBJL0NvY29hL1dL V2ViUHJvY2Vzc1BsdWdJbk5vZGVIYW5kbGUubW06CisgICAgICAgICgtW1dLV2ViUHJvY2Vzc1Bs dWdJbk5vZGVIYW5kbGUgcmVuZGVyZWRJbWFnZVdpdGhPcHRpb25zOl0pOiBDYWxsZWQKKyAgICAg ICAgLXJlbmRlcmVkSW1hZ2VXaXRoT3B0aW9uczp3aWR0aDogd2l0aCBhIG5pbCB3aWR0aC4KKyAg ICAgICAgKC1bV0tXZWJQcm9jZXNzUGx1Z0luTm9kZUhhbmRsZSByZW5kZXJlZEltYWdlV2l0aE9w dGlvbnM6d2lkdGg6XSk6IFBhc3NlZCBhbiBvcHRpb25hbCB3aWR0aAorICAgICAgICB0byBJbmpl Y3RlZEJ1bmRsZU5vZGVIYW5kbGU6OnJlbmRlcmVkSW1hZ2UoKS4KKyAgICAgICAgKiBXZWJQcm9j ZXNzL0luamVjdGVkQnVuZGxlL0RPTS9JbmplY3RlZEJ1bmRsZU5vZGVIYW5kbGUuY3BwOgorICAg ICAgICAoV2ViS2l0OjppbWFnZUZvclJlY3QpOiBJZiBhIHdpZHRoIGlzIHNwZWNpZmllZCwgY3Jl YXRlIGFuIGltYWdlIGdyYXBoaWNzIGNvbnRleHQgYXQgdGhhdAorICAgICAgICB3aWR0aCwgcHJl c2VydmluZyB0aGUgYXNwZWN0IHJhdGlvIG9mIHBhaW50aW5nUmVjdC4KKyAgICAgICAgKFdlYktp dDo6SW5qZWN0ZWRCdW5kbGVOb2RlSGFuZGxlOjpyZW5kZXJlZEltYWdlKToKKyAgICAgICAgKiBX ZWJQcm9jZXNzL0luamVjdGVkQnVuZGxlL0RPTS9JbmplY3RlZEJ1bmRsZU5vZGVIYW5kbGUuaDoK KwogMjAxNy0wNS0wMyAgVGltIEhvcnRvbiAgPHRpbW90aHlfaG9ydG9uQGFwcGxlLmNvbT4KIAog ICAgICAgICBNYWludGFpbiBpbnRlcmFjdGlvbiBpbmZvcm1hdGlvbiBVUkwgYXMgYSBVUkwsIG5v dCBhIHN0cmluZwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9JbmplY3Rl ZEJ1bmRsZS9BUEkvQ29jb2EvV0tXZWJQcm9jZXNzUGx1Z0luTm9kZUhhbmRsZS5oIGIvU291cmNl L1dlYktpdDIvV2ViUHJvY2Vzcy9JbmplY3RlZEJ1bmRsZS9BUEkvQ29jb2EvV0tXZWJQcm9jZXNz UGx1Z0luTm9kZUhhbmRsZS5oCmluZGV4IDk5YjlkZmIxMmMzYTEyNmJlMWUyYjM4MzgxMTk2NGVi NjA4YzRhZmMuLmJjNWM4ZWQyMzg1MzZkNTdkNTExZGVmMDg5MzUxZDlmOGM2ODk1Y2IgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvSW5qZWN0ZWRCdW5kbGUvQVBJL0NvY29h L1dLV2ViUHJvY2Vzc1BsdWdJbk5vZGVIYW5kbGUuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQ cm9jZXNzL0luamVjdGVkQnVuZGxlL0FQSS9Db2NvYS9XS1dlYlByb2Nlc3NQbHVnSW5Ob2RlSGFu ZGxlLmgKQEAgLTQ1LDggKzQ1LDEwIEBAIFdLX0NMQVNTX0FWQUlMQUJMRShtYWNvc3goMTAuMTAp LCBpb3MoOC4wKSkKIAogI2lmIFRBUkdFVF9PU19JUEhPTkUKIC0gKFVJSW1hZ2UgKilyZW5kZXJl ZEltYWdlV2l0aE9wdGlvbnM6KFdLU25hcHNob3RPcHRpb25zKW9wdGlvbnMgV0tfQVBJX0FWQUlM QUJMRShtYWNvc3goMTAuMTEpLCBpb3MoOS4wKSk7CistIChVSUltYWdlICopcmVuZGVyZWRJbWFn ZVdpdGhPcHRpb25zOihXS1NuYXBzaG90T3B0aW9ucylvcHRpb25zIHdpZHRoOihOU051bWJlciAq KXdpZHRoIFdLX0FQSV9BVkFJTEFCTEUobWFjb3N4KFdLX01BQ19UQkEpLCBpb3MoV0tfSU9TX1RC QSkpOwogI2Vsc2UKIC0gKE5TSW1hZ2UgKilyZW5kZXJlZEltYWdlV2l0aE9wdGlvbnM6KFdLU25h cHNob3RPcHRpb25zKW9wdGlvbnMgV0tfQVBJX0FWQUlMQUJMRShtYWNvc3goMTAuMTEpLCBpb3Mo OS4wKSk7CistIChOU0ltYWdlICopcmVuZGVyZWRJbWFnZVdpdGhPcHRpb25zOihXS1NuYXBzaG90 T3B0aW9ucylvcHRpb25zIHdpZHRoOihOU051bWJlciAqKXdpZHRoIFdLX0FQSV9BVkFJTEFCTEUo bWFjb3N4KFdLX01BQ19UQkEpLCBpb3MoV0tfSU9TX1RCQSkpOwogI2VuZGlmCiAKIEBwcm9wZXJ0 eSAobm9uYXRvbWljLCByZWFkb25seSkgQ0dSZWN0IGVsZW1lbnRCb3VuZHM7CmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL0luamVjdGVkQnVuZGxlL0FQSS9Db2NvYS9XS1dl YlByb2Nlc3NQbHVnSW5Ob2RlSGFuZGxlLm1tIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9J bmplY3RlZEJ1bmRsZS9BUEkvQ29jb2EvV0tXZWJQcm9jZXNzUGx1Z0luTm9kZUhhbmRsZS5tbQpp bmRleCA1MzRmZGY4OTEwZDI1YTA0ZGYwM2NkYzczZjc2NGE1YTc0OTFhZGM2Li4yZWM5MzdjNzJm YTAwZmM0ODhmNDg4YjdhNmM5OWQ2Zjc0OGIyZGE2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9XZWJQcm9jZXNzL0luamVjdGVkQnVuZGxlL0FQSS9Db2NvYS9XS1dlYlByb2Nlc3NQbHVnSW5O b2RlSGFuZGxlLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvSW5qZWN0ZWRCdW5k bGUvQVBJL0NvY29hL1dLV2ViUHJvY2Vzc1BsdWdJbk5vZGVIYW5kbGUubW0KQEAgLTY4LDcgKzY4 LDE2IEBAIC0gKFdLV2ViUHJvY2Vzc1BsdWdJbkZyYW1lICopaHRtbElGcmFtZUVsZW1lbnRDb250 ZW50RnJhbWUKICNpZiBQTEFURk9STShJT1MpCiAtIChVSUltYWdlICopcmVuZGVyZWRJbWFnZVdp dGhPcHRpb25zOihXS1NuYXBzaG90T3B0aW9ucylvcHRpb25zCiB7Ci0gICAgUmVmUHRyPFdlYklt YWdlPiBpbWFnZSA9IF9ub2RlSGFuZGxlLT5yZW5kZXJlZEltYWdlKHRvU25hcHNob3RPcHRpb25z KG9wdGlvbnMpLCBvcHRpb25zICYga1dLU25hcHNob3RPcHRpb25zRXhjbHVkZU92ZXJmbG93KTsK KyAgICByZXR1cm4gW3NlbGYgcmVuZGVyZWRJbWFnZVdpdGhPcHRpb25zOm9wdGlvbnMgd2lkdGg6 bmlsXTsKK30KKworLSAoVUlJbWFnZSAqKXJlbmRlcmVkSW1hZ2VXaXRoT3B0aW9uczooV0tTbmFw c2hvdE9wdGlvbnMpb3B0aW9ucyB3aWR0aDooTlNOdW1iZXIgKil3aWR0aAoreworICAgIHN0ZDo6 b3B0aW9uYWw8ZmxvYXQ+IG9wdGlvbmFsV2lkdGg7CisgICAgaWYgKHdpZHRoKQorICAgICAgICBv cHRpb25hbFdpZHRoID0gd2lkdGguZmxvYXRWYWx1ZTsKKworICAgIFJlZlB0cjxXZWJJbWFnZT4g aW1hZ2UgPSBfbm9kZUhhbmRsZS0+cmVuZGVyZWRJbWFnZSh0b1NuYXBzaG90T3B0aW9ucyhvcHRp b25zKSwgb3B0aW9ucyAmIGtXS1NuYXBzaG90T3B0aW9uc0V4Y2x1ZGVPdmVyZmxvdywgb3B0aW9u YWxXaWR0aCk7CiAgICAgaWYgKCFpbWFnZSkKICAgICAgICAgcmV0dXJuIG5pbDsKIApAQCAtNzks NyArODgsMTYgQEAgLSAoVUlJbWFnZSAqKXJlbmRlcmVkSW1hZ2VXaXRoT3B0aW9uczooV0tTbmFw c2hvdE9wdGlvbnMpb3B0aW9ucwogI2lmIFBMQVRGT1JNKE1BQykKIC0gKE5TSW1hZ2UgKilyZW5k ZXJlZEltYWdlV2l0aE9wdGlvbnM6KFdLU25hcHNob3RPcHRpb25zKW9wdGlvbnMKIHsKLSAgICBS ZWZQdHI8V2ViSW1hZ2U+IGltYWdlID0gX25vZGVIYW5kbGUtPnJlbmRlcmVkSW1hZ2UodG9TbmFw c2hvdE9wdGlvbnMob3B0aW9ucyksIG9wdGlvbnMgJiBrV0tTbmFwc2hvdE9wdGlvbnNFeGNsdWRl T3ZlcmZsb3cpOworICAgIHJldHVybiBbc2VsZiByZW5kZXJlZEltYWdlV2l0aE9wdGlvbnM6b3B0 aW9ucyB3aWR0aDpuaWxdOworfQorCistIChOU0ltYWdlICopcmVuZGVyZWRJbWFnZVdpdGhPcHRp b25zOihXS1NuYXBzaG90T3B0aW9ucylvcHRpb25zIHdpZHRoOihOU051bWJlciAqKXdpZHRoCit7 CisgICAgc3RkOjpvcHRpb25hbDxmbG9hdD4gb3B0aW9uYWxXaWR0aDsKKyAgICBpZiAod2lkdGgp CisgICAgICAgIG9wdGlvbmFsV2lkdGggPSB3aWR0aC5mbG9hdFZhbHVlOworCisgICAgUmVmUHRy PFdlYkltYWdlPiBpbWFnZSA9IF9ub2RlSGFuZGxlLT5yZW5kZXJlZEltYWdlKHRvU25hcHNob3RP cHRpb25zKG9wdGlvbnMpLCBvcHRpb25zICYga1dLU25hcHNob3RPcHRpb25zRXhjbHVkZU92ZXJm bG93LCBvcHRpb25hbFdpZHRoKTsKICAgICBpZiAoIWltYWdlKQogICAgICAgICByZXR1cm4gbmls OwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL0luamVjdGVkQnVuZGxl L0RPTS9JbmplY3RlZEJ1bmRsZU5vZGVIYW5kbGUuY3BwIGIvU291cmNlL1dlYktpdDIvV2ViUHJv Y2Vzcy9JbmplY3RlZEJ1bmRsZS9ET00vSW5qZWN0ZWRCdW5kbGVOb2RlSGFuZGxlLmNwcAppbmRl eCA4MjVhODhkMzVhNTk1YjljOWM3M2I4NGNmMGM4NDhhYmUwNWRkZmMwLi4zNDcxZDJkZDMyOGJj NzhmYWE0MDZhNWZmYjU2NjM3ZjVhNDhkYWZiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9X ZWJQcm9jZXNzL0luamVjdGVkQnVuZGxlL0RPTS9JbmplY3RlZEJ1bmRsZU5vZGVIYW5kbGUuY3Bw CisrKyBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvSW5qZWN0ZWRCdW5kbGUvRE9NL0luamVj dGVkQnVuZGxlTm9kZUhhbmRsZS5jcHAKQEAgLTEzNCwxOCArMTM0LDM2IEBAIEludFJlY3QgSW5q ZWN0ZWRCdW5kbGVOb2RlSGFuZGxlOjpyZW5kZXJSZWN0KGJvb2wqIGlzUmVwbGFjZWQpCiAgICAg cmV0dXJuIG1fbm9kZS0+cGl4ZWxTbmFwcGVkUmVuZGVyUmVjdChpc1JlcGxhY2VkKTsKIH0KIAot c3RhdGljIFJlZlB0cjxXZWJJbWFnZT4gaW1hZ2VGb3JSZWN0KEZyYW1lVmlldyogZnJhbWVWaWV3 LCBjb25zdCBJbnRSZWN0JiByZWN0LCBTbmFwc2hvdE9wdGlvbnMgb3B0aW9ucykKK3N0YXRpYyBS ZWZQdHI8V2ViSW1hZ2U+IGltYWdlRm9yUmVjdChGcmFtZVZpZXcqIGZyYW1lVmlldywgY29uc3Qg SW50UmVjdCYgcGFpbnRpbmdSZWN0LCBjb25zdCBzdGQ6Om9wdGlvbmFsPGZsb2F0PiYgYml0bWFw V2lkdGgsIFNuYXBzaG90T3B0aW9ucyBvcHRpb25zKQogewotICAgIEludFNpemUgYml0bWFwU2l6 ZSA9IHJlY3Quc2l6ZSgpOwotICAgIGZsb2F0IHNjYWxlRmFjdG9yID0gZnJhbWVWaWV3LT5mcmFt ZSgpLnBhZ2UoKS0+ZGV2aWNlU2NhbGVGYWN0b3IoKTsKLSAgICBiaXRtYXBTaXplLnNjYWxlKHNj YWxlRmFjdG9yKTsKKyAgICBpZiAocGFpbnRpbmdSZWN0LmlzRW1wdHkoKSkKKyAgICAgICAgcmV0 dXJuIG51bGxwdHI7CisKKyAgICBmbG9hdCBiaXRtYXBTY2FsZUZhY3RvcjsKKyAgICBJbnRTaXpl IGJpdG1hcFNpemU7CisgICAgaWYgKGJpdG1hcFdpZHRoKSB7CisgICAgICAgIGJpdG1hcFNjYWxl RmFjdG9yID0gYml0bWFwV2lkdGgudmFsdWUoKSAvIHBhaW50aW5nUmVjdC53aWR0aCgpOworICAg ICAgICBiaXRtYXBTaXplID0gcm91bmRlZEludFNpemUoRmxvYXRTaXplKGJpdG1hcFdpZHRoLnZh bHVlKCksIHBhaW50aW5nUmVjdC5oZWlnaHQoKSAqIGJpdG1hcFNjYWxlRmFjdG9yKSk7CisgICAg fSBlbHNlIHsKKyAgICAgICAgYml0bWFwU2NhbGVGYWN0b3IgPSAxOworICAgICAgICBiaXRtYXBT aXplID0gcGFpbnRpbmdSZWN0LnNpemUoKTsKKyAgICB9CisKKyAgICBmbG9hdCBkZXZpY2VTY2Fs ZUZhY3RvciA9IGZyYW1lVmlldy0+ZnJhbWUoKS5wYWdlKCktPmRldmljZVNjYWxlRmFjdG9yKCk7 CisgICAgYml0bWFwU2l6ZS5zY2FsZShkZXZpY2VTY2FsZUZhY3Rvcik7CisKKyAgICBpZiAoYml0 bWFwU2l6ZS5pc0VtcHR5KCkpCisgICAgICAgIHJldHVybiBudWxscHRyOwogCiAgICAgYXV0byBz bmFwc2hvdCA9IFdlYkltYWdlOjpjcmVhdGUoYml0bWFwU2l6ZSwgc25hcHNob3RPcHRpb25zVG9J bWFnZU9wdGlvbnMob3B0aW9ucykpOworICAgIGlmICghc25hcHNob3QpCisgICAgICAgIHJldHVy biBudWxscHRyOwogCiAgICAgYXV0byBncmFwaGljc0NvbnRleHQgPSBzbmFwc2hvdC0+Yml0bWFw KCkuY3JlYXRlR3JhcGhpY3NDb250ZXh0KCk7CiAgICAgZ3JhcGhpY3NDb250ZXh0LT5jbGVhclJl Y3QoSW50UmVjdChJbnRQb2ludCgpLCBiaXRtYXBTaXplKSk7Ci0gICAgZ3JhcGhpY3NDb250ZXh0 LT5hcHBseURldmljZVNjYWxlRmFjdG9yKHNjYWxlRmFjdG9yKTsKLSAgICBncmFwaGljc0NvbnRl eHQtPnRyYW5zbGF0ZSgtcmVjdC54KCksIC1yZWN0LnkoKSk7CisgICAgZ3JhcGhpY3NDb250ZXh0 LT5hcHBseURldmljZVNjYWxlRmFjdG9yKGRldmljZVNjYWxlRmFjdG9yKTsKKyAgICBncmFwaGlj c0NvbnRleHQtPnNjYWxlKGJpdG1hcFNjYWxlRmFjdG9yKTsKKyAgICBncmFwaGljc0NvbnRleHQt PnRyYW5zbGF0ZSgtcGFpbnRpbmdSZWN0LngoKSwgLXBhaW50aW5nUmVjdC55KCkpOwogCiAgICAg RnJhbWVWaWV3OjpTZWxlY3Rpb25JblNuYXBzaG90IHNob3VsZFBhaW50U2VsZWN0aW9uID0gRnJh bWVWaWV3OjpJbmNsdWRlU2VsZWN0aW9uOwogICAgIGlmIChvcHRpb25zICYgU25hcHNob3RPcHRp b25zRXhjbHVkZVNlbGVjdGlvbkhpZ2hsaWdodGluZykKQEAgLTE1OSwxMyArMTc3LDEzIEBAIHN0 YXRpYyBSZWZQdHI8V2ViSW1hZ2U+IGltYWdlRm9yUmVjdChGcmFtZVZpZXcqIGZyYW1lVmlldywg Y29uc3QgSW50UmVjdCYgcmVjdCwKIAogICAgIFBhaW50QmVoYXZpb3Igb2xkUGFpbnRCZWhhdmlv ciA9IGZyYW1lVmlldy0+cGFpbnRCZWhhdmlvcigpOwogICAgIGZyYW1lVmlldy0+c2V0UGFpbnRC ZWhhdmlvcihwYWludEJlaGF2aW9yKTsKLSAgICBmcmFtZVZpZXctPnBhaW50Q29udGVudHNGb3JT bmFwc2hvdCgqZ3JhcGhpY3NDb250ZXh0LmdldCgpLCByZWN0LCBzaG91bGRQYWludFNlbGVjdGlv biwgRnJhbWVWaWV3OjpEb2N1bWVudENvb3JkaW5hdGVzKTsKKyAgICBmcmFtZVZpZXctPnBhaW50 Q29udGVudHNGb3JTbmFwc2hvdCgqZ3JhcGhpY3NDb250ZXh0LmdldCgpLCBwYWludGluZ1JlY3Qs IHNob3VsZFBhaW50U2VsZWN0aW9uLCBGcmFtZVZpZXc6OkRvY3VtZW50Q29vcmRpbmF0ZXMpOwog ICAgIGZyYW1lVmlldy0+c2V0UGFpbnRCZWhhdmlvcihvbGRQYWludEJlaGF2aW9yKTsKIAogICAg IHJldHVybiBzbmFwc2hvdDsKIH0KIAotUmVmUHRyPFdlYkltYWdlPiBJbmplY3RlZEJ1bmRsZU5v ZGVIYW5kbGU6OnJlbmRlcmVkSW1hZ2UoU25hcHNob3RPcHRpb25zIG9wdGlvbnMsIGJvb2wgc2hv dWxkRXhjbHVkZU92ZXJmbG93KQorUmVmUHRyPFdlYkltYWdlPiBJbmplY3RlZEJ1bmRsZU5vZGVI YW5kbGU6OnJlbmRlcmVkSW1hZ2UoU25hcHNob3RPcHRpb25zIG9wdGlvbnMsIGJvb2wgc2hvdWxk RXhjbHVkZU92ZXJmbG93LCBjb25zdCBzdGQ6Om9wdGlvbmFsPGZsb2F0PiYgYml0bWFwV2lkdGgp CiB7CiAgICAgRnJhbWUqIGZyYW1lID0gbV9ub2RlLT5kb2N1bWVudCgpLmZyYW1lKCk7CiAgICAg aWYgKCFmcmFtZSkKQEAgLTE5MCw3ICsyMDgsNyBAQCBSZWZQdHI8V2ViSW1hZ2U+IEluamVjdGVk QnVuZGxlTm9kZUhhbmRsZTo6cmVuZGVyZWRJbWFnZShTbmFwc2hvdE9wdGlvbnMgb3B0aW9ucwog ICAgIH0KIAogICAgIGZyYW1lVmlldy0+c2V0Tm9kZVRvRHJhdyhtX25vZGUucHRyKCkpOwotICAg IGF1dG8gaW1hZ2UgPSBpbWFnZUZvclJlY3QoZnJhbWVWaWV3LCBwYWludGluZ1JlY3QsIG9wdGlv bnMpOworICAgIGF1dG8gaW1hZ2UgPSBpbWFnZUZvclJlY3QoZnJhbWVWaWV3LCBwYWludGluZ1Jl Y3QsIGJpdG1hcFdpZHRoLCBvcHRpb25zKTsKICAgICBmcmFtZVZpZXctPnNldE5vZGVUb0RyYXco MCk7CiAKICAgICByZXR1cm4gaW1hZ2U7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQ cm9jZXNzL0luamVjdGVkQnVuZGxlL0RPTS9JbmplY3RlZEJ1bmRsZU5vZGVIYW5kbGUuaCBiL1Nv dXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvSW5qZWN0ZWRCdW5kbGUvRE9NL0luamVjdGVkQnVuZGxl Tm9kZUhhbmRsZS5oCmluZGV4IDQyZWU5NWYyY2I3YWM3MjBiMWJjY2YzZWFhMGQ4OTdkMTZjNjg0 YzguLjBiNGM1NDJlYTY0OWMxZDU2MmExNDg1ZTRiNDdkZDE5YmU2ZWQ4ODQgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvSW5qZWN0ZWRCdW5kbGUvRE9NL0luamVjdGVkQnVu ZGxlTm9kZUhhbmRsZS5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvSW5qZWN0ZWRC dW5kbGUvRE9NL0luamVjdGVkQnVuZGxlTm9kZUhhbmRsZS5oCkBAIC0yOSw2ICsyOSw3IEBACiAj aW5jbHVkZSAiSW1hZ2VPcHRpb25zLmgiCiAjaW5jbHVkZSA8SmF2YVNjcmlwdENvcmUvSlNCYXNl Lmg+CiAjaW5jbHVkZSA8d3RmL0ZvcndhcmQuaD4KKyNpbmNsdWRlIDx3dGYvT3B0aW9uYWwuaD4K ICNpbmNsdWRlIDx3dGYvUmVmUHRyLmg+CiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKQEAgLTYxLDcg KzYyLDcgQEAgcHVibGljOgogICAgIC8vIE5vdGU6IFRoZXNlIHNob3VsZCBvbmx5IGJlIG9wZXJh dGlvbnMgdGhhdCBhcmUgbm90IGV4cG9zZWQgdG8gSmF2YVNjcmlwdC4KICAgICBXZWJDb3JlOjpJ bnRSZWN0IGVsZW1lbnRCb3VuZHMoKTsKICAgICBXZWJDb3JlOjpJbnRSZWN0IHJlbmRlclJlY3Qo Ym9vbCopOwotICAgIFJlZlB0cjxXZWJJbWFnZT4gcmVuZGVyZWRJbWFnZShTbmFwc2hvdE9wdGlv bnMsIGJvb2wgc2hvdWxkRXhjbHVkZU92ZXJmbG93KTsKKyAgICBSZWZQdHI8V2ViSW1hZ2U+IHJl bmRlcmVkSW1hZ2UoU25hcHNob3RPcHRpb25zLCBib29sIHNob3VsZEV4Y2x1ZGVPdmVyZmxvdywg Y29uc3Qgc3RkOjpvcHRpb25hbDxmbG9hdD4mIGJpdG1hcFdpZHRoID0gc3RkOjpudWxsb3B0KTsK ICAgICBSZWZQdHI8SW5qZWN0ZWRCdW5kbGVSYW5nZUhhbmRsZT4gdmlzaWJsZVJhbmdlKCk7CiAg ICAgdm9pZCBzZXRIVE1MSW5wdXRFbGVtZW50VmFsdWVGb3JVc2VyKGNvbnN0IFN0cmluZyYpOwog ICAgIHZvaWQgc2V0SFRNTElucHV0RWxlbWVudFNwZWxsY2hlY2tFbmFibGVkKGJvb2wpOwpkaWZm IC0tZ2l0IGEvVG9vbHMvQ2hhbmdlTG9nIGIvVG9vbHMvQ2hhbmdlTG9nCmluZGV4IDI5YzYzNDVh Nzk4Mjc1NWJjN2YzZjk0NmNjMzFkNTZkYzcxYjY2MDQuLjQyZWIyYjg4ODU4NjE5ZDI3MTY5NGEx NmExYzNhNDZkY2Y0ODBiMzcgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0NoYW5nZUxvZworKysgYi9Ub29s cy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyMSBAQAorMjAxNy0wNS0wMyAgQW5keSBFc3RlcyAgPGFl c3Rlc0BhcHBsZS5jb20+CisKKyAgICAgICAgW0NvY29hXSBBZGQgYW4gb3B0aW9uYWwgd2lkdGgg cGFyYW1ldGVyIHRvIC1bV0tXZWJQcm9jZXNzUGx1Z0luTm9kZUhhbmRsZSByZW5kZXJlZEltYWdl V2l0aE9wdGlvbnM6XQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9MTcxNjQ2CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8zMDMwNjMyMT4KKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFRlc3RXZWJLaXRBUEkv VGVzdHMvV2ViS2l0MkNvY29hL1JlbmRlcmVkSW1hZ2VXaXRoT3B0aW9ucy5tbToKKyAgICAgICAg KHJ1blRlc3RXaXRoV2lkdGgpOgorICAgICAgICAoVEVTVCk6CisgICAgICAgICgtW1JlbmRlcmVk SW1hZ2VXaXRoT3B0aW9uc09iamVjdCBkaWRSZW5kZXJJbWFnZVdpdGhTaXplOl0pOiBEZWxldGVk LgorICAgICAgICAqIFRlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0MkNvY29hL1JlbmRlcmVkSW1h Z2VXaXRoT3B0aW9uc1BsdWdJbi5tbToKKyAgICAgICAgKC1bUmVuZGVyZWRJbWFnZVdpdGhPcHRp b25zUGx1Z0luIHdlYlByb2Nlc3NQbHVnSW46ZGlkQ3JlYXRlQnJvd3NlckNvbnRleHRDb250cm9s bGVyOl0pOgorICAgICAgICAoLVtSZW5kZXJlZEltYWdlV2l0aE9wdGlvbnNQbHVnSW4gd2ViUHJv Y2Vzc1BsdWdJbkJyb3dzZXJDb250ZXh0Q29udHJvbGxlcjpkaWRGaW5pc2hMb2FkRm9yRnJhbWU6 XSk6CisgICAgICAgICgtW1JlbmRlcmVkSW1hZ2VXaXRoT3B0aW9uc1BsdWdJbiByZW5kZXJJbWFn ZVdpdGhXaWR0aDpjb21wbGV0aW9uSGFuZGxlcjpdKToKKyAgICAgICAgKiBUZXN0V2ViS2l0QVBJ L1Rlc3RzL1dlYktpdDJDb2NvYS9SZW5kZXJlZEltYWdlV2l0aE9wdGlvbnNQcm90b2NvbC5oOgor CiAyMDE3LTA1LTAzICBTaW1vbiBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgogCiAg ICAgICAgIEhhdmUgV0tXZWJWaWV3IGNhbGwgX3VwZGF0ZVZpc2libGVDb250ZW50UmVjdHMgZm9y IHRoZSBjdXJyZW50IHRyYW5zYWN0aW9uIGlmIHBvc3NpYmxlLCByYXRoZXIgdGhhbiBhbHdheXMg ZGVsYXlpbmcKZGlmZiAtLWdpdCBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0MkNv Y29hL1JlbmRlcmVkSW1hZ2VXaXRoT3B0aW9ucy5tbSBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVz dHMvV2ViS2l0MkNvY29hL1JlbmRlcmVkSW1hZ2VXaXRoT3B0aW9ucy5tbQppbmRleCA0Y2IxMDAz ZjVhNzI4ZTYyNTU5NmFjNDhlYTA3MjNkYmUwZTJiY2Q1Li40YTNhMmIzNWRiY2ZjZjg4NDRhYWVi ZTI0ZDIzNzNkZjliNzk0ZTlmIDEwMDY0NAotLS0gYS9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3Rz L1dlYktpdDJDb2NvYS9SZW5kZXJlZEltYWdlV2l0aE9wdGlvbnMubW0KKysrIGIvVG9vbHMvVGVz dFdlYktpdEFQSS9UZXN0cy9XZWJLaXQyQ29jb2EvUmVuZGVyZWRJbWFnZVdpdGhPcHRpb25zLm1t CkBAIC0yOCw2ICsyOCw3IEBACiAjaWYgV0tfQVBJX0VOQUJMRUQKIAogI2ltcG9ydCAiUmVuZGVy ZWRJbWFnZVdpdGhPcHRpb25zUHJvdG9jb2wuaCIKKyNpbXBvcnQgIlRlc3ROYXZpZ2F0aW9uRGVs ZWdhdGUuaCIKICNpbXBvcnQgIlV0aWxpdGllcy5oIgogI2ltcG9ydCAiV0tXZWJWaWV3Q29uZmln dXJhdGlvbkV4dHJhcy5oIgogI2ltcG9ydCA8V2ViS2l0L1dLV2ViVmlld1ByaXZhdGUuaD4KQEAg LTM4LDM5ICszOSw0NiBAQAogCiB1c2luZyBuYW1lc3BhY2UgVGVzdFdlYktpdEFQSTsKIAotc3Rh dGljIGJvb2wgdGVzdEZpbmlzaGVkOworc3RhdGljIHZvaWQgcnVuVGVzdFdpdGhXaWR0aChOU051 bWJlciAqd2lkdGgsIENHU2l6ZSBleHBlY3RlZFNpemUpCit7CisgICAgV0tXZWJWaWV3Q29uZmln dXJhdGlvbiAqY29uZmlndXJhdGlvbiA9IFtXS1dlYlZpZXdDb25maWd1cmF0aW9uIHRlc3R3ZWJr aXRhcGlfY29uZmlndXJhdGlvbldpdGhUZXN0UGx1Z0luQ2xhc3NOYW1lOkAiUmVuZGVyZWRJbWFn ZVdpdGhPcHRpb25zUGx1Z0luIl07CisgICAgYXV0byB3ZWJWaWV3ID0gYWRvcHROUyhbW1dLV2Vi VmlldyBhbGxvY10gaW5pdFdpdGhGcmFtZTpDR1JlY3RaZXJvIGNvbmZpZ3VyYXRpb246Y29uZmln dXJhdGlvbl0pOwogCi1AaW50ZXJmYWNlIFJlbmRlcmVkSW1hZ2VXaXRoT3B0aW9uc09iamVjdCA6 IE5TT2JqZWN0IDxSZW5kZXJlZEltYWdlV2l0aE9wdGlvbnNQcm90b2NvbD4KLUBlbmQKKyAgICBf V0tSZW1vdGVPYmplY3RJbnRlcmZhY2UgKmludGVyZmFjZSA9IFtfV0tSZW1vdGVPYmplY3RJbnRl cmZhY2UgcmVtb3RlT2JqZWN0SW50ZXJmYWNlV2l0aFByb3RvY29sOkBwcm90b2NvbChSZW5kZXJl ZEltYWdlV2l0aE9wdGlvbnNQcm90b2NvbCldOworICAgIGF1dG8gcmVtb3RlT2JqZWN0ID0gcmV0 YWluUHRyKFtbd2ViVmlldyBfcmVtb3RlT2JqZWN0UmVnaXN0cnldIHJlbW90ZU9iamVjdFByb3h5 V2l0aEludGVyZmFjZTppbnRlcmZhY2VdKTsKIAotQGltcGxlbWVudGF0aW9uIFJlbmRlcmVkSW1h Z2VXaXRoT3B0aW9uc09iamVjdAorICAgIFt3ZWJWaWV3IGxvYWRSZXF1ZXN0OltOU1VSTFJlcXVl c3QgcmVxdWVzdFdpdGhVUkw6W1tOU0J1bmRsZSBtYWluQnVuZGxlXSBVUkxGb3JSZXNvdXJjZTpA InJlbmRlcmVkLWltYWdlLWV4Y2x1ZGluZy1vdmVyZmxvdyIgd2l0aEV4dGVuc2lvbjpAImh0bWwi IHN1YmRpcmVjdG9yeTpAIlRlc3RXZWJLaXRBUEkucmVzb3VyY2VzIl1dXTsKKyAgICBbd2ViVmll dyBfdGVzdF93YWl0Rm9yRGlkRmluaXNoTmF2aWdhdGlvbl07CiAKLS0gKHZvaWQpZGlkUmVuZGVy SW1hZ2VXaXRoU2l6ZTooQ0dTaXplKXNpemUKLXsKKyAgICBfX2Jsb2NrIGJvb2wgdGVzdEZpbmlz aGVkID0gZmFsc2U7CisgICAgW3JlbW90ZU9iamVjdCByZW5kZXJJbWFnZVdpdGhXaWR0aDp3aWR0 aCBjb21wbGV0aW9uSGFuZGxlcjpeKENHU2l6ZSBpbWFnZVNpemUpIHsKICNpZiBQTEFURk9STShJ T1MpCi0gICAgQ0dGbG9hdCBzY2FsZSA9IFtVSVNjcmVlbiBtYWluU2NyZWVuXS5zY2FsZTsKKyAg ICAgICAgQ0dGbG9hdCBzY2FsZSA9IFtVSVNjcmVlbiBtYWluU2NyZWVuXS5zY2FsZTsKICNlbGlm IFBMQVRGT1JNKE1BQykKLSAgICBDR0Zsb2F0IHNjYWxlID0gW05TU2NyZWVuIG1haW5TY3JlZW5d LmJhY2tpbmdTY2FsZUZhY3RvcjsKKyAgICAgICAgQ0dGbG9hdCBzY2FsZSA9IFtOU1NjcmVlbiBt YWluU2NyZWVuXS5iYWNraW5nU2NhbGVGYWN0b3I7CiAjZW5kaWYKLSAgICBFWFBFQ1RfRVEoNzIw LCBzaXplLndpZHRoIC8gc2NhbGUpOwotICAgIEVYUEVDVF9FUSg1NDAsIHNpemUuaGVpZ2h0IC8g c2NhbGUpOwotICAgIHRlc3RGaW5pc2hlZCA9IHRydWU7Ci19CisgICAgICAgIEVYUEVDVF9FUShl eHBlY3RlZFNpemUud2lkdGgsIGltYWdlU2l6ZS53aWR0aCAvIHNjYWxlKTsKKyAgICAgICAgRVhQ RUNUX0VRKGV4cGVjdGVkU2l6ZS5oZWlnaHQsIGltYWdlU2l6ZS5oZWlnaHQgLyBzY2FsZSk7Cisg ICAgICAgIHRlc3RGaW5pc2hlZCA9IHRydWU7CisgICAgfV07CiAKLUBlbmQKKyAgICBVdGlsOjpy dW4oJnRlc3RGaW5pc2hlZCk7Cit9CiAKLVRFU1QoV2ViS2l0MiwgUmVuZGVyZWRJbWFnZUV4Y2x1 ZGluZ092ZXJmbG93KQorVEVTVChXZWJLaXQyLCBOb2RlSGFuZGxlUmVuZGVyZWRJbWFnZUV4Y2x1 ZGluZ092ZXJmbG93KQogewotICAgIFdLV2ViVmlld0NvbmZpZ3VyYXRpb24gKmNvbmZpZ3VyYXRp b24gPSBbV0tXZWJWaWV3Q29uZmlndXJhdGlvbiB0ZXN0d2Via2l0YXBpX2NvbmZpZ3VyYXRpb25X aXRoVGVzdFBsdWdJbkNsYXNzTmFtZTpAIlJlbmRlcmVkSW1hZ2VXaXRoT3B0aW9uc1BsdWdJbiJd OwotICAgIGF1dG8gd2ViVmlldyA9IGFkb3B0TlMoW1tXS1dlYlZpZXcgYWxsb2NdIGluaXRXaXRo RnJhbWU6Q0dSZWN0WmVybyBjb25maWd1cmF0aW9uOmNvbmZpZ3VyYXRpb25dKTsKLQotICAgIGF1 dG8gb2JqZWN0ID0gYWRvcHROUyhbW1JlbmRlcmVkSW1hZ2VXaXRoT3B0aW9uc09iamVjdCBhbGxv Y10gaW5pdF0pOwotICAgIF9XS1JlbW90ZU9iamVjdEludGVyZmFjZSAqaW50ZXJmYWNlID0gW19X S1JlbW90ZU9iamVjdEludGVyZmFjZSByZW1vdGVPYmplY3RJbnRlcmZhY2VXaXRoUHJvdG9jb2w6 QHByb3RvY29sKFJlbmRlcmVkSW1hZ2VXaXRoT3B0aW9uc1Byb3RvY29sKV07Ci0gICAgW1t3ZWJW aWV3IF9yZW1vdGVPYmplY3RSZWdpc3RyeV0gcmVnaXN0ZXJFeHBvcnRlZE9iamVjdDpvYmplY3Qu Z2V0KCkgaW50ZXJmYWNlOmludGVyZmFjZV07Ci0KLSAgICBbd2ViVmlldyBsb2FkUmVxdWVzdDpb TlNVUkxSZXF1ZXN0IHJlcXVlc3RXaXRoVVJMOltbTlNCdW5kbGUgbWFpbkJ1bmRsZV0gVVJMRm9y UmVzb3VyY2U6QCJyZW5kZXJlZC1pbWFnZS1leGNsdWRpbmctb3ZlcmZsb3ciIHdpdGhFeHRlbnNp b246QCJodG1sIiBzdWJkaXJlY3Rvcnk6QCJUZXN0V2ViS2l0QVBJLnJlc291cmNlcyJdXV07Cisg ICAgcnVuVGVzdFdpdGhXaWR0aChuaWwsIHsgNzIwLCA1NDAgfSk7Cit9CiAKLSAgICBVdGlsOjpy dW4oJnRlc3RGaW5pc2hlZCk7CitURVNUKFdlYktpdDIsIE5vZGVIYW5kbGVSZW5kZXJlZEltYWdl V2l0aFdpZHRoKQoreworICAgIHJ1blRlc3RXaXRoV2lkdGgoQCgtMSksIHsgMCwgMCB9KTsKKyAg ICBydW5UZXN0V2l0aFdpZHRoKEAwLCB7IDAsIDAgfSk7CisgICAgcnVuVGVzdFdpdGhXaWR0aChA MSwgeyAxLCAxIH0pOworICAgIHJ1blRlc3RXaXRoV2lkdGgoQDM2MCwgeyAzNjAsIDI3MCB9KTsK KyAgICBydW5UZXN0V2l0aFdpZHRoKEA3MTksIHsgNzE5LCA1MzkgfSk7CisgICAgcnVuVGVzdFdp dGhXaWR0aChANzIwLCB7IDcyMCwgNTQwIH0pOworICAgIHJ1blRlc3RXaXRoV2lkdGgoQDcyMSwg eyA3MjEsIDU0MSB9KTsKIH0KIAogI2VuZGlmIC8vIFdLX0FQSV9FTkFCTEVECmRpZmYgLS1naXQg YS9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdDJDb2NvYS9SZW5kZXJlZEltYWdlV2l0 aE9wdGlvbnNQbHVnSW4ubW0gYi9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdDJDb2Nv YS9SZW5kZXJlZEltYWdlV2l0aE9wdGlvbnNQbHVnSW4ubW0KaW5kZXggZDg2MDMwMDFlYWFmMTVh YTI4MmEyOTQ4OGJhYmZkMGQ2ODgxYTFmNy4uNjJhMGQ3NjAyYzY4YjRmODBkOWQzYjgxZDk2ZjJm ZGEwNmJkZDk2OCAxMDA2NDQKLS0tIGEvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXQy Q29jb2EvUmVuZGVyZWRJbWFnZVdpdGhPcHRpb25zUGx1Z0luLm1tCisrKyBiL1Rvb2xzL1Rlc3RX ZWJLaXRBUEkvVGVzdHMvV2ViS2l0MkNvY29hL1JlbmRlcmVkSW1hZ2VXaXRoT3B0aW9uc1BsdWdJ bi5tbQpAQCAtMzksMTEgKzM5LDExIEBACiAjaW1wb3J0IDxXZWJLaXQvX1dLUmVtb3RlT2JqZWN0 UmVnaXN0cnkuaD4KICNpbXBvcnQgPHd0Zi9SZXRhaW5QdHIuaD4KIAotQGludGVyZmFjZSBSZW5k ZXJlZEltYWdlV2l0aE9wdGlvbnNQbHVnSW4gOiBOU09iamVjdCA8V0tXZWJQcm9jZXNzUGx1Z0lu LCBXS1dlYlByb2Nlc3NQbHVnSW5Mb2FkRGVsZWdhdGU+CitAaW50ZXJmYWNlIFJlbmRlcmVkSW1h Z2VXaXRoT3B0aW9uc1BsdWdJbiA6IE5TT2JqZWN0IDxXS1dlYlByb2Nlc3NQbHVnSW4sIFdLV2Vi UHJvY2Vzc1BsdWdJbkxvYWREZWxlZ2F0ZSwgUmVuZGVyZWRJbWFnZVdpdGhPcHRpb25zUHJvdG9j b2w+CiBAZW5kCiAKIEBpbXBsZW1lbnRhdGlvbiBSZW5kZXJlZEltYWdlV2l0aE9wdGlvbnNQbHVn SW4gewotICAgIFJldGFpblB0cjxpZCA8UmVuZGVyZWRJbWFnZVdpdGhPcHRpb25zUHJvdG9jb2w+ PiBfcmVtb3RlT2JqZWN0OworICAgIFJldGFpblB0cjxXS1dlYlByb2Nlc3NQbHVnSW5GcmFtZT4g X2ZyYW1lOwogfQogCiAtICh2b2lkKXdlYlByb2Nlc3NQbHVnSW46KFdLV2ViUHJvY2Vzc1BsdWdJ bkNvbnRyb2xsZXIgKilwbHVnSW5Db250cm9sbGVyIGRpZENyZWF0ZUJyb3dzZXJDb250ZXh0Q29u dHJvbGxlcjooV0tXZWJQcm9jZXNzUGx1Z0luQnJvd3NlckNvbnRleHRDb250cm9sbGVyICopYnJv d3NlckNvbnRleHRDb250cm9sbGVyCkBAIC01MSwyMCArNTEsMjUgQEAgLSAodm9pZCl3ZWJQcm9j ZXNzUGx1Z0luOihXS1dlYlByb2Nlc3NQbHVnSW5Db250cm9sbGVyICopcGx1Z0luQ29udHJvbGxl ciBkaWRDcmUKICAgICBicm93c2VyQ29udGV4dENvbnRyb2xsZXIubG9hZERlbGVnYXRlID0gc2Vs ZjsKIAogICAgIF9XS1JlbW90ZU9iamVjdEludGVyZmFjZSAqaW50ZXJmYWNlID0gW19XS1JlbW90 ZU9iamVjdEludGVyZmFjZSByZW1vdGVPYmplY3RJbnRlcmZhY2VXaXRoUHJvdG9jb2w6QHByb3Rv Y29sKFJlbmRlcmVkSW1hZ2VXaXRoT3B0aW9uc1Byb3RvY29sKV07Ci0gICAgX3JlbW90ZU9iamVj dCA9IFticm93c2VyQ29udGV4dENvbnRyb2xsZXIuX3JlbW90ZU9iamVjdFJlZ2lzdHJ5IHJlbW90 ZU9iamVjdFByb3h5V2l0aEludGVyZmFjZTppbnRlcmZhY2VdOworICAgIFticm93c2VyQ29udGV4 dENvbnRyb2xsZXIuX3JlbW90ZU9iamVjdFJlZ2lzdHJ5IHJlZ2lzdGVyRXhwb3J0ZWRPYmplY3Q6 c2VsZiBpbnRlcmZhY2U6aW50ZXJmYWNlXTsKIH0KIAogLSAodm9pZCl3ZWJQcm9jZXNzUGx1Z0lu QnJvd3NlckNvbnRleHRDb250cm9sbGVyOihXS1dlYlByb2Nlc3NQbHVnSW5Ccm93c2VyQ29udGV4 dENvbnRyb2xsZXIgKiljb250cm9sbGVyIGRpZEZpbmlzaExvYWRGb3JGcmFtZTooV0tXZWJQcm9j ZXNzUGx1Z0luRnJhbWUgKilmcmFtZQogewotICAgIEpTQ29udGV4dCAqY29udGV4dCA9IFtmcmFt ZSBqc0NvbnRleHRGb3JXb3JsZDpbV0tXZWJQcm9jZXNzUGx1Z0luU2NyaXB0V29ybGQgbm9ybWFs V29ybGRdXTsKKyAgICBfZnJhbWUgPSBmcmFtZTsKK30KKworLSAodm9pZClyZW5kZXJJbWFnZVdp dGhXaWR0aDooTlNOdW1iZXIgKil3aWR0aCBjb21wbGV0aW9uSGFuZGxlcjoodm9pZCAoXikoQ0dT aXplKSljb21wbGV0aW9uSGFuZGxlcgoreworICAgIEpTQ29udGV4dCAqY29udGV4dCA9IFtfZnJh bWUganNDb250ZXh0Rm9yV29ybGQ6W1dLV2ViUHJvY2Vzc1BsdWdJblNjcmlwdFdvcmxkIG5vcm1h bFdvcmxkXV07CiAgICAgSlNWYWx1ZSAqY29udGFpbmVyVmFsdWUgPSBbY29udGV4dCBldmFsdWF0 ZVNjcmlwdDpAImRvY3VtZW50LnF1ZXJ5U2VsZWN0b3IoJy5jb250YWluZXInKSJdOwogICAgIFdL V2ViUHJvY2Vzc1BsdWdJbk5vZGVIYW5kbGUgKmNvbnRhaW5lck5vZGUgPSBbV0tXZWJQcm9jZXNz UGx1Z0luTm9kZUhhbmRsZSBub2RlSGFuZGxlV2l0aEpTVmFsdWU6Y29udGFpbmVyVmFsdWUgaW5D b250ZXh0OmNvbnRleHRdOwogI2lmIFBMQVRGT1JNKElPUykKLSAgICBVSUltYWdlICppbWFnZSA9 IFtjb250YWluZXJOb2RlIHJlbmRlcmVkSW1hZ2VXaXRoT3B0aW9uczprV0tTbmFwc2hvdE9wdGlv bnNFeGNsdWRlT3ZlcmZsb3ddOworICAgIFVJSW1hZ2UgKmltYWdlID0gW2NvbnRhaW5lck5vZGUg cmVuZGVyZWRJbWFnZVdpdGhPcHRpb25zOmtXS1NuYXBzaG90T3B0aW9uc0V4Y2x1ZGVPdmVyZmxv dyB3aWR0aDp3aWR0aF07CiAjZWxpZiBQTEFURk9STShNQUMpCi0gICAgTlNJbWFnZSAqaW1hZ2Ug PSBbY29udGFpbmVyTm9kZSByZW5kZXJlZEltYWdlV2l0aE9wdGlvbnM6a1dLU25hcHNob3RPcHRp b25zRXhjbHVkZU92ZXJmbG93XTsKKyAgICBOU0ltYWdlICppbWFnZSA9IFtjb250YWluZXJOb2Rl IHJlbmRlcmVkSW1hZ2VXaXRoT3B0aW9uczprV0tTbmFwc2hvdE9wdGlvbnNFeGNsdWRlT3ZlcmZs b3cgd2lkdGg6d2lkdGhdOwogI2VuZGlmCi0gICAgW19yZW1vdGVPYmplY3QgZGlkUmVuZGVySW1h Z2VXaXRoU2l6ZTppbWFnZS5zaXplXTsKKyAgICBjb21wbGV0aW9uSGFuZGxlcihpbWFnZS5zaXpl KTsKIH0KIAogQGVuZApkaWZmIC0tZ2l0IGEvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJL aXQyQ29jb2EvUmVuZGVyZWRJbWFnZVdpdGhPcHRpb25zUHJvdG9jb2wuaCBiL1Rvb2xzL1Rlc3RX ZWJLaXRBUEkvVGVzdHMvV2ViS2l0MkNvY29hL1JlbmRlcmVkSW1hZ2VXaXRoT3B0aW9uc1Byb3Rv Y29sLmgKaW5kZXggMzU1ODNiZmJmNDMyNWZlNmFlNThhOWNhZDI3YTFlOGM0ZjE3OWIxMi4uMjBh MjNiZTc5YjNkNzhmOGQzMmI3NWYyZDUzYWIwMTliY2Q2ODNmNCAxMDA2NDQKLS0tIGEvVG9vbHMv VGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXQyQ29jb2EvUmVuZGVyZWRJbWFnZVdpdGhPcHRpb25z UHJvdG9jb2wuaAorKysgYi9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdDJDb2NvYS9S ZW5kZXJlZEltYWdlV2l0aE9wdGlvbnNQcm90b2NvbC5oCkBAIC0yNCw1ICsyNCw1IEBACiAgKi8K IAogQHByb3RvY29sIFJlbmRlcmVkSW1hZ2VXaXRoT3B0aW9uc1Byb3RvY29sCi0tICh2b2lkKWRp ZFJlbmRlckltYWdlV2l0aFNpemU6KENHU2l6ZSlzaXplOworLSAodm9pZClyZW5kZXJJbWFnZVdp dGhXaWR0aDooTlNOdW1iZXIgKil3aWR0aCBjb21wbGV0aW9uSGFuZGxlcjoodm9pZCAoXikoQ0dT aXplIGltYWdlU2l6ZSkpY29tcGxldGlvbkhhbmRsZXI7CiBAZW5kCg==