212249 2020-05-21 19:31:21 -0700 [ANGLE - iOS] fast/canvas/webgl/uninitialized-test.html is still failing 2020-07-07 12:11:32 -0700 1 1 1 Unclassified WebKit WebGL WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 207858 209139 1 justin_fan jdarpinian dino ews-watchlist graouts jdarpinian kbr kondapallykalyan webkit-bug-importer oldest_to_newest 1655199 0 justin_fan 2020-05-21 19:31:21 -0700 Our test suite contains an extended version of the unitialized-test.html test found in the WebGL conformance suite that contains additional tests for copyTexSubImage2D. On iOS/Simulator, pixels that lie outside of the bounds of the FBO being copied by copyTexSubImage2D are incorrectly modified. They should remain untouched from the clearColor set previously. This test passes on macOS WebKit. 1655200 1 justin_fan 2020-05-21 19:32:07 -0700 <rdar://problem/63416418> 1657477 2 jdarpinian 2020-05-29 16:01:47 -0700 It seems like copyTexSubImage2D is broken in some way in the driver on iOS when copying from renderbuffers. I'm implementing a workaround in ANGLE which uses shaders to implement the copy instead. 1659421 3 401098 jdarpinian 2020-06-04 17:10:05 -0700 Created attachment 401098 Patch 1659429 4 401102 jdarpinian 2020-06-04 17:22:38 -0700 Created attachment 401102 Patch 1659430 5 ews-watchlist 2020-06-04 17:23:59 -0700 Note that there are important steps to take when updating ANGLE. See http://trac.webkit.org/wiki/UpdatingANGLE 1659432 6 401103 jdarpinian 2020-06-04 17:40:07 -0700 Created attachment 401103 Patch 1659817 7 401205 jdarpinian 2020-06-05 15:13:53 -0700 Created attachment 401205 Patch 1659891 8 401205 dino 2020-06-05 19:34:18 -0700 Comment on attachment 401205 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=401205&action=review > Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/renderergl_utils.cpp:1732 > + IsApple() && functions->standard == STANDARD_GL_ES && !(isAMD && IsWindows())); How can both isApple() and GL_ES be true while that last condition is false? Is it necessary? If you were on Windows AMD, you'd already have failed isApple and GL_ES. > Source/ThirdParty/ANGLE/util/EGLPlatformParameters.h:78 > - EGLint renderer = EGL_PLATFORM_ANGLE_TYPE_DEFAULT_ANGLE; > - EGLint majorVersion = EGL_DONT_CARE; > - EGLint minorVersion = EGL_DONT_CARE; > - EGLint deviceType = EGL_PLATFORM_ANGLE_DEVICE_TYPE_HARDWARE_ANGLE; > - EGLint presentPath = EGL_DONT_CARE; > - EGLint debugLayersEnabled = EGL_DONT_CARE; > - EGLint contextVirtualization = EGL_DONT_CARE; > - EGLint robustness = EGL_DONT_CARE; > - EGLint transformFeedbackFeature = EGL_DONT_CARE; > - EGLint allocateNonZeroMemoryFeature = EGL_DONT_CARE; > - angle::PlatformMethods *platformMethods = nullptr; > + EGLint renderer = EGL_PLATFORM_ANGLE_TYPE_DEFAULT_ANGLE; > + EGLint majorVersion = EGL_DONT_CARE; > + EGLint minorVersion = EGL_DONT_CARE; > + EGLint deviceType = EGL_PLATFORM_ANGLE_DEVICE_TYPE_HARDWARE_ANGLE; > + EGLint presentPath = EGL_DONT_CARE; > + EGLint debugLayersEnabled = EGL_DONT_CARE; > + EGLint contextVirtualization = EGL_DONT_CARE; > + EGLint robustness = EGL_DONT_CARE; > + EGLint transformFeedbackFeature = EGL_DONT_CARE; > + EGLint allocateNonZeroMemoryFeature = EGL_DONT_CARE; > + EGLint emulateCopyTexImage2DFromRenderbuffers = EGL_DONT_CARE; > + angle::PlatformMethods *platformMethods = nullptr; This diff is my favourite argument against requiring alignment of variable assignments :) 1659911 9 401205 jdarpinian 2020-06-05 22:29:06 -0700 Comment on attachment 401205 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=401205&action=review >> Source/ThirdParty/ANGLE/src/libANGLE/renderer/gl/renderergl_utils.cpp:1732 >> + IsApple() && functions->standard == STANDARD_GL_ES && !(isAMD && IsWindows())); > > How can both isApple() and GL_ES be true while that last condition is false? Is it necessary? > > If you were on Windows AMD, you'd already have failed isApple and GL_ES. This is explained in the comment above. I had to add a test suppression for Windows AMD, and I added the redundant condition so that this doesn't accidentally get enabled there without someone noticing that they need to unsuppress and fix the test as well. >> Source/ThirdParty/ANGLE/util/EGLPlatformParameters.h:78 >> + angle::PlatformMethods *platformMethods = nullptr; > > This diff is my favourite argument against requiring alignment of variable assignments :) Yeah, unfortunately this is required by the clang-format options ANGLE uses. 1660110 10 ews-feeder 2020-06-07 14:08:03 -0700 Committed r262701: <https://trac.webkit.org/changeset/262701> All reviewed patches have been landed. Closing bug and clearing flags on attachment 401205. 401098 2020-06-04 17:10:05 -0700 2020-06-04 17:22:37 -0700 Patch bug-212249-20200604171004.patch text/plain 21323 jdarpinian U3VidmVyc2lvbiBSZXZpc2lvbjogMjYxOTA1CmRpZmYgLS1naXQgYS9Tb3VyY2UvVGhpcmRQYXJ0 eS9BTkdMRS9DaGFuZ2VMb2cgYi9Tb3VyY2UvVGhpcmRQYXJ0eS9BTkdMRS9DaGFuZ2VMb2cKaW5k ZXggYTBlMDE3ZDdjNmE3NThjNTg3ODZkOGY0MTZjZmViYzJiZDQxNjUzYy4uODU5MzM1NDQ5MWNk ZTk4N2JmZGE3OGMxZjU5ZGJjNTA2NDBkMjNmYyAxMDA2NDQKLS0tIGEvU291cmNlL1RoaXJkUGFy dHkvQU5HTEUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9UaGlyZFBhcnR5L0FOR0xFL0NoYW5nZUxv ZwpAQCAtMSwzICsxLDMzIEBACisyMDIwLTA2LTA0ICBKYW1lcyBEYXJwaW5pYW4gIDxqZGFycGlu aWFuQGNocm9taXVtLm9yZz4KKworICAgICAgICBbQU5HTEUgLSBpT1NdIGZhc3QvY2FudmFzL3dl YmdsL3VuaW5pdGlhbGl6ZWQtdGVzdC5odG1sIGlzIHN0aWxsIGZhaWxpbmcKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIxMjI0OQorCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIGNvcHlUZXhJbWFnZTJEIGlzIGJy b2tlbiBpbiBzb21lIHdheSBvbiBpT1MuIFdvcmsgYXJvdW5kIGl0IGJ5IHJlaW1wbGVtZW50aW5n CisgICAgICAgIGl0IHdpdGggQU5HTEUncyBCbGl0R0wgY2xhc3MuCisKKyAgICAgICAgKiBpbmNs dWRlL3BsYXRmb3JtL0ZlYXR1cmVzR0wuaDoKKyAgICAgICAgKiBzcmMvbGliQU5HTEUvcmVuZGVy ZXIvZ2wvQmxpdEdMLmNwcDoKKyAgICAgICAgKHJ4OjpCbGl0R0w6OmJsaXRDb2xvckJ1ZmZlcldp dGhTaGFkZXIpOgorICAgICAgICAqIHNyYy9saWJBTkdMRS9yZW5kZXJlci9nbC9CbGl0R0wuaDoK KyAgICAgICAgKiBzcmMvbGliQU5HTEUvcmVuZGVyZXIvZ2wvVGV4dHVyZUdMLmNwcDoKKyAgICAg ICAgKHJ4OjpUZXh0dXJlR0w6OmNvcHlJbWFnZSk6CisgICAgICAgIChyeDo6VGV4dHVyZUdMOjpj b3B5U3ViSW1hZ2UpOgorICAgICAgICAqIHNyYy9saWJBTkdMRS9yZW5kZXJlci9nbC9yZW5kZXJl cmdsX3V0aWxzLmNwcDoKKyAgICAgICAgKHJ4OjpuYXRpdmVnbF9nbDo6SW5pdGlhbGl6ZUZlYXR1 cmVzKToKKyAgICAgICAgKiBzcmMvdGVzdHMvZ2xfdGVzdHMvQ29weVRleEltYWdlVGVzdC5jcHA6 CisgICAgICAgICogc3JjL3Rlc3RzL2dsX3Rlc3RzL1RleHR1cmVUZXN0LmNwcDoKKyAgICAgICAg KiBzcmMvdGVzdHMvdGVzdF91dGlscy9hbmdsZV90ZXN0X2NvbmZpZ3MuY3BwOgorICAgICAgICAo YW5nbGU6Om9wZXJhdG9yPDwpOgorICAgICAgICAqIHNyYy90ZXN0cy90ZXN0X3V0aWxzL2FuZ2xl X3Rlc3RfY29uZmlncy5oOgorICAgICAgICAoYW5nbGU6OldpdGhFbXVsYXRlQ29weVRleEltYWdl MkRGcm9tUmVuZGVyYnVmZmVycyk6CisgICAgICAgICogdXRpbC9FR0xQbGF0Zm9ybVBhcmFtZXRl cnMuaDoKKyAgICAgICAgKEVHTFBsYXRmb3JtUGFyYW1ldGVyczo6dGllIGNvbnN0KToKKyAgICAg ICAgKiB1dGlsL0VHTFdpbmRvdy5jcHA6CisgICAgICAgIChFR0xXaW5kb3c6OmluaXRpYWxpemVE aXNwbGF5KToKKwogMjAyMC0wNS0xOCAgSmFtZXMgRGFycGluaWFuICA8amRhcnBpbmlhbkBjaHJv bWl1bS5vcmc+CiAKICAgICAgICAgRW5hYmxlIHJlZ2VuZXJhdGVTdHJ1Y3ROYW1lcyB3b3JrYXJv dW5kIG9uIGlPUwpkaWZmIC0tZ2l0IGEvU291cmNlL1RoaXJkUGFydHkvQU5HTEUvaW5jbHVkZS9w bGF0Zm9ybS9GZWF0dXJlc0dMLmggYi9Tb3VyY2UvVGhpcmRQYXJ0eS9BTkdMRS9pbmNsdWRlL3Bs YXRmb3JtL0ZlYXR1cmVzR0wuaAppbmRleCA4NTk0N2U0MGZkNTZhNDk0ODZiNzVmNDEyZWJiZjlh ZjRmM2QwOWE0Li5kMWE4NjdiYWUwYjIxOTQyMWNjYTJjMmJlYzQzYzU4YjAxNzQzYzI3IDEwMDY0 NAotLS0gYS9Tb3VyY2UvVGhpcmRQYXJ0eS9BTkdMRS9pbmNsdWRlL3BsYXRmb3JtL0ZlYXR1cmVz R0wuaAorKysgYi9Tb3VyY2UvVGhpcmRQYXJ0eS9BTkdMRS9pbmNsdWRlL3BsYXRmb3JtL0ZlYXR1 cmVzR0wuaApAQCAtNDMwLDYgKzQzMCwxMSBAQCBzdHJ1Y3QgRmVhdHVyZXNHTCA6IEZlYXR1cmVT ZXRCYXNlCiAgICAgRmVhdHVyZSBkaXNhYmxlU2VtYXBob3JlRmQgPSB7ImRpc2FibGVfc2VtYXBo b3JlX2ZkIiwgRmVhdHVyZUNhdGVnb3J5OjpPcGVuR0xXb3JrYXJvdW5kcywKICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAiRGlzYWJsZSBHTF9FWFRfc2VtYXBob3JlX2ZkIGV4dGVu c2lvbiIsICZtZW1iZXJzLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICJodHRw czovL2NyYnVnLmNvbS8xMDQ2NDYyIn07CisKKyAgICBGZWF0dXJlIGVtdWxhdGVDb3B5VGV4SW1h Z2UyREZyb21SZW5kZXJidWZmZXJzID0geworICAgICAgICAiZW11bGF0ZV9jb3B5dGV4aW1hZ2Uy ZF9mcm9tX3JlbmRlcmJ1ZmZlcnMiLCBGZWF0dXJlQ2F0ZWdvcnk6Ok9wZW5HTFdvcmthcm91bmRz LAorICAgICAgICAiQ29weVRleEltYWdlMkQgc3B1cmlvdXNseSByZXR1cm5zIGVycm9ycyBvbiBp T1Mgd2hlbiBjb3B5aW5nIGZyb20gcmVuZGVyYnVmZmVycy4iLAorICAgICAgICAmbWVtYmVycywg Imh0dHBzOi8vYW5nbGVidWcuY29tLzQ2NzQifTsKIH07CiAKIGlubGluZSBGZWF0dXJlc0dMOjpG ZWF0dXJlc0dMKCkgID0gZGVmYXVsdDsKZGlmZiAtLWdpdCBhL1NvdXJjZS9UaGlyZFBhcnR5L0FO R0xFL3NyYy9saWJBTkdMRS9yZW5kZXJlci9nbC9CbGl0R0wuY3BwIGIvU291cmNlL1RoaXJkUGFy dHkvQU5HTEUvc3JjL2xpYkFOR0xFL3JlbmRlcmVyL2dsL0JsaXRHTC5jcHAKaW5kZXggYzViYmU5 ZTVhY2Q1OTUzM2NlMDJiMzUxNGNkOGQyNzZkNzE1NzNkNy4uY2VhMWYzNWUxMzBkOTJkZmFmZmNk OGEzZTVhYjVhMzNlNWQ0MTE4MSAxMDA2NDQKLS0tIGEvU291cmNlL1RoaXJkUGFydHkvQU5HTEUv c3JjL2xpYkFOR0xFL3JlbmRlcmVyL2dsL0JsaXRHTC5jcHAKKysrIGIvU291cmNlL1RoaXJkUGFy dHkvQU5HTEUvc3JjL2xpYkFOR0xFL3JlbmRlcmVyL2dsL0JsaXRHTC5jcHAKQEAgLTM5OCwxMiAr Mzk4LDUxIEBAIGFuZ2xlOjpSZXN1bHQgQmxpdEdMOjpjb3B5U3ViSW1hZ2VUb0xVTUFXb3JrYXJv dW5kVGV4dHVyZShjb25zdCBnbDo6Q29udGV4dCAqY29uCiAgICAgcmV0dXJuIGFuZ2xlOjpSZXN1 bHQ6OkNvbnRpbnVlOwogfQogCithbmdsZTo6UmVzdWx0IEJsaXRHTDo6YmxpdENvbG9yQnVmZmVy V2l0aFNoYWRlcihjb25zdCBnbDo6Q29udGV4dCAqY29udGV4dCwKKyAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGNvbnN0IGdsOjpGcmFtZWJ1ZmZlciAqc291 cmNlLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgY29u c3QgR0x1aW50IGRlc3RUZXh0dXJlLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgY29uc3QgZ2w6OlRleHR1cmVUYXJnZXQgZGVzdFRhcmdldCwKKyAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGNvbnN0IHNpemVfdCBk ZXN0TGV2ZWwsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICBjb25zdCBnbDo6UmVjdGFuZ2xlICZzb3VyY2VBcmVhSW4sCisgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICBjb25zdCBnbDo6UmVjdGFuZ2xlICZkZXN0QXJl YUluLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgR0xl bnVtIGZpbHRlcikKK3sKKyAgICBBTkdMRV9UUlkoaW5pdGlhbGl6ZVJlc291cmNlcyhjb250ZXh0 KSk7CisgICAgbVN0YXRlTWFuYWdlci0+YmluZEZyYW1lYnVmZmVyKEdMX0ZSQU1FQlVGRkVSLCBt U2NyYXRjaEZCTyk7CisgICAgQU5HTEVfR0xfVFJZKGNvbnRleHQsIG1GdW5jdGlvbnMtPmZyYW1l YnVmZmVyVGV4dHVyZTJEKEdMX0ZSQU1FQlVGRkVSLCBHTF9DT0xPUl9BVFRBQ0hNRU5UMCwKKyAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg VG9HTGVudW0oZGVzdFRhcmdldCksIGRlc3RUZXh0dXJlLAorICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBzdGF0aWNfY2FzdDxHTGludD4o ZGVzdExldmVsKSkpOworICAgIEdMZW51bSBzdGF0dXMgPSBBTkdMRV9HTF9UUlkoY29udGV4dCwg bUZ1bmN0aW9ucy0+Y2hlY2tGcmFtZWJ1ZmZlclN0YXR1cyhHTF9GUkFNRUJVRkZFUikpOworICAg IGlmIChzdGF0dXMgIT0gR0xfRlJBTUVCVUZGRVJfQ09NUExFVEUpCisgICAgeworICAgICAgICBy ZXR1cm4gYW5nbGU6OlJlc3VsdDo6U3RvcDsKKyAgICB9CisgICAgYW5nbGU6OlJlc3VsdCByZXN1 bHQgPSBibGl0Q29sb3JCdWZmZXJXaXRoU2hhZGVyKGNvbnRleHQsIHNvdXJjZSwgbVNjcmF0Y2hG Qk8sIHNvdXJjZUFyZWFJbiwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgZGVzdEFyZWFJbiwgZmlsdGVyKTsKKyAgICAvLyBVbmJpbmQgdGhlIHRl eHR1cmUgZnJvbSB0aGUgdGhlIHNjcmF0Y2ggZnJhbWVidWZmZXIuCisgICAgQU5HTEVfR0xfVFJZ KGNvbnRleHQsIG1GdW5jdGlvbnMtPmZyYW1lYnVmZmVyUmVuZGVyYnVmZmVyKEdMX0ZSQU1FQlVG RkVSLCBHTF9DT0xPUl9BVFRBQ0hNRU5UMCwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgR0xfUkVOREVSQlVGRkVSLCAwKSk7Cisg ICAgcmV0dXJuIHJlc3VsdDsKK30KKwogYW5nbGU6OlJlc3VsdCBCbGl0R0w6OmJsaXRDb2xvckJ1 ZmZlcldpdGhTaGFkZXIoY29uc3QgZ2w6OkNvbnRleHQgKmNvbnRleHQsCiAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBjb25zdCBnbDo6RnJhbWVidWZmZXIg KnNvdXJjZSwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg IGNvbnN0IGdsOjpGcmFtZWJ1ZmZlciAqZGVzdCwKICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgIGNvbnN0IGdsOjpSZWN0YW5nbGUgJnNvdXJjZUFyZWFJbiwK ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGNvbnN0IGds OjpSZWN0YW5nbGUgJmRlc3RBcmVhSW4sCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICBHTGVudW0gZmlsdGVyKQoreworICAgIGNvbnN0IEZyYW1lYnVmZmVy R0wgKmRlc3RHTCA9IEdldEltcGxBczxGcmFtZWJ1ZmZlckdMPihkZXN0KTsKKyAgICByZXR1cm4g YmxpdENvbG9yQnVmZmVyV2l0aFNoYWRlcihjb250ZXh0LCBzb3VyY2UsIGRlc3RHTC0+Z2V0RnJh bWVidWZmZXJJRCgpLCBzb3VyY2VBcmVhSW4sCisgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgZGVzdEFyZWFJbiwgZmlsdGVyKTsKK30KKworYW5nbGU6OlJlc3VsdCBCbGl0R0w6 OmJsaXRDb2xvckJ1ZmZlcldpdGhTaGFkZXIoY29uc3QgZ2w6OkNvbnRleHQgKmNvbnRleHQsCisg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBjb25zdCBnbDo6 RnJhbWVidWZmZXIgKnNvdXJjZSwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgIGNvbnN0IEdMdWludCBkZXN0RnJhbWVidWZmZXIsCisgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBjb25zdCBnbDo6UmVjdGFuZ2xlICZz b3VyY2VBcmVhSW4sCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICBjb25zdCBnbDo6UmVjdGFuZ2xlICZkZXN0QXJlYUluLAorICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgR0xlbnVtIGZpbHRlcikKIHsKICAgICBBTkdM RV9UUlkoaW5pdGlhbGl6ZVJlc291cmNlcyhjb250ZXh0KSk7CiAKQEAgLTUwNCw4ICs1NDMsNyBA QCBhbmdsZTo6UmVzdWx0IEJsaXRHTDo6YmxpdENvbG9yQnVmZmVyV2l0aFNoYWRlcihjb25zdCBn bDo6Q29udGV4dCAqY29udGV4dCwKICAgICBBTkdMRV9HTF9UUlkoY29udGV4dCwgbUZ1bmN0aW9u cy0+dW5pZm9ybTFpKGJsaXRQcm9ncmFtLT5tdWx0aXBseUFscGhhTG9jYXRpb24sIDApKTsKICAg ICBBTkdMRV9HTF9UUlkoY29udGV4dCwgbUZ1bmN0aW9ucy0+dW5pZm9ybTFpKGJsaXRQcm9ncmFt LT51bk11bHRpcGx5QWxwaGFMb2NhdGlvbiwgMCkpOwogCi0gICAgY29uc3QgRnJhbWVidWZmZXJH TCAqZGVzdEdMID0gR2V0SW1wbEFzPEZyYW1lYnVmZmVyR0w+KGRlc3QpOwotICAgIG1TdGF0ZU1h bmFnZXItPmJpbmRGcmFtZWJ1ZmZlcihHTF9EUkFXX0ZSQU1FQlVGRkVSLCBkZXN0R0wtPmdldEZy YW1lYnVmZmVySUQoKSk7CisgICAgbVN0YXRlTWFuYWdlci0+YmluZEZyYW1lYnVmZmVyKEdMX0RS QVdfRlJBTUVCVUZGRVIsIGRlc3RGcmFtZWJ1ZmZlcik7CiAKICAgICBtU3RhdGVNYW5hZ2VyLT5i aW5kVmVydGV4QXJyYXkobVZBTywgMCk7CiAgICAgQU5HTEVfR0xfVFJZKGNvbnRleHQsIG1GdW5j dGlvbnMtPmRyYXdBcnJheXMoR0xfVFJJQU5HTEVTLCAwLCAzKSk7CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvVGhpcmRQYXJ0eS9BTkdMRS9zcmMvbGliQU5HTEUvcmVuZGVyZXIvZ2wvQmxpdEdMLmggYi9T b3VyY2UvVGhpcmRQYXJ0eS9BTkdMRS9zcmMvbGliQU5HTEUvcmVuZGVyZXIvZ2wvQmxpdEdMLmgK aW5kZXggNDY3NzM5MWI4MDJmMzBmZDg2MzYzZWJjNzBiN2FmOWYzNDk4ZjgwZi4uOTc5NzUyZWY4 OTA5ZTI2NGRhOWRhMGQyODI1YWMzMGYzZjhhZTRkNyAxMDA2NDQKLS0tIGEvU291cmNlL1RoaXJk UGFydHkvQU5HTEUvc3JjL2xpYkFOR0xFL3JlbmRlcmVyL2dsL0JsaXRHTC5oCisrKyBiL1NvdXJj ZS9UaGlyZFBhcnR5L0FOR0xFL3NyYy9saWJBTkdMRS9yZW5kZXJlci9nbC9CbGl0R0wuaApAQCAt NzEsNiArNzEsMjIgQEAgY2xhc3MgQmxpdEdMIDogYW5nbGU6Ok5vbkNvcHlhYmxlCiAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGNvbnN0IGdsOjpSZWN0YW5nbGUg JmRlc3RBcmVhLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBH TGVudW0gZmlsdGVyKTsKIAorICAgIGFuZ2xlOjpSZXN1bHQgYmxpdENvbG9yQnVmZmVyV2l0aFNo YWRlcihjb25zdCBnbDo6Q29udGV4dCAqY29udGV4dCwKKyAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgY29uc3QgZ2w6OkZyYW1lYnVmZmVyICpzb3VyY2UsCisgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGNvbnN0IEdMdWludCBkZXN0 RnJhbWVidWZmZXIsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg IGNvbnN0IGdsOjpSZWN0YW5nbGUgJnNvdXJjZUFyZWEsCisgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgIGNvbnN0IGdsOjpSZWN0YW5nbGUgJmRlc3RBcmVhLAorICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBHTGVudW0gZmlsdGVyKTsK KworICAgIGFuZ2xlOjpSZXN1bHQgYmxpdENvbG9yQnVmZmVyV2l0aFNoYWRlcihjb25zdCBnbDo6 Q29udGV4dCAqY29udGV4dCwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgY29uc3QgZ2w6OkZyYW1lYnVmZmVyICpzb3VyY2UsCisgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgIGNvbnN0IEdMdWludCBkZXN0VGV4dHVyZSwKKyAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgY29uc3QgZ2w6OlRleHR1cmVU YXJnZXQgZGVzdFRhcmdldCwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgY29uc3Qgc2l6ZV90IGRlc3RMZXZlbCwKKyAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgY29uc3QgZ2w6OlJlY3RhbmdsZSAmc291cmNlQXJlYSwKKyAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgY29uc3QgZ2w6OlJlY3Rhbmds ZSAmZGVzdEFyZWEsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg IEdMZW51bSBmaWx0ZXIpOworCiAgICAgYW5nbGU6OlJlc3VsdCBjb3B5U3ViVGV4dHVyZShjb25z dCBnbDo6Q29udGV4dCAqY29udGV4dCwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg IFRleHR1cmVHTCAqc291cmNlLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgc2l6 ZV90IHNvdXJjZUxldmVsLApkaWZmIC0tZ2l0IGEvU291cmNlL1RoaXJkUGFydHkvQU5HTEUvc3Jj L2xpYkFOR0xFL3JlbmRlcmVyL2dsL1RleHR1cmVHTC5jcHAgYi9Tb3VyY2UvVGhpcmRQYXJ0eS9B TkdMRS9zcmMvbGliQU5HTEUvcmVuZGVyZXIvZ2wvVGV4dHVyZUdMLmNwcAppbmRleCAwMTY1MmY5 MzliYmI1MmEyNjJmZmQ3ZGU3MjVjYzNkZjI3ODhlZWRjLi5lMDNmY2ZmNzA4MmJmZWI5YWM0MmFj YTYwNGEyYjdmMjljZDJiNTg3IDEwMDY0NAotLS0gYS9Tb3VyY2UvVGhpcmRQYXJ0eS9BTkdMRS9z cmMvbGliQU5HTEUvcmVuZGVyZXIvZ2wvVGV4dHVyZUdMLmNwcAorKysgYi9Tb3VyY2UvVGhpcmRQ YXJ0eS9BTkdMRS9zcmMvbGliQU5HTEUvcmVuZGVyZXIvZ2wvVGV4dHVyZUdMLmNwcApAQCAtNzE2 LDcgKzcxNiwxNyBAQCBhbmdsZTo6UmVzdWx0IFRleHR1cmVHTDo6Y29weUltYWdlKGNvbnN0IGds OjpDb250ZXh0ICpjb250ZXh0LAogICAgICAgICAgICAgQVNTRVJUKG5hdGl2ZWdsOjpVc2VUZXhJ bWFnZTJEKGdldFR5cGUoKSkpOwogICAgICAgICAgICAgc3RhdGVNYW5hZ2VyLT5iaW5kRnJhbWVi dWZmZXIoR0xfUkVBRF9GUkFNRUJVRkZFUiwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgIHNvdXJjZUZyYW1lYnVmZmVyR0wtPmdldEZyYW1lYnVmZmVySUQoKSk7Ci0g ICAgICAgICAgICBpZiAocmVxdWlyZXNJbml0aWFsaXphdGlvbikKKyAgICAgICAgICAgIGlmIChm ZWF0dXJlcy5lbXVsYXRlQ29weVRleEltYWdlMkRGcm9tUmVuZGVyYnVmZmVycy5lbmFibGVkICYm IHJlYWRCdWZmZXIgJiYKKyAgICAgICAgICAgICAgICByZWFkQnVmZmVyLT50eXBlKCkgPT0gR0xf UkVOREVSQlVGRkVSKQorICAgICAgICAgICAgeworICAgICAgICAgICAgICAgIEJsaXRHTCAqYmxp dHRlciA9IEdldEJsaXRHTChjb250ZXh0KTsKKyAgICAgICAgICAgICAgICBBTkdMRV9UUlkoYmxp dHRlci0+YmxpdENvbG9yQnVmZmVyV2l0aFNoYWRlcigKKyAgICAgICAgICAgICAgICAgICAgY29u dGV4dCwgc291cmNlLCBtVGV4dHVyZUlELCB0YXJnZXQsIGxldmVsLCBjbGlwcGVkQXJlYSwKKyAg ICAgICAgICAgICAgICAgICAgZ2w6OlJlY3RhbmdsZShkZXN0T2Zmc2V0LngsIGRlc3RPZmZzZXQu eSwgY2xpcHBlZEFyZWEud2lkdGgsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg Y2xpcHBlZEFyZWEuaGVpZ2h0KSwKKyAgICAgICAgICAgICAgICAgICAgR0xfTkVBUkVTVCkpOwor ICAgICAgICAgICAgfQorICAgICAgICAgICAgZWxzZSBpZiAocmVxdWlyZXNJbml0aWFsaXphdGlv bikKICAgICAgICAgICAgIHsKICAgICAgICAgICAgICAgICBBTkdMRV9HTF9UUlkoY29udGV4dCwg ZnVuY3Rpb25zLT5jb3B5VGV4U3ViSW1hZ2UyRCgKICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgIFRvR0xlbnVtKHRhcmdldCksIHN0YXRpY19jYXN0PEdMaW50PihsZXZl bCksIGRlc3RPZmZzZXQueCwKQEAgLTc4NCwxMCArNzk0LDI0IEBAIGFuZ2xlOjpSZXN1bHQgVGV4 dHVyZUdMOjpjb3B5U3ViSW1hZ2UoY29uc3QgZ2w6OkNvbnRleHQgKmNvbnRleHQsCiAgICAgICAg IGlmIChuYXRpdmVnbDo6VXNlVGV4SW1hZ2UyRChnZXRUeXBlKCkpKQogICAgICAgICB7CiAgICAg ICAgICAgICBBU1NFUlQoY2xpcHBlZE9mZnNldC56ID09IDApOwotICAgICAgICAgICAgQU5HTEVf R0xfVFJZKGNvbnRleHQsIGZ1bmN0aW9ucy0+Y29weVRleFN1YkltYWdlMkQoCi0gICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgIFRvR0xlbnVtKHRhcmdldCksIHN0YXRpY19jYXN0 PEdMaW50PihsZXZlbCksIGNsaXBwZWRPZmZzZXQueCwKLSAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgY2xpcHBlZE9mZnNldC55LCBjbGlwcGVkQXJlYS54LCBjbGlwcGVkQXJl YS55LAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBjbGlwcGVkQXJlYS53 aWR0aCwgY2xpcHBlZEFyZWEuaGVpZ2h0KSk7CisgICAgICAgICAgICBpZiAoZmVhdHVyZXMuZW11 bGF0ZUNvcHlUZXhJbWFnZTJERnJvbVJlbmRlcmJ1ZmZlcnMuZW5hYmxlZCAmJgorICAgICAgICAg ICAgICAgIHNvdXJjZS0+Z2V0UmVhZENvbG9yQXR0YWNobWVudCgpICYmCisgICAgICAgICAgICAg ICAgc291cmNlLT5nZXRSZWFkQ29sb3JBdHRhY2htZW50KCktPnR5cGUoKSA9PSBHTF9SRU5ERVJC VUZGRVIpCisgICAgICAgICAgICB7CisgICAgICAgICAgICAgICAgQmxpdEdMICpibGl0dGVyID0g R2V0QmxpdEdMKGNvbnRleHQpOworICAgICAgICAgICAgICAgIEFOR0xFX1RSWShibGl0dGVyLT5i bGl0Q29sb3JCdWZmZXJXaXRoU2hhZGVyKAorICAgICAgICAgICAgICAgICAgICBjb250ZXh0LCBz b3VyY2UsIG1UZXh0dXJlSUQsIHRhcmdldCwgbGV2ZWwsIGNsaXBwZWRBcmVhLAorICAgICAgICAg ICAgICAgICAgICBnbDo6UmVjdGFuZ2xlKGNsaXBwZWRPZmZzZXQueCwgY2xpcHBlZE9mZnNldC55 LCBjbGlwcGVkQXJlYS53aWR0aCwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBj bGlwcGVkQXJlYS5oZWlnaHQpLAorICAgICAgICAgICAgICAgICAgICBHTF9ORUFSRVNUKSk7Cisg ICAgICAgICAgICB9CisgICAgICAgICAgICBlbHNlCisgICAgICAgICAgICB7CisgICAgICAgICAg ICAgICAgQU5HTEVfR0xfVFJZKGNvbnRleHQsIGZ1bmN0aW9ucy0+Y29weVRleFN1YkltYWdlMkQo CisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBUb0dMZW51bSh0YXJn ZXQpLCBzdGF0aWNfY2FzdDxHTGludD4obGV2ZWwpLAorICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgY2xpcHBlZE9mZnNldC54LCBjbGlwcGVkT2Zmc2V0LnksIGNsaXBw ZWRBcmVhLngsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBjbGlw cGVkQXJlYS55LCBjbGlwcGVkQXJlYS53aWR0aCwgY2xpcHBlZEFyZWEuaGVpZ2h0KSk7CisgICAg ICAgICAgICB9CiAgICAgICAgIH0KICAgICAgICAgZWxzZQogICAgICAgICB7CmRpZmYgLS1naXQg YS9Tb3VyY2UvVGhpcmRQYXJ0eS9BTkdMRS9zcmMvbGliQU5HTEUvcmVuZGVyZXIvZ2wvcmVuZGVy ZXJnbF91dGlscy5jcHAgYi9Tb3VyY2UvVGhpcmRQYXJ0eS9BTkdMRS9zcmMvbGliQU5HTEUvcmVu ZGVyZXIvZ2wvcmVuZGVyZXJnbF91dGlscy5jcHAKaW5kZXggYTE0ZTU0MjQ2ZmExMGQ5ODQ1Nzhh NmRlYmM5M2M5NTRiNzg0ODZiMy4uNjNhY2EyYjI3ZGFiYTRiMzY5ZTg5YjcyNzFmYTRjNDg0NWU4 YTAzZiAxMDA2NDQKLS0tIGEvU291cmNlL1RoaXJkUGFydHkvQU5HTEUvc3JjL2xpYkFOR0xFL3Jl bmRlcmVyL2dsL3JlbmRlcmVyZ2xfdXRpbHMuY3BwCisrKyBiL1NvdXJjZS9UaGlyZFBhcnR5L0FO R0xFL3NyYy9saWJBTkdMRS9yZW5kZXJlci9nbC9yZW5kZXJlcmdsX3V0aWxzLmNwcApAQCAtMTY4 Myw2ICsxNjgzLDE0IEBAIHZvaWQgSW5pdGlhbGl6ZUZlYXR1cmVzKGNvbnN0IEZ1bmN0aW9uc0dM ICpmdW5jdGlvbnMsIGFuZ2xlOjpGZWF0dXJlc0dMICpmZWF0dXJlCiAgICAgQU5HTEVfRkVBVFVS RV9DT05ESVRJT04oCiAgICAgICAgIGZlYXR1cmVzLCBkaXNhYmxlU2VtYXBob3JlRmQsCiAgICAg ICAgIElzTGludXgoKSAmJiBpc0FNRCAmJiBpc01lc2EgJiYgbWVzYVZlcnNpb24gPCAoc3RkOjph cnJheTxpbnQsIDM+ezE5LCAzLCA1fSkpOworCisgICAgLy8gYW5nbGVidWcuY29tLzQ2NzQKKyAg ICAvLyBUaGUgKHJlZHVuZGFudCkgZXhwbGljaXQgZXhjbHVzaW9uIG9mIFdpbmRvd3MgQU1EIGlz IGJlY2F1c2UgdGhlIHdvcmthcm91bmQgZmFpbHMKKyAgICAvLyBUZXh0dXJlMkRSR1Rlc3QuVGV4 dHVyZVJHVU5vcm1UZXN0IG9uIHRoYXQgcGxhdGZvcm0sIGFuZCB0aGUgdGVzdCBpcyBza2lwcGVk LiBJZgorICAgIC8vIHlvdSdkIGxpa2UgdG8gZW5hYmxlIHRoZSB3b3JrYXJvdW5kIG9uIFdpbmRv d3MgQU1ELCBwbGVhc2UgZml4IHRoZSB0ZXN0IGZpcnN0LgorICAgIEFOR0xFX0ZFQVRVUkVfQ09O RElUSU9OKAorICAgICAgICBmZWF0dXJlcywgZW11bGF0ZUNvcHlUZXhJbWFnZTJERnJvbVJlbmRl cmJ1ZmZlcnMsCisgICAgICAgIElzQXBwbGUoKSAmJiBmdW5jdGlvbnMtPnN0YW5kYXJkID09IFNU QU5EQVJEX0dMX0VTICYmICEoaXNBTUQgJiYgSXNXaW5kb3dzKCkpKTsKIH0KIAogdm9pZCBJbml0 aWFsaXplRnJvbnRlbmRGZWF0dXJlcyhjb25zdCBGdW5jdGlvbnNHTCAqZnVuY3Rpb25zLCBhbmds ZTo6RnJvbnRlbmRGZWF0dXJlcyAqZmVhdHVyZXMpCmRpZmYgLS1naXQgYS9Tb3VyY2UvVGhpcmRQ YXJ0eS9BTkdMRS9zcmMvdGVzdHMvZ2xfdGVzdHMvQ29weVRleEltYWdlVGVzdC5jcHAgYi9Tb3Vy Y2UvVGhpcmRQYXJ0eS9BTkdMRS9zcmMvdGVzdHMvZ2xfdGVzdHMvQ29weVRleEltYWdlVGVzdC5j cHAKaW5kZXggZWRiYTRlNjU1MzFiYjY3MzEwOWJmOGQ2MDI3MWYwZWY5MTJlNGE1Zi4uYzM3MDkx NmZiNjQwMTI3MzAxOTJhOTdkMTQwMzNkYjk3MGIxYjM3YiAxMDA2NDQKLS0tIGEvU291cmNlL1Ro aXJkUGFydHkvQU5HTEUvc3JjL3Rlc3RzL2dsX3Rlc3RzL0NvcHlUZXhJbWFnZVRlc3QuY3BwCisr KyBiL1NvdXJjZS9UaGlyZFBhcnR5L0FOR0xFL3NyYy90ZXN0cy9nbF90ZXN0cy9Db3B5VGV4SW1h Z2VUZXN0LmNwcApAQCAtODU4LDcgKzg1OCwxMiBAQCBBTkdMRV9JTlNUQU5USUFURV9URVNUKENv cHlUZXhJbWFnZVRlc3QsCiAgICAgICAgICAgICAgICAgICAgICAgIEVTMl9PUEVOR0woKSwKICAg ICAgICAgICAgICAgICAgICAgICAgRVMyX09QRU5HTEVTKCksCiAgICAgICAgICAgICAgICAgICAg ICAgIEVTMl9WVUxLQU4oKSwKLSAgICAgICAgICAgICAgICAgICAgICAgRVMzX1ZVTEtBTigpKTsK LQotQU5HTEVfSU5TVEFOVElBVEVfVEVTVF9FUzMoQ29weVRleEltYWdlVGVzdEVTMyk7CisgICAg ICAgICAgICAgICAgICAgICAgIEVTM19WVUxLQU4oKSwKKyAgICAgICAgICAgICAgICAgICAgICAg V2l0aEVtdWxhdGVDb3B5VGV4SW1hZ2UyREZyb21SZW5kZXJidWZmZXJzKEVTMl9PUEVOR0woKSks CisgICAgICAgICAgICAgICAgICAgICAgIFdpdGhFbXVsYXRlQ29weVRleEltYWdlMkRGcm9tUmVu ZGVyYnVmZmVycyhFUzJfT1BFTkdMRVMoKSkpOworCitBTkdMRV9JTlNUQU5USUFURV9URVNUKENv cHlUZXhJbWFnZVRlc3RFUzMsCisgICAgICAgICAgICAgICAgICAgICAgIEFOR0xFX0FMTF9URVNU X1BMQVRGT1JNU19FUzMsCisgICAgICAgICAgICAgICAgICAgICAgIFdpdGhFbXVsYXRlQ29weVRl eEltYWdlMkRGcm9tUmVuZGVyYnVmZmVycyhFUzNfT1BFTkdMKCkpLAorICAgICAgICAgICAgICAg ICAgICAgICBXaXRoRW11bGF0ZUNvcHlUZXhJbWFnZTJERnJvbVJlbmRlcmJ1ZmZlcnMoRVMzX09Q RU5HTEVTKCkpKTsKIH0gIC8vIG5hbWVzcGFjZSBhbmdsZQpkaWZmIC0tZ2l0IGEvU291cmNlL1Ro aXJkUGFydHkvQU5HTEUvc3JjL3Rlc3RzL2dsX3Rlc3RzL1RleHR1cmVUZXN0LmNwcCBiL1NvdXJj ZS9UaGlyZFBhcnR5L0FOR0xFL3NyYy90ZXN0cy9nbF90ZXN0cy9UZXh0dXJlVGVzdC5jcHAKaW5k ZXggZTQ1MDFhZDA1MWRhOTJjN2I5MjAxMTEwYzQyYjIzNTQxZjYxMTU1NS4uYzNhMzk2NmE1YzQ5 NDdiYjBjMTFlOWQyZjNkYTJkNDk2YWU3ZWJhZCAxMDA2NDQKLS0tIGEvU291cmNlL1RoaXJkUGFy dHkvQU5HTEUvc3JjL3Rlc3RzL2dsX3Rlc3RzL1RleHR1cmVUZXN0LmNwcAorKysgYi9Tb3VyY2Uv VGhpcmRQYXJ0eS9BTkdMRS9zcmMvdGVzdHMvZ2xfdGVzdHMvVGV4dHVyZVRlc3QuY3BwCkBAIC00 NTIyLDYgKzQ1MjIsMTAgQEAgY2xhc3MgVGV4dHVyZTJEUkdUZXN0IDogcHVibGljIFRleHR1cmUy RFRlc3QKIFRFU1RfUChUZXh0dXJlMkRSR1Rlc3QsIFRleHR1cmVSR1VOb3JtVGVzdCkKIHsKICAg ICBBTkdMRV9TS0lQX1RFU1RfSUYoIUlzR0xFeHRlbnNpb25FbmFibGVkKCJHTF9FWFRfdGV4dHVy ZV9yZyIpKTsKKyAgICAvLyBUaGlzIHdvcmthcm91bmQgY2F1c2VzIGEgR0wgZXJyb3Igb24gV2lu ZG93cyBBTUQsIHdoaWNoIGlzIGxpa2VseSBhIGRyaXZlciBidWcuCisgICAgLy8gVGhlIHdvcmth cm91bmQgaXMgbm90IGludGVuZGVkIHRvIGJlIGVuYWJsZWQgaW4gdGhpcyBjb25maWd1cmF0aW9u IHNvIHNraXAgaXQuCisgICAgQU5HTEVfU0tJUF9URVNUX0lGKEdldFBhcmFtKCkuZWdsUGFyYW1l dGVycy5lbXVsYXRlQ29weVRleEltYWdlMkRGcm9tUmVuZGVyYnVmZmVycyAmJgorICAgICAgICAg ICAgICAgICAgICAgICBJc1dpbmRvd3MoKSAmJiBJc0FNRCgpKTsKIAogICAgIEdMdWJ5dGUgcGl4 ZWxWYWx1ZSAgPSAweGFiOwogICAgIEdMdWJ5dGUgaW1hZ2VEYXRhW10gPSB7cGl4ZWxWYWx1ZSwg cGl4ZWxWYWx1ZX07CkBAIC02MDg1LDcgKzYwODksMTMgQEAgVEVTVF9QKFBCT0NvbXByZXNzZWRU ZXh0dXJlVGVzdCwgUEJPQ29tcHJlc3NlZFN1YkltYWdlKQogCiAvLyBVc2UgdGhpcyB0byBzZWxl Y3Qgd2hpY2ggY29uZmlndXJhdGlvbnMgKGUuZy4gd2hpY2ggcmVuZGVyZXIsIHdoaWNoIEdMRVMg bWFqb3IgdmVyc2lvbikgdGhlc2UKIC8vIHRlc3RzIHNob3VsZCBiZSBydW4gYWdhaW5zdC4KLUFO R0xFX0lOU1RBTlRJQVRFX1RFU1RfRVMyKFRleHR1cmUyRFRlc3QpOworI2RlZmluZSBFUzJfRU1V TEFURV9DT1BZX1RFWF9JTUFHRSgpICAgICAgICAgICAgICAgICAgICAgICAgICBcCisgICAgV2l0 aEVtdWxhdGVDb3B5VGV4SW1hZ2UyREZyb21SZW5kZXJidWZmZXJzKEVTMl9PUEVOR0woKSksIFwK KyAgICAgICAgV2l0aEVtdWxhdGVDb3B5VGV4SW1hZ2UyREZyb21SZW5kZXJidWZmZXJzKEVTMl9P UEVOR0xFUygpKQorI2RlZmluZSBFUzNfRU1VTEFURV9DT1BZX1RFWF9JTUFHRSgpICAgICAgICAg ICAgICAgICAgICAgICAgICBcCisgICAgV2l0aEVtdWxhdGVDb3B5VGV4SW1hZ2UyREZyb21SZW5k ZXJidWZmZXJzKEVTM19PUEVOR0woKSksIFwKKyAgICAgICAgV2l0aEVtdWxhdGVDb3B5VGV4SW1h Z2UyREZyb21SZW5kZXJidWZmZXJzKEVTM19PUEVOR0xFUygpKQorQU5HTEVfSU5TVEFOVElBVEVf VEVTVChUZXh0dXJlMkRUZXN0LCBBTkdMRV9BTExfVEVTVF9QTEFURk9STVNfRVMyLCBFUzJfRU1V TEFURV9DT1BZX1RFWF9JTUFHRSgpKTsKIEFOR0xFX0lOU1RBTlRJQVRFX1RFU1RfRVMyKFRleHR1 cmVDdWJlVGVzdCk7CiBBTkdMRV9JTlNUQU5USUFURV9URVNUX0VTMihUZXh0dXJlMkRUZXN0V2l0 aERyYXdTY2FsZSk7CiBBTkdMRV9JTlNUQU5USUFURV9URVNUX0VTMihTYW1wbGVyMkRBc0Z1bmN0 aW9uUGFyYW1ldGVyVGVzdCk7CkBAIC02MTEwLDcgKzYxMjAsMTEgQEAgQU5HTEVfSU5TVEFOVElB VEVfVEVTVF9FUzMoVGV4dHVyZUJvcmRlckNsYW1wVGVzdEVTMyk7CiBBTkdMRV9JTlNUQU5USUFU RV9URVNUX0VTMyhUZXh0dXJlQm9yZGVyQ2xhbXBJbnRlZ2VyVGVzdEVTMyk7CiBBTkdMRV9JTlNU QU5USUFURV9URVNUX0VTMihUZXh0dXJlTGltaXRzVGVzdCk7CiBBTkdMRV9JTlNUQU5USUFURV9U RVNUX0VTMyhUZXh0dXJlMkROb3JtMTZUZXN0RVMzKTsKLUFOR0xFX0lOU1RBTlRJQVRFX1RFU1Rf RVMyX0FORF9FUzMoVGV4dHVyZTJEUkdUZXN0KTsKK0FOR0xFX0lOU1RBTlRJQVRFX1RFU1QoVGV4 dHVyZTJEUkdUZXN0LAorICAgICAgICAgICAgICAgICAgICAgICBBTkdMRV9BTExfVEVTVF9QTEFU Rk9STVNfRVMyLAorICAgICAgICAgICAgICAgICAgICAgICBBTkdMRV9BTExfVEVTVF9QTEFURk9S TVNfRVMzLAorICAgICAgICAgICAgICAgICAgICAgICBFUzJfRU1VTEFURV9DT1BZX1RFWF9JTUFH RSgpLAorICAgICAgICAgICAgICAgICAgICAgICBFUzNfRU1VTEFURV9DT1BZX1RFWF9JTUFHRSgp KTsKIEFOR0xFX0lOU1RBTlRJQVRFX1RFU1RfRVMzKFRleHR1cmUyREZsb2F0VGVzdEVTMyk7CiBB TkdMRV9JTlNUQU5USUFURV9URVNUX0VTMihUZXh0dXJlMkRGbG9hdFRlc3RFUzIpOwogQU5HTEVf SU5TVEFOVElBVEVfVEVTVF9FUzMoVGV4dHVyZUN1YmVUZXN0RVMzKTsKZGlmZiAtLWdpdCBhL1Nv dXJjZS9UaGlyZFBhcnR5L0FOR0xFL3NyYy90ZXN0cy90ZXN0X3V0aWxzL2FuZ2xlX3Rlc3RfY29u Zmlncy5jcHAgYi9Tb3VyY2UvVGhpcmRQYXJ0eS9BTkdMRS9zcmMvdGVzdHMvdGVzdF91dGlscy9h bmdsZV90ZXN0X2NvbmZpZ3MuY3BwCmluZGV4IGIwNGVhMTczZmNhMTQzZjY4ZjdmNmFkZmU4Yzg3 OWYzODc0Y2Y5NjkuLjZkM2FiNTE1YTM2OTk5ZThhNjg1OGE5MTU5ZGQ1YjYyZjFhMzZkNGQgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9UaGlyZFBhcnR5L0FOR0xFL3NyYy90ZXN0cy90ZXN0X3V0aWxzL2Fu Z2xlX3Rlc3RfY29uZmlncy5jcHAKKysrIGIvU291cmNlL1RoaXJkUGFydHkvQU5HTEUvc3JjL3Rl c3RzL3Rlc3RfdXRpbHMvYW5nbGVfdGVzdF9jb25maWdzLmNwcApAQCAtMjA0LDYgKzIwNCwxMSBA QCBzdGQ6Om9zdHJlYW0gJm9wZXJhdG9yPDwoc3RkOjpvc3RyZWFtICZzdHJlYW0sIGNvbnN0IFBs YXRmb3JtUGFyYW1ldGVycyAmcHApCiAgICAgICAgIHN0cmVhbSA8PCAiX0FsbG9jYXRlTm9uWmVy b01lbW9yeSI7CiAgICAgfQogCisgICAgaWYgKHBwLmVnbFBhcmFtZXRlcnMuZW11bGF0ZUNvcHlU ZXhJbWFnZTJERnJvbVJlbmRlcmJ1ZmZlcnMgPT0gRUdMX1RSVUUpCisgICAgeworICAgICAgICBz dHJlYW0gPDwgIl9FbXVsYXRlQ29weVRleEltYWdlMkRGcm9tUmVuZGVyYnVmZmVycyI7CisgICAg fQorCiAgICAgcmV0dXJuIHN0cmVhbTsKIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1RoaXJkUGFy dHkvQU5HTEUvc3JjL3Rlc3RzL3Rlc3RfdXRpbHMvYW5nbGVfdGVzdF9jb25maWdzLmggYi9Tb3Vy Y2UvVGhpcmRQYXJ0eS9BTkdMRS9zcmMvdGVzdHMvdGVzdF91dGlscy9hbmdsZV90ZXN0X2NvbmZp Z3MuaAppbmRleCA1Zjc3MTM4OTY3YjExNDAxYTg4NjYwODNlZjQ5MmIxNTEwYTNhNzIzLi5mNjc5 ZTRhYThhNTkwMjc1ODZkMGE0YzE4Y2IzYjhlY2JjNTNhNDYyIDEwMDY0NAotLS0gYS9Tb3VyY2Uv VGhpcmRQYXJ0eS9BTkdMRS9zcmMvdGVzdHMvdGVzdF91dGlscy9hbmdsZV90ZXN0X2NvbmZpZ3Mu aAorKysgYi9Tb3VyY2UvVGhpcmRQYXJ0eS9BTkdMRS9zcmMvdGVzdHMvdGVzdF91dGlscy9hbmds ZV90ZXN0X2NvbmZpZ3MuaApAQCAtMjI1LDYgKzIyNSwxNCBAQCBpbmxpbmUgUGxhdGZvcm1QYXJh bWV0ZXJzIFdpdGhBbGxvY2F0ZU5vblplcm9NZW1vcnkoY29uc3QgUGxhdGZvcm1QYXJhbWV0ZXJz ICZwYQogICAgIHJldHVybiBhbGxvY2F0ZU5vblplcm87CiB9CiAKK2lubGluZSBQbGF0Zm9ybVBh cmFtZXRlcnMgV2l0aEVtdWxhdGVDb3B5VGV4SW1hZ2UyREZyb21SZW5kZXJidWZmZXJzKAorICAg IGNvbnN0IFBsYXRmb3JtUGFyYW1ldGVycyAmcGFyYW1zKQoreworICAgIFBsYXRmb3JtUGFyYW1l dGVycyBwICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICA9IHBhcmFtczsKKyAgICBw LmVnbFBhcmFtZXRlcnMuZW11bGF0ZUNvcHlUZXhJbWFnZTJERnJvbVJlbmRlcmJ1ZmZlcnMgPSBF R0xfVFJVRTsKKyAgICByZXR1cm4gcDsKK30KKwogaW5saW5lIFBsYXRmb3JtUGFyYW1ldGVycyBX aXRoUm9idXN0bmVzcyhjb25zdCBQbGF0Zm9ybVBhcmFtZXRlcnMgJnBhcmFtcykKIHsKICAgICBQ bGF0Zm9ybVBhcmFtZXRlcnMgd2l0aFJvYnVzdG5lc3MgICAgICAgPSBwYXJhbXM7CmRpZmYgLS1n aXQgYS9Tb3VyY2UvVGhpcmRQYXJ0eS9BTkdMRS91dGlsL0VHTFBsYXRmb3JtUGFyYW1ldGVycy5o IGIvU291cmNlL1RoaXJkUGFydHkvQU5HTEUvdXRpbC9FR0xQbGF0Zm9ybVBhcmFtZXRlcnMuaApp bmRleCBmNTUzNjY3NDhiODFmMzFkMzUxNWUzYzI2YjFiODk5ODZlZTYwY2ZhLi43OGRhNTFjY2Qz MDJmMzNjNmE2NTQ4ZmRjOGJmZmU4YzE0ZjBlODYyIDEwMDY0NAotLS0gYS9Tb3VyY2UvVGhpcmRQ YXJ0eS9BTkdMRS91dGlsL0VHTFBsYXRmb3JtUGFyYW1ldGVycy5oCisrKyBiL1NvdXJjZS9UaGly ZFBhcnR5L0FOR0xFL3V0aWwvRUdMUGxhdGZvcm1QYXJhbWV0ZXJzLmgKQEAgLTQ5LDIwICs0OSwy MiBAQCBzdHJ1Y3QgRUdMUGxhdGZvcm1QYXJhbWV0ZXJzCiAgICAgewogICAgICAgICByZXR1cm4g c3RkOjp0aWUocmVuZGVyZXIsIG1ham9yVmVyc2lvbiwgbWlub3JWZXJzaW9uLCBkZXZpY2VUeXBl LCBwcmVzZW50UGF0aCwKICAgICAgICAgICAgICAgICAgICAgICAgIGRlYnVnTGF5ZXJzRW5hYmxl ZCwgY29udGV4dFZpcnR1YWxpemF0aW9uLCB0cmFuc2Zvcm1GZWVkYmFja0ZlYXR1cmUsCi0gICAg ICAgICAgICAgICAgICAgICAgICBhbGxvY2F0ZU5vblplcm9NZW1vcnlGZWF0dXJlLCBwbGF0Zm9y bU1ldGhvZHMsIHJvYnVzdG5lc3MpOworICAgICAgICAgICAgICAgICAgICAgICAgYWxsb2NhdGVO b25aZXJvTWVtb3J5RmVhdHVyZSwgZW11bGF0ZUNvcHlUZXhJbWFnZTJERnJvbVJlbmRlcmJ1ZmZl cnMsCisgICAgICAgICAgICAgICAgICAgICAgICBwbGF0Zm9ybU1ldGhvZHMsIHJvYnVzdG5lc3Mp OwogICAgIH0KIAotICAgIEVHTGludCByZW5kZXJlciAgICAgICAgICAgICAgICAgICAgICAgICA9 IEVHTF9QTEFURk9STV9BTkdMRV9UWVBFX0RFRkFVTFRfQU5HTEU7Ci0gICAgRUdMaW50IG1ham9y VmVyc2lvbiAgICAgICAgICAgICAgICAgICAgID0gRUdMX0RPTlRfQ0FSRTsKLSAgICBFR0xpbnQg bWlub3JWZXJzaW9uICAgICAgICAgICAgICAgICAgICAgPSBFR0xfRE9OVF9DQVJFOwotICAgIEVH TGludCBkZXZpY2VUeXBlICAgICAgICAgICAgICAgICAgICAgICA9IEVHTF9QTEFURk9STV9BTkdM RV9ERVZJQ0VfVFlQRV9IQVJEV0FSRV9BTkdMRTsKLSAgICBFR0xpbnQgcHJlc2VudFBhdGggICAg ICAgICAgICAgICAgICAgICAgPSBFR0xfRE9OVF9DQVJFOwotICAgIEVHTGludCBkZWJ1Z0xheWVy c0VuYWJsZWQgICAgICAgICAgICAgICA9IEVHTF9ET05UX0NBUkU7Ci0gICAgRUdMaW50IGNvbnRl eHRWaXJ0dWFsaXphdGlvbiAgICAgICAgICAgID0gRUdMX0RPTlRfQ0FSRTsKLSAgICBFR0xpbnQg cm9idXN0bmVzcyAgICAgICAgICAgICAgICAgICAgICAgPSBFR0xfRE9OVF9DQVJFOwotICAgIEVH TGludCB0cmFuc2Zvcm1GZWVkYmFja0ZlYXR1cmUgICAgICAgICA9IEVHTF9ET05UX0NBUkU7Ci0g ICAgRUdMaW50IGFsbG9jYXRlTm9uWmVyb01lbW9yeUZlYXR1cmUgICAgID0gRUdMX0RPTlRfQ0FS RTsKLSAgICBhbmdsZTo6UGxhdGZvcm1NZXRob2RzICpwbGF0Zm9ybU1ldGhvZHMgPSBudWxscHRy OworICAgIEVHTGludCByZW5kZXJlciAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICA9IEVH TF9QTEFURk9STV9BTkdMRV9UWVBFX0RFRkFVTFRfQU5HTEU7CisgICAgRUdMaW50IG1ham9yVmVy c2lvbiAgICAgICAgICAgICAgICAgICAgICAgICAgID0gRUdMX0RPTlRfQ0FSRTsKKyAgICBFR0xp bnQgbWlub3JWZXJzaW9uICAgICAgICAgICAgICAgICAgICAgICAgICAgPSBFR0xfRE9OVF9DQVJF OworICAgIEVHTGludCBkZXZpY2VUeXBlICAgICAgICAgICAgICAgICAgICAgICAgICAgICA9IEVH TF9QTEFURk9STV9BTkdMRV9ERVZJQ0VfVFlQRV9IQVJEV0FSRV9BTkdMRTsKKyAgICBFR0xpbnQg cHJlc2VudFBhdGggICAgICAgICAgICAgICAgICAgICAgICAgICAgPSBFR0xfRE9OVF9DQVJFOwor ICAgIEVHTGludCBkZWJ1Z0xheWVyc0VuYWJsZWQgICAgICAgICAgICAgICAgICAgICA9IEVHTF9E T05UX0NBUkU7CisgICAgRUdMaW50IGNvbnRleHRWaXJ0dWFsaXphdGlvbiAgICAgICAgICAgICAg ICAgID0gRUdMX0RPTlRfQ0FSRTsKKyAgICBFR0xpbnQgcm9idXN0bmVzcyAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgPSBFR0xfRE9OVF9DQVJFOworICAgIEVHTGludCB0cmFuc2Zvcm1GZWVk YmFja0ZlYXR1cmUgICAgICAgICAgICAgICA9IEVHTF9ET05UX0NBUkU7CisgICAgRUdMaW50IGFs bG9jYXRlTm9uWmVyb01lbW9yeUZlYXR1cmUgICAgICAgICAgID0gRUdMX0RPTlRfQ0FSRTsKKyAg ICBFR0xpbnQgZW11bGF0ZUNvcHlUZXhJbWFnZTJERnJvbVJlbmRlcmJ1ZmZlcnMgPSBFR0xfRE9O VF9DQVJFOworICAgIGFuZ2xlOjpQbGF0Zm9ybU1ldGhvZHMgKnBsYXRmb3JtTWV0aG9kcyAgICAg ICA9IG51bGxwdHI7CiB9OwogCiBpbmxpbmUgYm9vbCBvcGVyYXRvcjwoY29uc3QgRUdMUGxhdGZv cm1QYXJhbWV0ZXJzICZhLCBjb25zdCBFR0xQbGF0Zm9ybVBhcmFtZXRlcnMgJmIpCmRpZmYgLS1n aXQgYS9Tb3VyY2UvVGhpcmRQYXJ0eS9BTkdMRS91dGlsL0VHTFdpbmRvdy5jcHAgYi9Tb3VyY2Uv VGhpcmRQYXJ0eS9BTkdMRS91dGlsL0VHTFdpbmRvdy5jcHAKaW5kZXggZGNiYjA0OGIzZjZlMDU4 N2VmMjhhODg3OTNlMTFiODFmMzg1ZDIzYi4uOWIzNTNkOWRkZjQ2MzliODA3ZDEwNGIwNjRiMTI5 YjgwOWVjYWJjNSAxMDA2NDQKLS0tIGEvU291cmNlL1RoaXJkUGFydHkvQU5HTEUvdXRpbC9FR0xX aW5kb3cuY3BwCisrKyBiL1NvdXJjZS9UaGlyZFBhcnR5L0FOR0xFL3V0aWwvRUdMV2luZG93LmNw cApAQCAtMTg4LDYgKzE4OCwxMSBAQCBib29sIEVHTFdpbmRvdzo6aW5pdGlhbGl6ZURpc3BsYXko T1NXaW5kb3cgKm9zV2luZG93LAogICAgICAgICBkaXNhYmxlZEZlYXR1cmVPdmVycmlkZXMucHVz aF9iYWNrKCJhbGxvY2F0ZV9ub25femVyb19tZW1vcnkiKTsKICAgICB9CiAKKyAgICBpZiAocGFy YW1zLmVtdWxhdGVDb3B5VGV4SW1hZ2UyREZyb21SZW5kZXJidWZmZXJzID09IEVHTF9UUlVFKQor ICAgIHsKKyAgICAgICAgZW5hYmxlZEZlYXR1cmVPdmVycmlkZXMucHVzaF9iYWNrKCJlbXVsYXRl X2NvcHl0ZXhpbWFnZTJkX2Zyb21fcmVuZGVyYnVmZmVycyIpOworICAgIH0KKwogICAgIGlmICgh ZGlzYWJsZWRGZWF0dXJlT3ZlcnJpZGVzLmVtcHR5KCkpCiAgICAgewogICAgICAgICBpZiAoc3Ry c3RyKGV4dGVuc2lvblN0cmluZywgIkVHTF9BTkdMRV9mZWF0dXJlX2NvbnRyb2wiKSA9PSBudWxs cHRyKQo= 401102 2020-06-04 17:22:38 -0700 2020-06-04 17:40:06 -0700 Patch bug-212249-20200604172237.patch text/plain 21383 jdarpinian U3VidmVyc2lvbiBSZXZpc2lvbjogMjYyNTg5CmRpZmYgLS1naXQgYS9Tb3VyY2UvVGhpcmRQYXJ0 eS9BTkdMRS9DaGFuZ2VMb2cgYi9Tb3VyY2UvVGhpcmRQYXJ0eS9BTkdMRS9DaGFuZ2VMb2cKaW5k ZXggZWZlZjM0MTZmOGUyMzc1NzY1YTExMGIzOWZjZGQ3NDg5ZWIxMDg0OC4uOTcxNWMyMTdhODFk OWVmYmVhNmRmYjAxNWQzY2Y1YTk1Yzg3MmFjNyAxMDA2NDQKLS0tIGEvU291cmNlL1RoaXJkUGFy dHkvQU5HTEUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9UaGlyZFBhcnR5L0FOR0xFL0NoYW5nZUxv ZwpAQCAtMSwzICsxLDMzIEBACisyMDIwLTA2LTA0ICBKYW1lcyBEYXJwaW5pYW4gIDxqZGFycGlu aWFuQGNocm9taXVtLm9yZz4KKworICAgICAgICBbQU5HTEUgLSBpT1NdIGZhc3QvY2FudmFzL3dl YmdsL3VuaW5pdGlhbGl6ZWQtdGVzdC5odG1sIGlzIHN0aWxsIGZhaWxpbmcKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIxMjI0OQorCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIGNvcHlUZXhJbWFnZTJEIGlzIGJy b2tlbiBpbiBzb21lIHdheSBvbiBpT1MuIFdvcmsgYXJvdW5kIGl0IGJ5IHJlaW1wbGVtZW50aW5n CisgICAgICAgIGl0IHdpdGggQU5HTEUncyBCbGl0R0wgY2xhc3MuCisKKyAgICAgICAgKiBpbmNs dWRlL3BsYXRmb3JtL0ZlYXR1cmVzR0wuaDoKKyAgICAgICAgKiBzcmMvbGliQU5HTEUvcmVuZGVy ZXIvZ2wvQmxpdEdMLmNwcDoKKyAgICAgICAgKHJ4OjpCbGl0R0w6OmJsaXRDb2xvckJ1ZmZlcldp dGhTaGFkZXIpOgorICAgICAgICAqIHNyYy9saWJBTkdMRS9yZW5kZXJlci9nbC9CbGl0R0wuaDoK KyAgICAgICAgKiBzcmMvbGliQU5HTEUvcmVuZGVyZXIvZ2wvVGV4dHVyZUdMLmNwcDoKKyAgICAg ICAgKHJ4OjpUZXh0dXJlR0w6OmNvcHlJbWFnZSk6CisgICAgICAgIChyeDo6VGV4dHVyZUdMOjpj b3B5U3ViSW1hZ2UpOgorICAgICAgICAqIHNyYy9saWJBTkdMRS9yZW5kZXJlci9nbC9yZW5kZXJl cmdsX3V0aWxzLmNwcDoKKyAgICAgICAgKHJ4OjpuYXRpdmVnbF9nbDo6SW5pdGlhbGl6ZUZlYXR1 cmVzKToKKyAgICAgICAgKiBzcmMvdGVzdHMvZ2xfdGVzdHMvQ29weVRleEltYWdlVGVzdC5jcHA6 CisgICAgICAgICogc3JjL3Rlc3RzL2dsX3Rlc3RzL1RleHR1cmVUZXN0LmNwcDoKKyAgICAgICAg KiBzcmMvdGVzdHMvdGVzdF91dGlscy9hbmdsZV90ZXN0X2NvbmZpZ3MuY3BwOgorICAgICAgICAo YW5nbGU6Om9wZXJhdG9yPDwpOgorICAgICAgICAqIHNyYy90ZXN0cy90ZXN0X3V0aWxzL2FuZ2xl X3Rlc3RfY29uZmlncy5oOgorICAgICAgICAoYW5nbGU6OldpdGhFbXVsYXRlQ29weVRleEltYWdl MkRGcm9tUmVuZGVyYnVmZmVycyk6CisgICAgICAgICogdXRpbC9FR0xQbGF0Zm9ybVBhcmFtZXRl cnMuaDoKKyAgICAgICAgKEVHTFBsYXRmb3JtUGFyYW1ldGVyczo6dGllIGNvbnN0KToKKyAgICAg ICAgKiB1dGlsL0VHTFdpbmRvdy5jcHA6CisgICAgICAgIChFR0xXaW5kb3c6OmluaXRpYWxpemVE aXNwbGF5KToKKwogMjAyMC0wNi0wNCAgVGltIEhvcnRvbiAgPHRpbW90aHlfaG9ydG9uQGFwcGxl LmNvbT4KIAogICAgICAgICBXb3JrIGFyb3VuZCBicm9rZW4gc3lzdGVtIHZlcnNpb24gbWFjcm8K ZGlmZiAtLWdpdCBhL1NvdXJjZS9UaGlyZFBhcnR5L0FOR0xFL2luY2x1ZGUvcGxhdGZvcm0vRmVh dHVyZXNHTC5oIGIvU291cmNlL1RoaXJkUGFydHkvQU5HTEUvaW5jbHVkZS9wbGF0Zm9ybS9GZWF0 dXJlc0dMLmgKaW5kZXggNTc1NjAyOWZiNTM4ZmQwYTZmMGMzYjNhYTM5YjA1ZWJmN2UyZTRhNC4u NDExYzllNDM2MzlhZGMzZTE0ZjAzNjVlN2QzZWI2ODc1N2NiZGQ0ZCAxMDA2NDQKLS0tIGEvU291 cmNlL1RoaXJkUGFydHkvQU5HTEUvaW5jbHVkZS9wbGF0Zm9ybS9GZWF0dXJlc0dMLmgKKysrIGIv U291cmNlL1RoaXJkUGFydHkvQU5HTEUvaW5jbHVkZS9wbGF0Zm9ybS9GZWF0dXJlc0dMLmgKQEAg LTQ0Miw2ICs0NDIsMTEgQEAgc3RydWN0IEZlYXR1cmVzR0wgOiBGZWF0dXJlU2V0QmFzZQogICAg IEZlYXR1cmUgZGlzYWJsZVNlbWFwaG9yZUZkID0geyJkaXNhYmxlX3NlbWFwaG9yZV9mZCIsIEZl YXR1cmVDYXRlZ29yeTo6T3BlbkdMV29ya2Fyb3VuZHMsCiAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgIkRpc2FibGUgR0xfRVhUX3NlbWFwaG9yZV9mZCBleHRlbnNpb24iLCAmbWVt YmVycywKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAiaHR0cHM6Ly9jcmJ1Zy5j b20vMTA0NjQ2MiJ9OworCisgICAgRmVhdHVyZSBlbXVsYXRlQ29weVRleEltYWdlMkRGcm9tUmVu ZGVyYnVmZmVycyA9IHsKKyAgICAgICAgImVtdWxhdGVfY29weXRleGltYWdlMmRfZnJvbV9yZW5k ZXJidWZmZXJzIiwgRmVhdHVyZUNhdGVnb3J5OjpPcGVuR0xXb3JrYXJvdW5kcywKKyAgICAgICAg IkNvcHlUZXhJbWFnZTJEIHNwdXJpb3VzbHkgcmV0dXJucyBlcnJvcnMgb24gaU9TIHdoZW4gY29w eWluZyBmcm9tIHJlbmRlcmJ1ZmZlcnMuIiwKKyAgICAgICAgJm1lbWJlcnMsICJodHRwczovL2Fu Z2xlYnVnLmNvbS80Njc0In07CiB9OwogCiBpbmxpbmUgRmVhdHVyZXNHTDo6RmVhdHVyZXNHTCgp ICA9IGRlZmF1bHQ7CmRpZmYgLS1naXQgYS9Tb3VyY2UvVGhpcmRQYXJ0eS9BTkdMRS9zcmMvbGli QU5HTEUvcmVuZGVyZXIvZ2wvQmxpdEdMLmNwcCBiL1NvdXJjZS9UaGlyZFBhcnR5L0FOR0xFL3Ny Yy9saWJBTkdMRS9yZW5kZXJlci9nbC9CbGl0R0wuY3BwCmluZGV4IDc1NzE2OGNlYTNlZDJhNTEx ZmMyZWEyZDMxNzk3ODBiZWMwODQzOTUuLjFjY2ZmOWI5YWI2NjU4Nzc2ZWUyOTQ2NWY5ZjJhNDQw ZDJiYWQzYTYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9UaGlyZFBhcnR5L0FOR0xFL3NyYy9saWJBTkdM RS9yZW5kZXJlci9nbC9CbGl0R0wuY3BwCisrKyBiL1NvdXJjZS9UaGlyZFBhcnR5L0FOR0xFL3Ny Yy9saWJBTkdMRS9yZW5kZXJlci9nbC9CbGl0R0wuY3BwCkBAIC0zOTMsNiArMzkzLDMzIEBAIGFu Z2xlOjpSZXN1bHQgQmxpdEdMOjpjb3B5U3ViSW1hZ2VUb0xVTUFXb3JrYXJvdW5kVGV4dHVyZShj b25zdCBnbDo6Q29udGV4dCAqY29uCiAgICAgcmV0dXJuIGFuZ2xlOjpSZXN1bHQ6OkNvbnRpbnVl OwogfQogCithbmdsZTo6UmVzdWx0IEJsaXRHTDo6YmxpdENvbG9yQnVmZmVyV2l0aFNoYWRlcihj b25zdCBnbDo6Q29udGV4dCAqY29udGV4dCwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgIGNvbnN0IGdsOjpGcmFtZWJ1ZmZlciAqc291cmNlLAorICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgY29uc3QgR0x1aW50IGRl c3RUZXh0dXJlLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgY29uc3QgZ2w6OlRleHR1cmVUYXJnZXQgZGVzdFRhcmdldCwKKyAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGNvbnN0IHNpemVfdCBkZXN0TGV2ZWwsCisg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBjb25zdCBnbDo6 UmVjdGFuZ2xlICZzb3VyY2VBcmVhSW4sCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICBjb25zdCBnbDo6UmVjdGFuZ2xlICZkZXN0QXJlYUluLAorICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgR0xlbnVtIGZpbHRlcikK K3sKKyAgICBBTkdMRV9UUlkoaW5pdGlhbGl6ZVJlc291cmNlcyhjb250ZXh0KSk7CisgICAgbVN0 YXRlTWFuYWdlci0+YmluZEZyYW1lYnVmZmVyKEdMX0ZSQU1FQlVGRkVSLCBtU2NyYXRjaEZCTyk7 CisgICAgQU5HTEVfR0xfVFJZKGNvbnRleHQsIG1GdW5jdGlvbnMtPmZyYW1lYnVmZmVyVGV4dHVy ZTJEKEdMX0ZSQU1FQlVGRkVSLCBHTF9DT0xPUl9BVFRBQ0hNRU5UMCwKKyAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgVG9HTGVudW0oZGVz dFRhcmdldCksIGRlc3RUZXh0dXJlLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICBzdGF0aWNfY2FzdDxHTGludD4oZGVzdExldmVsKSkp OworICAgIEdMZW51bSBzdGF0dXMgPSBBTkdMRV9HTF9UUlkoY29udGV4dCwgbUZ1bmN0aW9ucy0+ Y2hlY2tGcmFtZWJ1ZmZlclN0YXR1cyhHTF9GUkFNRUJVRkZFUikpOworICAgIGlmIChzdGF0dXMg IT0gR0xfRlJBTUVCVUZGRVJfQ09NUExFVEUpCisgICAgeworICAgICAgICByZXR1cm4gYW5nbGU6 OlJlc3VsdDo6U3RvcDsKKyAgICB9CisgICAgYW5nbGU6OlJlc3VsdCByZXN1bHQgPSBibGl0Q29s b3JCdWZmZXJXaXRoU2hhZGVyKGNvbnRleHQsIHNvdXJjZSwgbVNjcmF0Y2hGQk8sIHNvdXJjZUFy ZWFJbiwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgZGVzdEFyZWFJbiwgZmlsdGVyKTsKKyAgICAvLyBVbmJpbmQgdGhlIHRleHR1cmUgZnJvbSB0 aGUgdGhlIHNjcmF0Y2ggZnJhbWVidWZmZXIuCisgICAgQU5HTEVfR0xfVFJZKGNvbnRleHQsIG1G dW5jdGlvbnMtPmZyYW1lYnVmZmVyUmVuZGVyYnVmZmVyKEdMX0ZSQU1FQlVGRkVSLCBHTF9DT0xP Ul9BVFRBQ0hNRU5UMCwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgR0xfUkVOREVSQlVGRkVSLCAwKSk7CisgICAgcmV0dXJuIHJl c3VsdDsKK30KKwogYW5nbGU6OlJlc3VsdCBCbGl0R0w6OmJsaXRDb2xvckJ1ZmZlcldpdGhTaGFk ZXIoY29uc3QgZ2w6OkNvbnRleHQgKmNvbnRleHQsCiAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICBjb25zdCBnbDo6RnJhbWVidWZmZXIgKnNvdXJjZSwKICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGNvbnN0IGdsOjpG cmFtZWJ1ZmZlciAqZGVzdCwKQEAgLTQwMCw2ICs0MjcsMTggQEAgYW5nbGU6OlJlc3VsdCBCbGl0 R0w6OmJsaXRDb2xvckJ1ZmZlcldpdGhTaGFkZXIoY29uc3QgZ2w6OkNvbnRleHQgKmNvbnRleHQs CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBjb25zdCBn bDo6UmVjdGFuZ2xlICZkZXN0QXJlYUluLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgR0xlbnVtIGZpbHRlciwKICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgIGJvb2wgd3JpdGVBbHBoYSkKK3sKKyAgICBjb25zdCBG cmFtZWJ1ZmZlckdMICpkZXN0R0wgPSBHZXRJbXBsQXM8RnJhbWVidWZmZXJHTD4oZGVzdCk7Cisg ICAgcmV0dXJuIGJsaXRDb2xvckJ1ZmZlcldpdGhTaGFkZXIoY29udGV4dCwgc291cmNlLCBkZXN0 R0wtPmdldEZyYW1lYnVmZmVySUQoKSwgc291cmNlQXJlYUluLAorICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgIGRlc3RBcmVhSW4sIGZpbHRlcik7Cit9CisKK2FuZ2xlOjpSZXN1 bHQgQmxpdEdMOjpibGl0Q29sb3JCdWZmZXJXaXRoU2hhZGVyKGNvbnN0IGdsOjpDb250ZXh0ICpj b250ZXh0LAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg Y29uc3QgZ2w6OkZyYW1lYnVmZmVyICpzb3VyY2UsCisgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICBjb25zdCBHTHVpbnQgZGVzdEZyYW1lYnVmZmVyLAorICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgY29uc3QgZ2w6OlJl Y3RhbmdsZSAmc291cmNlQXJlYUluLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgY29uc3QgZ2w6OlJlY3RhbmdsZSAmZGVzdEFyZWFJbiwKKyAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIEdMZW51bSBmaWx0ZXIpCiB7 CiAgICAgQU5HTEVfVFJZKGluaXRpYWxpemVSZXNvdXJjZXMoY29udGV4dCkpOwogCkBAIC01MDUs OCArNTQ0LDcgQEAgYW5nbGU6OlJlc3VsdCBCbGl0R0w6OmJsaXRDb2xvckJ1ZmZlcldpdGhTaGFk ZXIoY29uc3QgZ2w6OkNvbnRleHQgKmNvbnRleHQsCiAgICAgQU5HTEVfR0xfVFJZKGNvbnRleHQs IG1GdW5jdGlvbnMtPnVuaWZvcm0xaShibGl0UHJvZ3JhbS0+bXVsdGlwbHlBbHBoYUxvY2F0aW9u LCAwKSk7CiAgICAgQU5HTEVfR0xfVFJZKGNvbnRleHQsIG1GdW5jdGlvbnMtPnVuaWZvcm0xaShi bGl0UHJvZ3JhbS0+dW5NdWx0aXBseUFscGhhTG9jYXRpb24sIDApKTsKIAotICAgIGNvbnN0IEZy YW1lYnVmZmVyR0wgKmRlc3RHTCA9IEdldEltcGxBczxGcmFtZWJ1ZmZlckdMPihkZXN0KTsKLSAg ICBtU3RhdGVNYW5hZ2VyLT5iaW5kRnJhbWVidWZmZXIoR0xfRFJBV19GUkFNRUJVRkZFUiwgZGVz dEdMLT5nZXRGcmFtZWJ1ZmZlcklEKCkpOworICAgIG1TdGF0ZU1hbmFnZXItPmJpbmRGcmFtZWJ1 ZmZlcihHTF9EUkFXX0ZSQU1FQlVGRkVSLCBkZXN0RnJhbWVidWZmZXIpOwogCiAgICAgbVN0YXRl TWFuYWdlci0+YmluZFZlcnRleEFycmF5KG1WQU8sIDApOwogICAgIEFOR0xFX0dMX1RSWShjb250 ZXh0LCBtRnVuY3Rpb25zLT5kcmF3QXJyYXlzKEdMX1RSSUFOR0xFUywgMCwgMykpOwpkaWZmIC0t Z2l0IGEvU291cmNlL1RoaXJkUGFydHkvQU5HTEUvc3JjL2xpYkFOR0xFL3JlbmRlcmVyL2dsL0Js aXRHTC5oIGIvU291cmNlL1RoaXJkUGFydHkvQU5HTEUvc3JjL2xpYkFOR0xFL3JlbmRlcmVyL2ds L0JsaXRHTC5oCmluZGV4IGMxZmEzMjQ5ZjUwNmQ2OGJhMDMxNjJjYjEwNDY2MjU5NWFjM2Y1NTQu LjNmYjcyN2MwZGYzMWVjYjc2ZjVhZjQ4MzAzZDM0ZjJhYmM3YTExYmQgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9UaGlyZFBhcnR5L0FOR0xFL3NyYy9saWJBTkdMRS9yZW5kZXJlci9nbC9CbGl0R0wuaAor KysgYi9Tb3VyY2UvVGhpcmRQYXJ0eS9BTkdMRS9zcmMvbGliQU5HTEUvcmVuZGVyZXIvZ2wvQmxp dEdMLmgKQEAgLTcyLDYgKzcyLDIyIEBAIGNsYXNzIEJsaXRHTCA6IGFuZ2xlOjpOb25Db3B5YWJs ZQogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBHTGVudW0gZmls dGVyLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBib29sIHdy aXRlQWxwaGEpOwogCisgICAgYW5nbGU6OlJlc3VsdCBibGl0Q29sb3JCdWZmZXJXaXRoU2hhZGVy KGNvbnN0IGdsOjpDb250ZXh0ICpjb250ZXh0LAorICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICBjb25zdCBnbDo6RnJhbWVidWZmZXIgKnNvdXJjZSwKKyAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgY29uc3QgR0x1aW50IGRlc3RGcmFt ZWJ1ZmZlciwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgY29u c3QgZ2w6OlJlY3RhbmdsZSAmc291cmNlQXJlYSwKKyAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgY29uc3QgZ2w6OlJlY3RhbmdsZSAmZGVzdEFyZWEsCisgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIEdMZW51bSBmaWx0ZXIpOworCisg ICAgYW5nbGU6OlJlc3VsdCBibGl0Q29sb3JCdWZmZXJXaXRoU2hhZGVyKGNvbnN0IGdsOjpDb250 ZXh0ICpjb250ZXh0LAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICBjb25zdCBnbDo6RnJhbWVidWZmZXIgKnNvdXJjZSwKKyAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgY29uc3QgR0x1aW50IGRlc3RUZXh0dXJlLAorICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBjb25zdCBnbDo6VGV4dHVyZVRhcmdl dCBkZXN0VGFyZ2V0LAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICBjb25zdCBzaXplX3QgZGVzdExldmVsLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICBjb25zdCBnbDo6UmVjdGFuZ2xlICZzb3VyY2VBcmVhLAorICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBjb25zdCBnbDo6UmVjdGFuZ2xlICZk ZXN0QXJlYSwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgR0xl bnVtIGZpbHRlcik7CisKICAgICBhbmdsZTo6UmVzdWx0IGNvcHlTdWJUZXh0dXJlKGNvbnN0IGds OjpDb250ZXh0ICpjb250ZXh0LAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgVGV4 dHVyZUdMICpzb3VyY2UsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBzaXplX3Qg c291cmNlTGV2ZWwsCmRpZmYgLS1naXQgYS9Tb3VyY2UvVGhpcmRQYXJ0eS9BTkdMRS9zcmMvbGli QU5HTEUvcmVuZGVyZXIvZ2wvVGV4dHVyZUdMLmNwcCBiL1NvdXJjZS9UaGlyZFBhcnR5L0FOR0xF L3NyYy9saWJBTkdMRS9yZW5kZXJlci9nbC9UZXh0dXJlR0wuY3BwCmluZGV4IDY2YzRmZmNmNjg4 MGZiYTc1NTgyZDU1NDMyNTdmM2FlY2VlNDI5ZWMuLjI3YjQ4ODI2NmMzMzMzMDI5MGQ3NDlmNDUz NzFjY2M5ZjNmYzJiMDIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9UaGlyZFBhcnR5L0FOR0xFL3NyYy9s aWJBTkdMRS9yZW5kZXJlci9nbC9UZXh0dXJlR0wuY3BwCisrKyBiL1NvdXJjZS9UaGlyZFBhcnR5 L0FOR0xFL3NyYy9saWJBTkdMRS9yZW5kZXJlci9nbC9UZXh0dXJlR0wuY3BwCkBAIC03MTMsNyAr NzEzLDE3IEBAIGFuZ2xlOjpSZXN1bHQgVGV4dHVyZUdMOjpjb3B5SW1hZ2UoY29uc3QgZ2w6OkNv bnRleHQgKmNvbnRleHQsCiAgICAgICAgICAgICBBU1NFUlQobmF0aXZlZ2w6OlVzZVRleEltYWdl MkQoZ2V0VHlwZSgpKSk7CiAgICAgICAgICAgICBzdGF0ZU1hbmFnZXItPmJpbmRGcmFtZWJ1ZmZl cihHTF9SRUFEX0ZSQU1FQlVGRkVSLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgc291cmNlRnJhbWVidWZmZXJHTC0+Z2V0RnJhbWVidWZmZXJJRCgpKTsKLSAgICAg ICAgICAgIGlmIChyZXF1aXJlc0luaXRpYWxpemF0aW9uKQorICAgICAgICAgICAgaWYgKGZlYXR1 cmVzLmVtdWxhdGVDb3B5VGV4SW1hZ2UyREZyb21SZW5kZXJidWZmZXJzLmVuYWJsZWQgJiYgcmVh ZEJ1ZmZlciAmJgorICAgICAgICAgICAgICAgIHJlYWRCdWZmZXItPnR5cGUoKSA9PSBHTF9SRU5E RVJCVUZGRVIpCisgICAgICAgICAgICB7CisgICAgICAgICAgICAgICAgQmxpdEdMICpibGl0dGVy ID0gR2V0QmxpdEdMKGNvbnRleHQpOworICAgICAgICAgICAgICAgIEFOR0xFX1RSWShibGl0dGVy LT5ibGl0Q29sb3JCdWZmZXJXaXRoU2hhZGVyKAorICAgICAgICAgICAgICAgICAgICBjb250ZXh0 LCBzb3VyY2UsIG1UZXh0dXJlSUQsIHRhcmdldCwgbGV2ZWwsIGNsaXBwZWRBcmVhLAorICAgICAg ICAgICAgICAgICAgICBnbDo6UmVjdGFuZ2xlKGRlc3RPZmZzZXQueCwgZGVzdE9mZnNldC55LCBj bGlwcGVkQXJlYS53aWR0aCwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBjbGlw cGVkQXJlYS5oZWlnaHQpLAorICAgICAgICAgICAgICAgICAgICBHTF9ORUFSRVNUKSk7CisgICAg ICAgICAgICB9CisgICAgICAgICAgICBlbHNlIGlmIChyZXF1aXJlc0luaXRpYWxpemF0aW9uKQog ICAgICAgICAgICAgewogICAgICAgICAgICAgICAgIEFOR0xFX0dMX1RSWShjb250ZXh0LCBmdW5j dGlvbnMtPmNvcHlUZXhTdWJJbWFnZTJEKAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgVG9HTGVudW0odGFyZ2V0KSwgc3RhdGljX2Nhc3Q8R0xpbnQ+KGxldmVsKSwg ZGVzdE9mZnNldC54LApAQCAtNzgxLDEwICs3OTEsMjQgQEAgYW5nbGU6OlJlc3VsdCBUZXh0dXJl R0w6OmNvcHlTdWJJbWFnZShjb25zdCBnbDo6Q29udGV4dCAqY29udGV4dCwKICAgICAgICAgaWYg KG5hdGl2ZWdsOjpVc2VUZXhJbWFnZTJEKGdldFR5cGUoKSkpCiAgICAgICAgIHsKICAgICAgICAg ICAgIEFTU0VSVChjbGlwcGVkT2Zmc2V0LnogPT0gMCk7Ci0gICAgICAgICAgICBBTkdMRV9HTF9U UlkoY29udGV4dCwgZnVuY3Rpb25zLT5jb3B5VGV4U3ViSW1hZ2UyRCgKLSAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgVG9HTGVudW0odGFyZ2V0KSwgc3RhdGljX2Nhc3Q8R0xp bnQ+KGxldmVsKSwgY2xpcHBlZE9mZnNldC54LAotICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICBjbGlwcGVkT2Zmc2V0LnksIGNsaXBwZWRBcmVhLngsIGNsaXBwZWRBcmVhLnks Ci0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGNsaXBwZWRBcmVhLndpZHRo LCBjbGlwcGVkQXJlYS5oZWlnaHQpKTsKKyAgICAgICAgICAgIGlmIChmZWF0dXJlcy5lbXVsYXRl Q29weVRleEltYWdlMkRGcm9tUmVuZGVyYnVmZmVycy5lbmFibGVkICYmCisgICAgICAgICAgICAg ICAgc291cmNlLT5nZXRSZWFkQ29sb3JBdHRhY2htZW50KCkgJiYKKyAgICAgICAgICAgICAgICBz b3VyY2UtPmdldFJlYWRDb2xvckF0dGFjaG1lbnQoKS0+dHlwZSgpID09IEdMX1JFTkRFUkJVRkZF UikKKyAgICAgICAgICAgIHsKKyAgICAgICAgICAgICAgICBCbGl0R0wgKmJsaXR0ZXIgPSBHZXRC bGl0R0woY29udGV4dCk7CisgICAgICAgICAgICAgICAgQU5HTEVfVFJZKGJsaXR0ZXItPmJsaXRD b2xvckJ1ZmZlcldpdGhTaGFkZXIoCisgICAgICAgICAgICAgICAgICAgIGNvbnRleHQsIHNvdXJj ZSwgbVRleHR1cmVJRCwgdGFyZ2V0LCBsZXZlbCwgY2xpcHBlZEFyZWEsCisgICAgICAgICAgICAg ICAgICAgIGdsOjpSZWN0YW5nbGUoY2xpcHBlZE9mZnNldC54LCBjbGlwcGVkT2Zmc2V0LnksIGNs aXBwZWRBcmVhLndpZHRoLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGNsaXBw ZWRBcmVhLmhlaWdodCksCisgICAgICAgICAgICAgICAgICAgIEdMX05FQVJFU1QpKTsKKyAgICAg ICAgICAgIH0KKyAgICAgICAgICAgIGVsc2UKKyAgICAgICAgICAgIHsKKyAgICAgICAgICAgICAg ICBBTkdMRV9HTF9UUlkoY29udGV4dCwgZnVuY3Rpb25zLT5jb3B5VGV4U3ViSW1hZ2UyRCgKKyAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIFRvR0xlbnVtKHRhcmdldCks IHN0YXRpY19jYXN0PEdMaW50PihsZXZlbCksCisgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICBjbGlwcGVkT2Zmc2V0LngsIGNsaXBwZWRPZmZzZXQueSwgY2xpcHBlZEFy ZWEueCwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGNsaXBwZWRB cmVhLnksIGNsaXBwZWRBcmVhLndpZHRoLCBjbGlwcGVkQXJlYS5oZWlnaHQpKTsKKyAgICAgICAg ICAgIH0KICAgICAgICAgfQogICAgICAgICBlbHNlCiAgICAgICAgIHsKZGlmZiAtLWdpdCBhL1Nv dXJjZS9UaGlyZFBhcnR5L0FOR0xFL3NyYy9saWJBTkdMRS9yZW5kZXJlci9nbC9yZW5kZXJlcmds X3V0aWxzLmNwcCBiL1NvdXJjZS9UaGlyZFBhcnR5L0FOR0xFL3NyYy9saWJBTkdMRS9yZW5kZXJl ci9nbC9yZW5kZXJlcmdsX3V0aWxzLmNwcAppbmRleCBlOWRmNTUwYjkyZDM0YzFlZjBiOTFjMWQ3 M2UzNzg2MjdhMDIwNTg2Li42NmZmMTA5ZTQzOTYwMzEzODY1NTg0YWYwZjViMTRjOGYwODI4YzZi IDEwMDY0NAotLS0gYS9Tb3VyY2UvVGhpcmRQYXJ0eS9BTkdMRS9zcmMvbGliQU5HTEUvcmVuZGVy ZXIvZ2wvcmVuZGVyZXJnbF91dGlscy5jcHAKKysrIGIvU291cmNlL1RoaXJkUGFydHkvQU5HTEUv c3JjL2xpYkFOR0xFL3JlbmRlcmVyL2dsL3JlbmRlcmVyZ2xfdXRpbHMuY3BwCkBAIC0xNzIyLDYg KzE3MjIsMTQgQEAgdm9pZCBJbml0aWFsaXplRmVhdHVyZXMoY29uc3QgRnVuY3Rpb25zR0wgKmZ1 bmN0aW9ucywgYW5nbGU6OkZlYXR1cmVzR0wgKmZlYXR1cmUKICAgICBBTkdMRV9GRUFUVVJFX0NP TkRJVElPTigKICAgICAgICAgZmVhdHVyZXMsIGRpc2FibGVTZW1hcGhvcmVGZCwKICAgICAgICAg SXNMaW51eCgpICYmIGlzQU1EICYmIGlzTWVzYSAmJiBtZXNhVmVyc2lvbiA8IChzdGQ6OmFycmF5 PGludCwgMz57MTksIDMsIDV9KSk7CisKKyAgICAvLyBhbmdsZWJ1Zy5jb20vNDY3NAorICAgIC8v IFRoZSAocmVkdW5kYW50KSBleHBsaWNpdCBleGNsdXNpb24gb2YgV2luZG93cyBBTUQgaXMgYmVj YXVzZSB0aGUgd29ya2Fyb3VuZCBmYWlscworICAgIC8vIFRleHR1cmUyRFJHVGVzdC5UZXh0dXJl UkdVTm9ybVRlc3Qgb24gdGhhdCBwbGF0Zm9ybSwgYW5kIHRoZSB0ZXN0IGlzIHNraXBwZWQuIElm CisgICAgLy8geW91J2QgbGlrZSB0byBlbmFibGUgdGhlIHdvcmthcm91bmQgb24gV2luZG93cyBB TUQsIHBsZWFzZSBmaXggdGhlIHRlc3QgZmlyc3QuCisgICAgQU5HTEVfRkVBVFVSRV9DT05ESVRJ T04oCisgICAgICAgIGZlYXR1cmVzLCBlbXVsYXRlQ29weVRleEltYWdlMkRGcm9tUmVuZGVyYnVm ZmVycywKKyAgICAgICAgSXNBcHBsZSgpICYmIGZ1bmN0aW9ucy0+c3RhbmRhcmQgPT0gU1RBTkRB UkRfR0xfRVMgJiYgIShpc0FNRCAmJiBJc1dpbmRvd3MoKSkpOwogfQogCiB2b2lkIEluaXRpYWxp emVGcm9udGVuZEZlYXR1cmVzKGNvbnN0IEZ1bmN0aW9uc0dMICpmdW5jdGlvbnMsIGFuZ2xlOjpG cm9udGVuZEZlYXR1cmVzICpmZWF0dXJlcykKZGlmZiAtLWdpdCBhL1NvdXJjZS9UaGlyZFBhcnR5 L0FOR0xFL3NyYy90ZXN0cy9nbF90ZXN0cy9Db3B5VGV4SW1hZ2VUZXN0LmNwcCBiL1NvdXJjZS9U aGlyZFBhcnR5L0FOR0xFL3NyYy90ZXN0cy9nbF90ZXN0cy9Db3B5VGV4SW1hZ2VUZXN0LmNwcApp bmRleCAxNjA3YmM5ZTE0ZmYwMjdmZWFlODcyM2QzOGQ1ZmY0ZDc4NjE2ZDJhLi4zOTc4MmFkYWJl ODZhODc0OGM0MGNmZDAzZTBjZTk0YTliYTRiNGI0IDEwMDY0NAotLS0gYS9Tb3VyY2UvVGhpcmRQ YXJ0eS9BTkdMRS9zcmMvdGVzdHMvZ2xfdGVzdHMvQ29weVRleEltYWdlVGVzdC5jcHAKKysrIGIv U291cmNlL1RoaXJkUGFydHkvQU5HTEUvc3JjL3Rlc3RzL2dsX3Rlc3RzL0NvcHlUZXhJbWFnZVRl c3QuY3BwCkBAIC04OTUsNyArODk1LDEyIEBAIEFOR0xFX0lOU1RBTlRJQVRFX1RFU1QoQ29weVRl eEltYWdlVGVzdCwKICAgICAgICAgICAgICAgICAgICAgICAgRVMyX09QRU5HTCgpLAogICAgICAg ICAgICAgICAgICAgICAgICBFUzJfT1BFTkdMRVMoKSwKICAgICAgICAgICAgICAgICAgICAgICAg RVMyX1ZVTEtBTigpLAotICAgICAgICAgICAgICAgICAgICAgICBFUzNfVlVMS0FOKCkpOwotCi1B TkdMRV9JTlNUQU5USUFURV9URVNUX0VTMyhDb3B5VGV4SW1hZ2VUZXN0RVMzKTsKKyAgICAgICAg ICAgICAgICAgICAgICAgRVMzX1ZVTEtBTigpLAorICAgICAgICAgICAgICAgICAgICAgICBXaXRo RW11bGF0ZUNvcHlUZXhJbWFnZTJERnJvbVJlbmRlcmJ1ZmZlcnMoRVMyX09QRU5HTCgpKSwKKyAg ICAgICAgICAgICAgICAgICAgICAgV2l0aEVtdWxhdGVDb3B5VGV4SW1hZ2UyREZyb21SZW5kZXJi dWZmZXJzKEVTMl9PUEVOR0xFUygpKSk7CisKK0FOR0xFX0lOU1RBTlRJQVRFX1RFU1QoQ29weVRl eEltYWdlVGVzdEVTMywKKyAgICAgICAgICAgICAgICAgICAgICAgQU5HTEVfQUxMX1RFU1RfUExB VEZPUk1TX0VTMywKKyAgICAgICAgICAgICAgICAgICAgICAgV2l0aEVtdWxhdGVDb3B5VGV4SW1h Z2UyREZyb21SZW5kZXJidWZmZXJzKEVTM19PUEVOR0woKSksCisgICAgICAgICAgICAgICAgICAg ICAgIFdpdGhFbXVsYXRlQ29weVRleEltYWdlMkRGcm9tUmVuZGVyYnVmZmVycyhFUzNfT1BFTkdM RVMoKSkpOwogfSAgLy8gbmFtZXNwYWNlIGFuZ2xlCmRpZmYgLS1naXQgYS9Tb3VyY2UvVGhpcmRQ YXJ0eS9BTkdMRS9zcmMvdGVzdHMvZ2xfdGVzdHMvVGV4dHVyZVRlc3QuY3BwIGIvU291cmNlL1Ro aXJkUGFydHkvQU5HTEUvc3JjL3Rlc3RzL2dsX3Rlc3RzL1RleHR1cmVUZXN0LmNwcAppbmRleCAw N2VhMjQ4MWIzM2ExZmFjMmIxZWI3OTNiZWE0YmFlNzg4ODc3ZmQxLi4xMjZiOTQ5MTBjMmVhOTdj YTg0MDVjOTA1N2M3YWQyYTBjY2NkM2RlIDEwMDY0NAotLS0gYS9Tb3VyY2UvVGhpcmRQYXJ0eS9B TkdMRS9zcmMvdGVzdHMvZ2xfdGVzdHMvVGV4dHVyZVRlc3QuY3BwCisrKyBiL1NvdXJjZS9UaGly ZFBhcnR5L0FOR0xFL3NyYy90ZXN0cy9nbF90ZXN0cy9UZXh0dXJlVGVzdC5jcHAKQEAgLTQ1Mzcs NiArNDUzNywxMCBAQCBjbGFzcyBUZXh0dXJlMkRSR1Rlc3QgOiBwdWJsaWMgVGV4dHVyZTJEVGVz dAogVEVTVF9QKFRleHR1cmUyRFJHVGVzdCwgVGV4dHVyZVJHVU5vcm1UZXN0KQogewogICAgIEFO R0xFX1NLSVBfVEVTVF9JRighSXNHTEV4dGVuc2lvbkVuYWJsZWQoIkdMX0VYVF90ZXh0dXJlX3Jn IikpOworICAgIC8vIFRoaXMgd29ya2Fyb3VuZCBjYXVzZXMgYSBHTCBlcnJvciBvbiBXaW5kb3dz IEFNRCwgd2hpY2ggaXMgbGlrZWx5IGEgZHJpdmVyIGJ1Zy4KKyAgICAvLyBUaGUgd29ya2Fyb3Vu ZCBpcyBub3QgaW50ZW5kZWQgdG8gYmUgZW5hYmxlZCBpbiB0aGlzIGNvbmZpZ3VyYXRpb24gc28g c2tpcCBpdC4KKyAgICBBTkdMRV9TS0lQX1RFU1RfSUYoR2V0UGFyYW0oKS5lZ2xQYXJhbWV0ZXJz LmVtdWxhdGVDb3B5VGV4SW1hZ2UyREZyb21SZW5kZXJidWZmZXJzICYmCisgICAgICAgICAgICAg ICAgICAgICAgIElzV2luZG93cygpICYmIElzQU1EKCkpOwogCiAgICAgR0x1Ynl0ZSBwaXhlbFZh bHVlICA9IDB4YWI7CiAgICAgR0x1Ynl0ZSBpbWFnZURhdGFbXSA9IHtwaXhlbFZhbHVlLCBwaXhl bFZhbHVlfTsKQEAgLTYyMDgsNyArNjIxMiwxMyBAQCBURVNUX1AoRVRDMUNvbXByZXNzZWRUZXh0 dXJlVGVzdCwgRVRDMVNocmlua1RoZW5Hcm93TWF4TGV2ZWxzKQogCiAvLyBVc2UgdGhpcyB0byBz ZWxlY3Qgd2hpY2ggY29uZmlndXJhdGlvbnMgKGUuZy4gd2hpY2ggcmVuZGVyZXIsIHdoaWNoIEdM RVMgbWFqb3IgdmVyc2lvbikgdGhlc2UKIC8vIHRlc3RzIHNob3VsZCBiZSBydW4gYWdhaW5zdC4K LUFOR0xFX0lOU1RBTlRJQVRFX1RFU1RfRVMyKFRleHR1cmUyRFRlc3QpOworI2RlZmluZSBFUzJf RU1VTEFURV9DT1BZX1RFWF9JTUFHRSgpICAgICAgICAgICAgICAgICAgICAgICAgICBcCisgICAg V2l0aEVtdWxhdGVDb3B5VGV4SW1hZ2UyREZyb21SZW5kZXJidWZmZXJzKEVTMl9PUEVOR0woKSks IFwKKyAgICAgICAgV2l0aEVtdWxhdGVDb3B5VGV4SW1hZ2UyREZyb21SZW5kZXJidWZmZXJzKEVT Ml9PUEVOR0xFUygpKQorI2RlZmluZSBFUzNfRU1VTEFURV9DT1BZX1RFWF9JTUFHRSgpICAgICAg ICAgICAgICAgICAgICAgICAgICBcCisgICAgV2l0aEVtdWxhdGVDb3B5VGV4SW1hZ2UyREZyb21S ZW5kZXJidWZmZXJzKEVTM19PUEVOR0woKSksIFwKKyAgICAgICAgV2l0aEVtdWxhdGVDb3B5VGV4 SW1hZ2UyREZyb21SZW5kZXJidWZmZXJzKEVTM19PUEVOR0xFUygpKQorQU5HTEVfSU5TVEFOVElB VEVfVEVTVChUZXh0dXJlMkRUZXN0LCBBTkdMRV9BTExfVEVTVF9QTEFURk9STVNfRVMyLCBFUzJf RU1VTEFURV9DT1BZX1RFWF9JTUFHRSgpKTsKIEFOR0xFX0lOU1RBTlRJQVRFX1RFU1RfRVMyKFRl eHR1cmVDdWJlVGVzdCk7CiBBTkdMRV9JTlNUQU5USUFURV9URVNUX0VTMihUZXh0dXJlMkRUZXN0 V2l0aERyYXdTY2FsZSk7CiBBTkdMRV9JTlNUQU5USUFURV9URVNUX0VTMihTYW1wbGVyMkRBc0Z1 bmN0aW9uUGFyYW1ldGVyVGVzdCk7CkBAIC02MjMzLDcgKzYyNDMsMTEgQEAgQU5HTEVfSU5TVEFO VElBVEVfVEVTVF9FUzMoVGV4dHVyZUJvcmRlckNsYW1wVGVzdEVTMyk7CiBBTkdMRV9JTlNUQU5U SUFURV9URVNUX0VTMyhUZXh0dXJlQm9yZGVyQ2xhbXBJbnRlZ2VyVGVzdEVTMyk7CiBBTkdMRV9J TlNUQU5USUFURV9URVNUX0VTMihUZXh0dXJlTGltaXRzVGVzdCk7CiBBTkdMRV9JTlNUQU5USUFU RV9URVNUX0VTMyhUZXh0dXJlMkROb3JtMTZUZXN0RVMzKTsKLUFOR0xFX0lOU1RBTlRJQVRFX1RF U1RfRVMyX0FORF9FUzMoVGV4dHVyZTJEUkdUZXN0KTsKK0FOR0xFX0lOU1RBTlRJQVRFX1RFU1Qo VGV4dHVyZTJEUkdUZXN0LAorICAgICAgICAgICAgICAgICAgICAgICBBTkdMRV9BTExfVEVTVF9Q TEFURk9STVNfRVMyLAorICAgICAgICAgICAgICAgICAgICAgICBBTkdMRV9BTExfVEVTVF9QTEFU Rk9STVNfRVMzLAorICAgICAgICAgICAgICAgICAgICAgICBFUzJfRU1VTEFURV9DT1BZX1RFWF9J TUFHRSgpLAorICAgICAgICAgICAgICAgICAgICAgICBFUzNfRU1VTEFURV9DT1BZX1RFWF9JTUFH RSgpKTsKIEFOR0xFX0lOU1RBTlRJQVRFX1RFU1RfRVMzKFRleHR1cmUyREZsb2F0VGVzdEVTMyk7 CiBBTkdMRV9JTlNUQU5USUFURV9URVNUX0VTMihUZXh0dXJlMkRGbG9hdFRlc3RFUzIpOwogQU5H TEVfSU5TVEFOVElBVEVfVEVTVF9FUzMoVGV4dHVyZUN1YmVUZXN0RVMzKTsKZGlmZiAtLWdpdCBh L1NvdXJjZS9UaGlyZFBhcnR5L0FOR0xFL3NyYy90ZXN0cy90ZXN0X3V0aWxzL2FuZ2xlX3Rlc3Rf Y29uZmlncy5jcHAgYi9Tb3VyY2UvVGhpcmRQYXJ0eS9BTkdMRS9zcmMvdGVzdHMvdGVzdF91dGls cy9hbmdsZV90ZXN0X2NvbmZpZ3MuY3BwCmluZGV4IGQzN2JmY2Q3YTA4YTJmNDkxMmVjMzE4ODQ4 MTliNzM1ZjhlMGU2MDMuLmZmZTdiNTkzZjlhOTljM2U0M2Y5NWRkNjI2NTFkYzk3OWU4Zjk0Mzkg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9UaGlyZFBhcnR5L0FOR0xFL3NyYy90ZXN0cy90ZXN0X3V0aWxz L2FuZ2xlX3Rlc3RfY29uZmlncy5jcHAKKysrIGIvU291cmNlL1RoaXJkUGFydHkvQU5HTEUvc3Jj L3Rlc3RzL3Rlc3RfdXRpbHMvYW5nbGVfdGVzdF9jb25maWdzLmNwcApAQCAtMjA0LDYgKzIwNCwx MSBAQCBzdGQ6Om9zdHJlYW0gJm9wZXJhdG9yPDwoc3RkOjpvc3RyZWFtICZzdHJlYW0sIGNvbnN0 IFBsYXRmb3JtUGFyYW1ldGVycyAmcHApCiAgICAgICAgIHN0cmVhbSA8PCAiX0FsbG9jYXRlTm9u WmVyb01lbW9yeSI7CiAgICAgfQogCisgICAgaWYgKHBwLmVnbFBhcmFtZXRlcnMuZW11bGF0ZUNv cHlUZXhJbWFnZTJERnJvbVJlbmRlcmJ1ZmZlcnMgPT0gRUdMX1RSVUUpCisgICAgeworICAgICAg ICBzdHJlYW0gPDwgIl9FbXVsYXRlQ29weVRleEltYWdlMkRGcm9tUmVuZGVyYnVmZmVycyI7Cisg ICAgfQorCiAgICAgcmV0dXJuIHN0cmVhbTsKIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1RoaXJk UGFydHkvQU5HTEUvc3JjL3Rlc3RzL3Rlc3RfdXRpbHMvYW5nbGVfdGVzdF9jb25maWdzLmggYi9T b3VyY2UvVGhpcmRQYXJ0eS9BTkdMRS9zcmMvdGVzdHMvdGVzdF91dGlscy9hbmdsZV90ZXN0X2Nv bmZpZ3MuaAppbmRleCBjNmQ0NDYwNzUxZjIwNmNkMGQ0MzhmNjRiMDM4OWM0YWNlMmVkNGQ1Li40 OWQwNGYzMTEwOTNmOGM0NDYwMGVjOTZiMTc4Y2Y1NjE5NDI3N2Y2IDEwMDY0NAotLS0gYS9Tb3Vy Y2UvVGhpcmRQYXJ0eS9BTkdMRS9zcmMvdGVzdHMvdGVzdF91dGlscy9hbmdsZV90ZXN0X2NvbmZp Z3MuaAorKysgYi9Tb3VyY2UvVGhpcmRQYXJ0eS9BTkdMRS9zcmMvdGVzdHMvdGVzdF91dGlscy9h bmdsZV90ZXN0X2NvbmZpZ3MuaApAQCAtMjE5LDYgKzIxOSwxNCBAQCBpbmxpbmUgUGxhdGZvcm1Q YXJhbWV0ZXJzIFdpdGhBbGxvY2F0ZU5vblplcm9NZW1vcnkoY29uc3QgUGxhdGZvcm1QYXJhbWV0 ZXJzICZwYQogICAgIHJldHVybiBhbGxvY2F0ZU5vblplcm87CiB9CiAKK2lubGluZSBQbGF0Zm9y bVBhcmFtZXRlcnMgV2l0aEVtdWxhdGVDb3B5VGV4SW1hZ2UyREZyb21SZW5kZXJidWZmZXJzKAor ICAgIGNvbnN0IFBsYXRmb3JtUGFyYW1ldGVycyAmcGFyYW1zKQoreworICAgIFBsYXRmb3JtUGFy YW1ldGVycyBwICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICA9IHBhcmFtczsKKyAg ICBwLmVnbFBhcmFtZXRlcnMuZW11bGF0ZUNvcHlUZXhJbWFnZTJERnJvbVJlbmRlcmJ1ZmZlcnMg PSBFR0xfVFJVRTsKKyAgICByZXR1cm4gcDsKK30KKwogaW5saW5lIFBsYXRmb3JtUGFyYW1ldGVy cyBXaXRoUm9idXN0bmVzcyhjb25zdCBQbGF0Zm9ybVBhcmFtZXRlcnMgJnBhcmFtcykKIHsKICAg ICBQbGF0Zm9ybVBhcmFtZXRlcnMgd2l0aFJvYnVzdG5lc3MgICAgICAgPSBwYXJhbXM7CmRpZmYg LS1naXQgYS9Tb3VyY2UvVGhpcmRQYXJ0eS9BTkdMRS91dGlsL0VHTFBsYXRmb3JtUGFyYW1ldGVy cy5oIGIvU291cmNlL1RoaXJkUGFydHkvQU5HTEUvdXRpbC9FR0xQbGF0Zm9ybVBhcmFtZXRlcnMu aAppbmRleCA5MTIyMzY3Y2E3ZGY5YTI3MzQ4ZThjM2JhYzE0OGNlNjBjNGU0Y2Y0Li45NGFhNmQx NzFkMjgwYTI2MzdhOWU5N2Y5NjkyNzZjYTk2MDBhNTRiIDEwMDY0NAotLS0gYS9Tb3VyY2UvVGhp cmRQYXJ0eS9BTkdMRS91dGlsL0VHTFBsYXRmb3JtUGFyYW1ldGVycy5oCisrKyBiL1NvdXJjZS9U aGlyZFBhcnR5L0FOR0xFL3V0aWwvRUdMUGxhdGZvcm1QYXJhbWV0ZXJzLmgKQEAgLTYwLDIwICs2 MCwyMiBAQCBzdHJ1Y3QgRUdMUGxhdGZvcm1QYXJhbWV0ZXJzCiAgICAgewogICAgICAgICByZXR1 cm4gc3RkOjp0aWUocmVuZGVyZXIsIG1ham9yVmVyc2lvbiwgbWlub3JWZXJzaW9uLCBkZXZpY2VU eXBlLCBwcmVzZW50UGF0aCwKICAgICAgICAgICAgICAgICAgICAgICAgIGRlYnVnTGF5ZXJzRW5h YmxlZCwgY29udGV4dFZpcnR1YWxpemF0aW9uLCB0cmFuc2Zvcm1GZWVkYmFja0ZlYXR1cmUsCi0g ICAgICAgICAgICAgICAgICAgICAgICBhbGxvY2F0ZU5vblplcm9NZW1vcnlGZWF0dXJlLCBwbGF0 Zm9ybU1ldGhvZHMsIHJvYnVzdG5lc3MpOworICAgICAgICAgICAgICAgICAgICAgICAgYWxsb2Nh dGVOb25aZXJvTWVtb3J5RmVhdHVyZSwgZW11bGF0ZUNvcHlUZXhJbWFnZTJERnJvbVJlbmRlcmJ1 ZmZlcnMsCisgICAgICAgICAgICAgICAgICAgICAgICBwbGF0Zm9ybU1ldGhvZHMsIHJvYnVzdG5l c3MpOwogICAgIH0KIAotICAgIEVHTGludCByZW5kZXJlciAgICAgICAgICAgICAgICAgICAgICAg ICA9IEVHTF9QTEFURk9STV9BTkdMRV9UWVBFX0RFRkFVTFRfQU5HTEU7Ci0gICAgRUdMaW50IG1h am9yVmVyc2lvbiAgICAgICAgICAgICAgICAgICAgID0gRUdMX0RPTlRfQ0FSRTsKLSAgICBFR0xp bnQgbWlub3JWZXJzaW9uICAgICAgICAgICAgICAgICAgICAgPSBFR0xfRE9OVF9DQVJFOwotICAg IEVHTGludCBkZXZpY2VUeXBlICAgICAgICAgICAgICAgICAgICAgICA9IEVHTF9QTEFURk9STV9B TkdMRV9ERVZJQ0VfVFlQRV9IQVJEV0FSRV9BTkdMRTsKLSAgICBFR0xpbnQgcHJlc2VudFBhdGgg ICAgICAgICAgICAgICAgICAgICAgPSBFR0xfRE9OVF9DQVJFOwotICAgIEVHTGludCBkZWJ1Z0xh eWVyc0VuYWJsZWQgICAgICAgICAgICAgICA9IEVHTF9ET05UX0NBUkU7Ci0gICAgRUdMaW50IGNv bnRleHRWaXJ0dWFsaXphdGlvbiAgICAgICAgICAgID0gRUdMX0RPTlRfQ0FSRTsKLSAgICBFR0xp bnQgcm9idXN0bmVzcyAgICAgICAgICAgICAgICAgICAgICAgPSBFR0xfRE9OVF9DQVJFOwotICAg IEVHTGludCB0cmFuc2Zvcm1GZWVkYmFja0ZlYXR1cmUgICAgICAgICA9IEVHTF9ET05UX0NBUkU7 Ci0gICAgRUdMaW50IGFsbG9jYXRlTm9uWmVyb01lbW9yeUZlYXR1cmUgICAgID0gRUdMX0RPTlRf Q0FSRTsKLSAgICBhbmdsZTo6UGxhdGZvcm1NZXRob2RzICpwbGF0Zm9ybU1ldGhvZHMgPSBudWxs cHRyOworICAgIEVHTGludCByZW5kZXJlciAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICA9 IEVHTF9QTEFURk9STV9BTkdMRV9UWVBFX0RFRkFVTFRfQU5HTEU7CisgICAgRUdMaW50IG1ham9y VmVyc2lvbiAgICAgICAgICAgICAgICAgICAgICAgICAgID0gRUdMX0RPTlRfQ0FSRTsKKyAgICBF R0xpbnQgbWlub3JWZXJzaW9uICAgICAgICAgICAgICAgICAgICAgICAgICAgPSBFR0xfRE9OVF9D QVJFOworICAgIEVHTGludCBkZXZpY2VUeXBlICAgICAgICAgICAgICAgICAgICAgICAgICAgICA9 IEVHTF9QTEFURk9STV9BTkdMRV9ERVZJQ0VfVFlQRV9IQVJEV0FSRV9BTkdMRTsKKyAgICBFR0xp bnQgcHJlc2VudFBhdGggICAgICAgICAgICAgICAgICAgICAgICAgICAgPSBFR0xfRE9OVF9DQVJF OworICAgIEVHTGludCBkZWJ1Z0xheWVyc0VuYWJsZWQgICAgICAgICAgICAgICAgICAgICA9IEVH TF9ET05UX0NBUkU7CisgICAgRUdMaW50IGNvbnRleHRWaXJ0dWFsaXphdGlvbiAgICAgICAgICAg ICAgICAgID0gRUdMX0RPTlRfQ0FSRTsKKyAgICBFR0xpbnQgcm9idXN0bmVzcyAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgPSBFR0xfRE9OVF9DQVJFOworICAgIEVHTGludCB0cmFuc2Zvcm1G ZWVkYmFja0ZlYXR1cmUgICAgICAgICAgICAgICA9IEVHTF9ET05UX0NBUkU7CisgICAgRUdMaW50 IGFsbG9jYXRlTm9uWmVyb01lbW9yeUZlYXR1cmUgICAgICAgICAgID0gRUdMX0RPTlRfQ0FSRTsK KyAgICBFR0xpbnQgZW11bGF0ZUNvcHlUZXhJbWFnZTJERnJvbVJlbmRlcmJ1ZmZlcnMgPSBFR0xf RE9OVF9DQVJFOworICAgIGFuZ2xlOjpQbGF0Zm9ybU1ldGhvZHMgKnBsYXRmb3JtTWV0aG9kcyAg ICAgICA9IG51bGxwdHI7CiB9OwogCiBpbmxpbmUgYm9vbCBvcGVyYXRvcjwoY29uc3QgRUdMUGxh dGZvcm1QYXJhbWV0ZXJzICZhLCBjb25zdCBFR0xQbGF0Zm9ybVBhcmFtZXRlcnMgJmIpCmRpZmYg LS1naXQgYS9Tb3VyY2UvVGhpcmRQYXJ0eS9BTkdMRS91dGlsL0VHTFdpbmRvdy5jcHAgYi9Tb3Vy Y2UvVGhpcmRQYXJ0eS9BTkdMRS91dGlsL0VHTFdpbmRvdy5jcHAKaW5kZXggYzI1NzI5MGRmYzQ1 OWJkOWQ2NjQ5MjkyM2NjMWQwNzYyOWQyYjEwMC4uYjcyM2FhY2RkOGM3Nzc1NWE4MDg2OGRlMjcy NjlkNDljNGIzMmY1MyAxMDA2NDQKLS0tIGEvU291cmNlL1RoaXJkUGFydHkvQU5HTEUvdXRpbC9F R0xXaW5kb3cuY3BwCisrKyBiL1NvdXJjZS9UaGlyZFBhcnR5L0FOR0xFL3V0aWwvRUdMV2luZG93 LmNwcApAQCAtMTkxLDYgKzE5MSwxMSBAQCBib29sIEVHTFdpbmRvdzo6aW5pdGlhbGl6ZURpc3Bs YXkoT1NXaW5kb3cgKm9zV2luZG93LAogICAgICAgICBkaXNhYmxlZEZlYXR1cmVPdmVycmlkZXMu cHVzaF9iYWNrKCJhbGxvY2F0ZV9ub25femVyb19tZW1vcnkiKTsKICAgICB9CiAKKyAgICBpZiAo cGFyYW1zLmVtdWxhdGVDb3B5VGV4SW1hZ2UyREZyb21SZW5kZXJidWZmZXJzID09IEVHTF9UUlVF KQorICAgIHsKKyAgICAgICAgZW5hYmxlZEZlYXR1cmVPdmVycmlkZXMucHVzaF9iYWNrKCJlbXVs YXRlX2NvcHl0ZXhpbWFnZTJkX2Zyb21fcmVuZGVyYnVmZmVycyIpOworICAgIH0KKwogICAgIGlm ICghZGlzYWJsZWRGZWF0dXJlT3ZlcnJpZGVzLmVtcHR5KCkpCiAgICAgewogICAgICAgICBpZiAo c3Ryc3RyKGV4dGVuc2lvblN0cmluZywgIkVHTF9BTkdMRV9mZWF0dXJlX2NvbnRyb2wiKSA9PSBu dWxscHRyKQo= 401103 2020-06-04 17:40:07 -0700 2020-06-05 15:13:51 -0700 Patch bug-212249-20200604174006.patch text/plain 21675 jdarpinian U3VidmVyc2lvbiBSZXZpc2lvbjogMjYyNTg5CmRpZmYgLS1naXQgYS9Tb3VyY2UvVGhpcmRQYXJ0 eS9BTkdMRS9DaGFuZ2VMb2cgYi9Tb3VyY2UvVGhpcmRQYXJ0eS9BTkdMRS9DaGFuZ2VMb2cKaW5k ZXggZWZlZjM0MTZmOGUyMzc1NzY1YTExMGIzOWZjZGQ3NDg5ZWIxMDg0OC4uOTcxNWMyMTdhODFk OWVmYmVhNmRmYjAxNWQzY2Y1YTk1Yzg3MmFjNyAxMDA2NDQKLS0tIGEvU291cmNlL1RoaXJkUGFy dHkvQU5HTEUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9UaGlyZFBhcnR5L0FOR0xFL0NoYW5nZUxv ZwpAQCAtMSwzICsxLDMzIEBACisyMDIwLTA2LTA0ICBKYW1lcyBEYXJwaW5pYW4gIDxqZGFycGlu aWFuQGNocm9taXVtLm9yZz4KKworICAgICAgICBbQU5HTEUgLSBpT1NdIGZhc3QvY2FudmFzL3dl YmdsL3VuaW5pdGlhbGl6ZWQtdGVzdC5odG1sIGlzIHN0aWxsIGZhaWxpbmcKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIxMjI0OQorCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIGNvcHlUZXhJbWFnZTJEIGlzIGJy b2tlbiBpbiBzb21lIHdheSBvbiBpT1MuIFdvcmsgYXJvdW5kIGl0IGJ5IHJlaW1wbGVtZW50aW5n CisgICAgICAgIGl0IHdpdGggQU5HTEUncyBCbGl0R0wgY2xhc3MuCisKKyAgICAgICAgKiBpbmNs dWRlL3BsYXRmb3JtL0ZlYXR1cmVzR0wuaDoKKyAgICAgICAgKiBzcmMvbGliQU5HTEUvcmVuZGVy ZXIvZ2wvQmxpdEdMLmNwcDoKKyAgICAgICAgKHJ4OjpCbGl0R0w6OmJsaXRDb2xvckJ1ZmZlcldp dGhTaGFkZXIpOgorICAgICAgICAqIHNyYy9saWJBTkdMRS9yZW5kZXJlci9nbC9CbGl0R0wuaDoK KyAgICAgICAgKiBzcmMvbGliQU5HTEUvcmVuZGVyZXIvZ2wvVGV4dHVyZUdMLmNwcDoKKyAgICAg ICAgKHJ4OjpUZXh0dXJlR0w6OmNvcHlJbWFnZSk6CisgICAgICAgIChyeDo6VGV4dHVyZUdMOjpj b3B5U3ViSW1hZ2UpOgorICAgICAgICAqIHNyYy9saWJBTkdMRS9yZW5kZXJlci9nbC9yZW5kZXJl cmdsX3V0aWxzLmNwcDoKKyAgICAgICAgKHJ4OjpuYXRpdmVnbF9nbDo6SW5pdGlhbGl6ZUZlYXR1 cmVzKToKKyAgICAgICAgKiBzcmMvdGVzdHMvZ2xfdGVzdHMvQ29weVRleEltYWdlVGVzdC5jcHA6 CisgICAgICAgICogc3JjL3Rlc3RzL2dsX3Rlc3RzL1RleHR1cmVUZXN0LmNwcDoKKyAgICAgICAg KiBzcmMvdGVzdHMvdGVzdF91dGlscy9hbmdsZV90ZXN0X2NvbmZpZ3MuY3BwOgorICAgICAgICAo YW5nbGU6Om9wZXJhdG9yPDwpOgorICAgICAgICAqIHNyYy90ZXN0cy90ZXN0X3V0aWxzL2FuZ2xl X3Rlc3RfY29uZmlncy5oOgorICAgICAgICAoYW5nbGU6OldpdGhFbXVsYXRlQ29weVRleEltYWdl MkRGcm9tUmVuZGVyYnVmZmVycyk6CisgICAgICAgICogdXRpbC9FR0xQbGF0Zm9ybVBhcmFtZXRl cnMuaDoKKyAgICAgICAgKEVHTFBsYXRmb3JtUGFyYW1ldGVyczo6dGllIGNvbnN0KToKKyAgICAg ICAgKiB1dGlsL0VHTFdpbmRvdy5jcHA6CisgICAgICAgIChFR0xXaW5kb3c6OmluaXRpYWxpemVE aXNwbGF5KToKKwogMjAyMC0wNi0wNCAgVGltIEhvcnRvbiAgPHRpbW90aHlfaG9ydG9uQGFwcGxl LmNvbT4KIAogICAgICAgICBXb3JrIGFyb3VuZCBicm9rZW4gc3lzdGVtIHZlcnNpb24gbWFjcm8K ZGlmZiAtLWdpdCBhL1NvdXJjZS9UaGlyZFBhcnR5L0FOR0xFL2luY2x1ZGUvcGxhdGZvcm0vRmVh dHVyZXNHTC5oIGIvU291cmNlL1RoaXJkUGFydHkvQU5HTEUvaW5jbHVkZS9wbGF0Zm9ybS9GZWF0 dXJlc0dMLmgKaW5kZXggNTc1NjAyOWZiNTM4ZmQwYTZmMGMzYjNhYTM5YjA1ZWJmN2UyZTRhNC4u NDExYzllNDM2MzlhZGMzZTE0ZjAzNjVlN2QzZWI2ODc1N2NiZGQ0ZCAxMDA2NDQKLS0tIGEvU291 cmNlL1RoaXJkUGFydHkvQU5HTEUvaW5jbHVkZS9wbGF0Zm9ybS9GZWF0dXJlc0dMLmgKKysrIGIv U291cmNlL1RoaXJkUGFydHkvQU5HTEUvaW5jbHVkZS9wbGF0Zm9ybS9GZWF0dXJlc0dMLmgKQEAg LTQ0Miw2ICs0NDIsMTEgQEAgc3RydWN0IEZlYXR1cmVzR0wgOiBGZWF0dXJlU2V0QmFzZQogICAg IEZlYXR1cmUgZGlzYWJsZVNlbWFwaG9yZUZkID0geyJkaXNhYmxlX3NlbWFwaG9yZV9mZCIsIEZl YXR1cmVDYXRlZ29yeTo6T3BlbkdMV29ya2Fyb3VuZHMsCiAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgIkRpc2FibGUgR0xfRVhUX3NlbWFwaG9yZV9mZCBleHRlbnNpb24iLCAmbWVt YmVycywKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAiaHR0cHM6Ly9jcmJ1Zy5j b20vMTA0NjQ2MiJ9OworCisgICAgRmVhdHVyZSBlbXVsYXRlQ29weVRleEltYWdlMkRGcm9tUmVu ZGVyYnVmZmVycyA9IHsKKyAgICAgICAgImVtdWxhdGVfY29weXRleGltYWdlMmRfZnJvbV9yZW5k ZXJidWZmZXJzIiwgRmVhdHVyZUNhdGVnb3J5OjpPcGVuR0xXb3JrYXJvdW5kcywKKyAgICAgICAg IkNvcHlUZXhJbWFnZTJEIHNwdXJpb3VzbHkgcmV0dXJucyBlcnJvcnMgb24gaU9TIHdoZW4gY29w eWluZyBmcm9tIHJlbmRlcmJ1ZmZlcnMuIiwKKyAgICAgICAgJm1lbWJlcnMsICJodHRwczovL2Fu Z2xlYnVnLmNvbS80Njc0In07CiB9OwogCiBpbmxpbmUgRmVhdHVyZXNHTDo6RmVhdHVyZXNHTCgp ICA9IGRlZmF1bHQ7CmRpZmYgLS1naXQgYS9Tb3VyY2UvVGhpcmRQYXJ0eS9BTkdMRS9zcmMvbGli QU5HTEUvcmVuZGVyZXIvZ2wvQmxpdEdMLmNwcCBiL1NvdXJjZS9UaGlyZFBhcnR5L0FOR0xFL3Ny Yy9saWJBTkdMRS9yZW5kZXJlci9nbC9CbGl0R0wuY3BwCmluZGV4IDc1NzE2OGNlYTNlZDJhNTEx ZmMyZWEyZDMxNzk3ODBiZWMwODQzOTUuLjVmZTYxZmY4ZDU0MWViYjk0OGI3MGQ4YmFhY2U5ZTBk NGQ2MWZhYzkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9UaGlyZFBhcnR5L0FOR0xFL3NyYy9saWJBTkdM RS9yZW5kZXJlci9nbC9CbGl0R0wuY3BwCisrKyBiL1NvdXJjZS9UaGlyZFBhcnR5L0FOR0xFL3Ny Yy9saWJBTkdMRS9yZW5kZXJlci9nbC9CbGl0R0wuY3BwCkBAIC0zOTMsNiArMzkzLDM0IEBAIGFu Z2xlOjpSZXN1bHQgQmxpdEdMOjpjb3B5U3ViSW1hZ2VUb0xVTUFXb3JrYXJvdW5kVGV4dHVyZShj b25zdCBnbDo6Q29udGV4dCAqY29uCiAgICAgcmV0dXJuIGFuZ2xlOjpSZXN1bHQ6OkNvbnRpbnVl OwogfQogCithbmdsZTo6UmVzdWx0IEJsaXRHTDo6YmxpdENvbG9yQnVmZmVyV2l0aFNoYWRlcihj b25zdCBnbDo6Q29udGV4dCAqY29udGV4dCwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgIGNvbnN0IGdsOjpGcmFtZWJ1ZmZlciAqc291cmNlLAorICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgY29uc3QgR0x1aW50IGRl c3RUZXh0dXJlLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgY29uc3QgZ2w6OlRleHR1cmVUYXJnZXQgZGVzdFRhcmdldCwKKyAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGNvbnN0IHNpemVfdCBkZXN0TGV2ZWwsCisg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBjb25zdCBnbDo6 UmVjdGFuZ2xlICZzb3VyY2VBcmVhSW4sCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICBjb25zdCBnbDo6UmVjdGFuZ2xlICZkZXN0QXJlYUluLAorICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgR0xlbnVtIGZpbHRlciwK KyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGJvb2wgd3Jp dGVBbHBoYSkKK3sKKyAgICBBTkdMRV9UUlkoaW5pdGlhbGl6ZVJlc291cmNlcyhjb250ZXh0KSk7 CisgICAgbVN0YXRlTWFuYWdlci0+YmluZEZyYW1lYnVmZmVyKEdMX0ZSQU1FQlVGRkVSLCBtU2Ny YXRjaEZCTyk7CisgICAgQU5HTEVfR0xfVFJZKGNvbnRleHQsIG1GdW5jdGlvbnMtPmZyYW1lYnVm ZmVyVGV4dHVyZTJEKEdMX0ZSQU1FQlVGRkVSLCBHTF9DT0xPUl9BVFRBQ0hNRU5UMCwKKyAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgVG9H TGVudW0oZGVzdFRhcmdldCksIGRlc3RUZXh0dXJlLAorICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBzdGF0aWNfY2FzdDxHTGludD4oZGVz dExldmVsKSkpOworICAgIEdMZW51bSBzdGF0dXMgPSBBTkdMRV9HTF9UUlkoY29udGV4dCwgbUZ1 bmN0aW9ucy0+Y2hlY2tGcmFtZWJ1ZmZlclN0YXR1cyhHTF9GUkFNRUJVRkZFUikpOworICAgIGlm IChzdGF0dXMgIT0gR0xfRlJBTUVCVUZGRVJfQ09NUExFVEUpCisgICAgeworICAgICAgICByZXR1 cm4gYW5nbGU6OlJlc3VsdDo6U3RvcDsKKyAgICB9CisgICAgYW5nbGU6OlJlc3VsdCByZXN1bHQg PSBibGl0Q29sb3JCdWZmZXJXaXRoU2hhZGVyKGNvbnRleHQsIHNvdXJjZSwgbVNjcmF0Y2hGQk8s IHNvdXJjZUFyZWFJbiwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgZGVzdEFyZWFJbiwgZmlsdGVyLCB3cml0ZUFscGhhKTsKKyAgICAvLyBVbmJp bmQgdGhlIHRleHR1cmUgZnJvbSB0aGUgdGhlIHNjcmF0Y2ggZnJhbWVidWZmZXIuCisgICAgQU5H TEVfR0xfVFJZKGNvbnRleHQsIG1GdW5jdGlvbnMtPmZyYW1lYnVmZmVyUmVuZGVyYnVmZmVyKEdM X0ZSQU1FQlVGRkVSLCBHTF9DT0xPUl9BVFRBQ0hNRU5UMCwKKyAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgR0xfUkVOREVSQlVGRkVS LCAwKSk7CisgICAgcmV0dXJuIHJlc3VsdDsKK30KKwogYW5nbGU6OlJlc3VsdCBCbGl0R0w6OmJs aXRDb2xvckJ1ZmZlcldpdGhTaGFkZXIoY29uc3QgZ2w6OkNvbnRleHQgKmNvbnRleHQsCiAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBjb25zdCBnbDo6RnJh bWVidWZmZXIgKnNvdXJjZSwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgIGNvbnN0IGdsOjpGcmFtZWJ1ZmZlciAqZGVzdCwKQEAgLTQwMCw2ICs0MjgsMTkg QEAgYW5nbGU6OlJlc3VsdCBCbGl0R0w6OmJsaXRDb2xvckJ1ZmZlcldpdGhTaGFkZXIoY29uc3Qg Z2w6OkNvbnRleHQgKmNvbnRleHQsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICBjb25zdCBnbDo6UmVjdGFuZ2xlICZkZXN0QXJlYUluLAogICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgR0xlbnVtIGZpbHRlciwKICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGJvb2wgd3JpdGVB bHBoYSkKK3sKKyAgICBjb25zdCBGcmFtZWJ1ZmZlckdMICpkZXN0R0wgPSBHZXRJbXBsQXM8RnJh bWVidWZmZXJHTD4oZGVzdCk7CisgICAgcmV0dXJuIGJsaXRDb2xvckJ1ZmZlcldpdGhTaGFkZXIo Y29udGV4dCwgc291cmNlLCBkZXN0R0wtPmdldEZyYW1lYnVmZmVySUQoKSwgc291cmNlQXJlYUlu LAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGRlc3RBcmVhSW4sIGZpbHRl ciwgd3JpdGVBbHBoYSk7Cit9CisKK2FuZ2xlOjpSZXN1bHQgQmxpdEdMOjpibGl0Q29sb3JCdWZm ZXJXaXRoU2hhZGVyKGNvbnN0IGdsOjpDb250ZXh0ICpjb250ZXh0LAorICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgY29uc3QgZ2w6OkZyYW1lYnVmZmVyICpz b3VyY2UsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBj b25zdCBHTHVpbnQgZGVzdEZyYW1lYnVmZmVyLAorICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgY29uc3QgZ2w6OlJlY3RhbmdsZSAmc291cmNlQXJlYUluLAor ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgY29uc3QgZ2w6 OlJlY3RhbmdsZSAmZGVzdEFyZWFJbiwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgIEdMZW51bSBmaWx0ZXIsCisgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICBib29sIHdyaXRlQWxwaGEpCiB7CiAgICAgQU5HTEVfVFJZ KGluaXRpYWxpemVSZXNvdXJjZXMoY29udGV4dCkpOwogCkBAIC01MDUsOCArNTQ2LDcgQEAgYW5n bGU6OlJlc3VsdCBCbGl0R0w6OmJsaXRDb2xvckJ1ZmZlcldpdGhTaGFkZXIoY29uc3QgZ2w6OkNv bnRleHQgKmNvbnRleHQsCiAgICAgQU5HTEVfR0xfVFJZKGNvbnRleHQsIG1GdW5jdGlvbnMtPnVu aWZvcm0xaShibGl0UHJvZ3JhbS0+bXVsdGlwbHlBbHBoYUxvY2F0aW9uLCAwKSk7CiAgICAgQU5H TEVfR0xfVFJZKGNvbnRleHQsIG1GdW5jdGlvbnMtPnVuaWZvcm0xaShibGl0UHJvZ3JhbS0+dW5N dWx0aXBseUFscGhhTG9jYXRpb24sIDApKTsKIAotICAgIGNvbnN0IEZyYW1lYnVmZmVyR0wgKmRl c3RHTCA9IEdldEltcGxBczxGcmFtZWJ1ZmZlckdMPihkZXN0KTsKLSAgICBtU3RhdGVNYW5hZ2Vy LT5iaW5kRnJhbWVidWZmZXIoR0xfRFJBV19GUkFNRUJVRkZFUiwgZGVzdEdMLT5nZXRGcmFtZWJ1 ZmZlcklEKCkpOworICAgIG1TdGF0ZU1hbmFnZXItPmJpbmRGcmFtZWJ1ZmZlcihHTF9EUkFXX0ZS QU1FQlVGRkVSLCBkZXN0RnJhbWVidWZmZXIpOwogCiAgICAgbVN0YXRlTWFuYWdlci0+YmluZFZl cnRleEFycmF5KG1WQU8sIDApOwogICAgIEFOR0xFX0dMX1RSWShjb250ZXh0LCBtRnVuY3Rpb25z LT5kcmF3QXJyYXlzKEdMX1RSSUFOR0xFUywgMCwgMykpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1Ro aXJkUGFydHkvQU5HTEUvc3JjL2xpYkFOR0xFL3JlbmRlcmVyL2dsL0JsaXRHTC5oIGIvU291cmNl L1RoaXJkUGFydHkvQU5HTEUvc3JjL2xpYkFOR0xFL3JlbmRlcmVyL2dsL0JsaXRHTC5oCmluZGV4 IGMxZmEzMjQ5ZjUwNmQ2OGJhMDMxNjJjYjEwNDY2MjU5NWFjM2Y1NTQuLjdjMjNkYmQ2MmMyYWQ4 M2UxNTk4ZDRmYzdmMzI5NGJmMDljZGZmODQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9UaGlyZFBhcnR5 L0FOR0xFL3NyYy9saWJBTkdMRS9yZW5kZXJlci9nbC9CbGl0R0wuaAorKysgYi9Tb3VyY2UvVGhp cmRQYXJ0eS9BTkdMRS9zcmMvbGliQU5HTEUvcmVuZGVyZXIvZ2wvQmxpdEdMLmgKQEAgLTcyLDYg KzcyLDI0IEBAIGNsYXNzIEJsaXRHTCA6IGFuZ2xlOjpOb25Db3B5YWJsZQogICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBHTGVudW0gZmlsdGVyLAogICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBib29sIHdyaXRlQWxwaGEpOwogCisg ICAgYW5nbGU6OlJlc3VsdCBibGl0Q29sb3JCdWZmZXJXaXRoU2hhZGVyKGNvbnN0IGdsOjpDb250 ZXh0ICpjb250ZXh0LAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICBjb25zdCBnbDo6RnJhbWVidWZmZXIgKnNvdXJjZSwKKyAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgY29uc3QgR0x1aW50IGRlc3RGcmFtZWJ1ZmZlciwKKyAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgY29uc3QgZ2w6OlJlY3Rhbmds ZSAmc291cmNlQXJlYSwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgY29uc3QgZ2w6OlJlY3RhbmdsZSAmZGVzdEFyZWEsCisgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgIEdMZW51bSBmaWx0ZXIsCisgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgIGJvb2wgd3JpdGVBbHBoYSk7CisKKyAgICBhbmdsZTo6 UmVzdWx0IGJsaXRDb2xvckJ1ZmZlcldpdGhTaGFkZXIoY29uc3QgZ2w6OkNvbnRleHQgKmNvbnRl eHQsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGNvbnN0IGds OjpGcmFtZWJ1ZmZlciAqc291cmNlLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICBjb25zdCBHTHVpbnQgZGVzdFRleHR1cmUsCisgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgIGNvbnN0IGdsOjpUZXh0dXJlVGFyZ2V0IGRlc3RUYXJn ZXQsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGNvbnN0IHNp emVfdCBkZXN0TGV2ZWwsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgIGNvbnN0IGdsOjpSZWN0YW5nbGUgJnNvdXJjZUFyZWEsCisgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgIGNvbnN0IGdsOjpSZWN0YW5nbGUgJmRlc3RBcmVhLAor ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBHTGVudW0gZmlsdGVy LAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBib29sIHdyaXRl QWxwaGEpOworCiAgICAgYW5nbGU6OlJlc3VsdCBjb3B5U3ViVGV4dHVyZShjb25zdCBnbDo6Q29u dGV4dCAqY29udGV4dCwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIFRleHR1cmVH TCAqc291cmNlLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgc2l6ZV90IHNvdXJj ZUxldmVsLApkaWZmIC0tZ2l0IGEvU291cmNlL1RoaXJkUGFydHkvQU5HTEUvc3JjL2xpYkFOR0xF L3JlbmRlcmVyL2dsL1RleHR1cmVHTC5jcHAgYi9Tb3VyY2UvVGhpcmRQYXJ0eS9BTkdMRS9zcmMv bGliQU5HTEUvcmVuZGVyZXIvZ2wvVGV4dHVyZUdMLmNwcAppbmRleCA2NmM0ZmZjZjY4ODBmYmE3 NTU4MmQ1NTQzMjU3ZjNhZWNlZTQyOWVjLi5mMTJhZTkzZDE5NjNiZjBjODE1NDRjOTcwMTllNmFi OTVmNWI3ZDZjIDEwMDY0NAotLS0gYS9Tb3VyY2UvVGhpcmRQYXJ0eS9BTkdMRS9zcmMvbGliQU5H TEUvcmVuZGVyZXIvZ2wvVGV4dHVyZUdMLmNwcAorKysgYi9Tb3VyY2UvVGhpcmRQYXJ0eS9BTkdM RS9zcmMvbGliQU5HTEUvcmVuZGVyZXIvZ2wvVGV4dHVyZUdMLmNwcApAQCAtNzEzLDcgKzcxMywx NyBAQCBhbmdsZTo6UmVzdWx0IFRleHR1cmVHTDo6Y29weUltYWdlKGNvbnN0IGdsOjpDb250ZXh0 ICpjb250ZXh0LAogICAgICAgICAgICAgQVNTRVJUKG5hdGl2ZWdsOjpVc2VUZXhJbWFnZTJEKGdl dFR5cGUoKSkpOwogICAgICAgICAgICAgc3RhdGVNYW5hZ2VyLT5iaW5kRnJhbWVidWZmZXIoR0xf UkVBRF9GUkFNRUJVRkZFUiwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgIHNvdXJjZUZyYW1lYnVmZmVyR0wtPmdldEZyYW1lYnVmZmVySUQoKSk7Ci0gICAgICAgICAg ICBpZiAocmVxdWlyZXNJbml0aWFsaXphdGlvbikKKyAgICAgICAgICAgIGlmIChmZWF0dXJlcy5l bXVsYXRlQ29weVRleEltYWdlMkRGcm9tUmVuZGVyYnVmZmVycy5lbmFibGVkICYmIHJlYWRCdWZm ZXIgJiYKKyAgICAgICAgICAgICAgICByZWFkQnVmZmVyLT50eXBlKCkgPT0gR0xfUkVOREVSQlVG RkVSKQorICAgICAgICAgICAgeworICAgICAgICAgICAgICAgIEJsaXRHTCAqYmxpdHRlciA9IEdl dEJsaXRHTChjb250ZXh0KTsKKyAgICAgICAgICAgICAgICBBTkdMRV9UUlkoYmxpdHRlci0+Ymxp dENvbG9yQnVmZmVyV2l0aFNoYWRlcigKKyAgICAgICAgICAgICAgICAgICAgY29udGV4dCwgc291 cmNlLCBtVGV4dHVyZUlELCB0YXJnZXQsIGxldmVsLCBjbGlwcGVkQXJlYSwKKyAgICAgICAgICAg ICAgICAgICAgZ2w6OlJlY3RhbmdsZShkZXN0T2Zmc2V0LngsIGRlc3RPZmZzZXQueSwgY2xpcHBl ZEFyZWEud2lkdGgsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgY2xpcHBlZEFy ZWEuaGVpZ2h0KSwKKyAgICAgICAgICAgICAgICAgICAgR0xfTkVBUkVTVCksIHRydWUpOworICAg ICAgICAgICAgfQorICAgICAgICAgICAgZWxzZSBpZiAocmVxdWlyZXNJbml0aWFsaXphdGlvbikK ICAgICAgICAgICAgIHsKICAgICAgICAgICAgICAgICBBTkdMRV9HTF9UUlkoY29udGV4dCwgZnVu Y3Rpb25zLT5jb3B5VGV4U3ViSW1hZ2UyRCgKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgIFRvR0xlbnVtKHRhcmdldCksIHN0YXRpY19jYXN0PEdMaW50PihsZXZlbCks IGRlc3RPZmZzZXQueCwKQEAgLTc4MSwxMCArNzkxLDI0IEBAIGFuZ2xlOjpSZXN1bHQgVGV4dHVy ZUdMOjpjb3B5U3ViSW1hZ2UoY29uc3QgZ2w6OkNvbnRleHQgKmNvbnRleHQsCiAgICAgICAgIGlm IChuYXRpdmVnbDo6VXNlVGV4SW1hZ2UyRChnZXRUeXBlKCkpKQogICAgICAgICB7CiAgICAgICAg ICAgICBBU1NFUlQoY2xpcHBlZE9mZnNldC56ID09IDApOwotICAgICAgICAgICAgQU5HTEVfR0xf VFJZKGNvbnRleHQsIGZ1bmN0aW9ucy0+Y29weVRleFN1YkltYWdlMkQoCi0gICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgIFRvR0xlbnVtKHRhcmdldCksIHN0YXRpY19jYXN0PEdM aW50PihsZXZlbCksIGNsaXBwZWRPZmZzZXQueCwKLSAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgY2xpcHBlZE9mZnNldC55LCBjbGlwcGVkQXJlYS54LCBjbGlwcGVkQXJlYS55 LAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBjbGlwcGVkQXJlYS53aWR0 aCwgY2xpcHBlZEFyZWEuaGVpZ2h0KSk7CisgICAgICAgICAgICBpZiAoZmVhdHVyZXMuZW11bGF0 ZUNvcHlUZXhJbWFnZTJERnJvbVJlbmRlcmJ1ZmZlcnMuZW5hYmxlZCAmJgorICAgICAgICAgICAg ICAgIHNvdXJjZS0+Z2V0UmVhZENvbG9yQXR0YWNobWVudCgpICYmCisgICAgICAgICAgICAgICAg c291cmNlLT5nZXRSZWFkQ29sb3JBdHRhY2htZW50KCktPnR5cGUoKSA9PSBHTF9SRU5ERVJCVUZG RVIpCisgICAgICAgICAgICB7CisgICAgICAgICAgICAgICAgQmxpdEdMICpibGl0dGVyID0gR2V0 QmxpdEdMKGNvbnRleHQpOworICAgICAgICAgICAgICAgIEFOR0xFX1RSWShibGl0dGVyLT5ibGl0 Q29sb3JCdWZmZXJXaXRoU2hhZGVyKAorICAgICAgICAgICAgICAgICAgICBjb250ZXh0LCBzb3Vy Y2UsIG1UZXh0dXJlSUQsIHRhcmdldCwgbGV2ZWwsIGNsaXBwZWRBcmVhLAorICAgICAgICAgICAg ICAgICAgICBnbDo6UmVjdGFuZ2xlKGNsaXBwZWRPZmZzZXQueCwgY2xpcHBlZE9mZnNldC55LCBj bGlwcGVkQXJlYS53aWR0aCwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBjbGlw cGVkQXJlYS5oZWlnaHQpLAorICAgICAgICAgICAgICAgICAgICBHTF9ORUFSRVNUKSwgdHJ1ZSk7 CisgICAgICAgICAgICB9CisgICAgICAgICAgICBlbHNlCisgICAgICAgICAgICB7CisgICAgICAg ICAgICAgICAgQU5HTEVfR0xfVFJZKGNvbnRleHQsIGZ1bmN0aW9ucy0+Y29weVRleFN1YkltYWdl MkQoCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBUb0dMZW51bSh0 YXJnZXQpLCBzdGF0aWNfY2FzdDxHTGludD4obGV2ZWwpLAorICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgY2xpcHBlZE9mZnNldC54LCBjbGlwcGVkT2Zmc2V0LnksIGNs aXBwZWRBcmVhLngsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBj bGlwcGVkQXJlYS55LCBjbGlwcGVkQXJlYS53aWR0aCwgY2xpcHBlZEFyZWEuaGVpZ2h0KSk7Cisg ICAgICAgICAgICB9CiAgICAgICAgIH0KICAgICAgICAgZWxzZQogICAgICAgICB7CmRpZmYgLS1n aXQgYS9Tb3VyY2UvVGhpcmRQYXJ0eS9BTkdMRS9zcmMvbGliQU5HTEUvcmVuZGVyZXIvZ2wvcmVu ZGVyZXJnbF91dGlscy5jcHAgYi9Tb3VyY2UvVGhpcmRQYXJ0eS9BTkdMRS9zcmMvbGliQU5HTEUv cmVuZGVyZXIvZ2wvcmVuZGVyZXJnbF91dGlscy5jcHAKaW5kZXggZTlkZjU1MGI5MmQzNGMxZWYw YjkxYzFkNzNlMzc4NjI3YTAyMDU4Ni4uNjZmZjEwOWU0Mzk2MDMxMzg2NTU4NGFmMGY1YjE0Yzhm MDgyOGM2YiAxMDA2NDQKLS0tIGEvU291cmNlL1RoaXJkUGFydHkvQU5HTEUvc3JjL2xpYkFOR0xF L3JlbmRlcmVyL2dsL3JlbmRlcmVyZ2xfdXRpbHMuY3BwCisrKyBiL1NvdXJjZS9UaGlyZFBhcnR5 L0FOR0xFL3NyYy9saWJBTkdMRS9yZW5kZXJlci9nbC9yZW5kZXJlcmdsX3V0aWxzLmNwcApAQCAt MTcyMiw2ICsxNzIyLDE0IEBAIHZvaWQgSW5pdGlhbGl6ZUZlYXR1cmVzKGNvbnN0IEZ1bmN0aW9u c0dMICpmdW5jdGlvbnMsIGFuZ2xlOjpGZWF0dXJlc0dMICpmZWF0dXJlCiAgICAgQU5HTEVfRkVB VFVSRV9DT05ESVRJT04oCiAgICAgICAgIGZlYXR1cmVzLCBkaXNhYmxlU2VtYXBob3JlRmQsCiAg ICAgICAgIElzTGludXgoKSAmJiBpc0FNRCAmJiBpc01lc2EgJiYgbWVzYVZlcnNpb24gPCAoc3Rk OjphcnJheTxpbnQsIDM+ezE5LCAzLCA1fSkpOworCisgICAgLy8gYW5nbGVidWcuY29tLzQ2NzQK KyAgICAvLyBUaGUgKHJlZHVuZGFudCkgZXhwbGljaXQgZXhjbHVzaW9uIG9mIFdpbmRvd3MgQU1E IGlzIGJlY2F1c2UgdGhlIHdvcmthcm91bmQgZmFpbHMKKyAgICAvLyBUZXh0dXJlMkRSR1Rlc3Qu VGV4dHVyZVJHVU5vcm1UZXN0IG9uIHRoYXQgcGxhdGZvcm0sIGFuZCB0aGUgdGVzdCBpcyBza2lw cGVkLiBJZgorICAgIC8vIHlvdSdkIGxpa2UgdG8gZW5hYmxlIHRoZSB3b3JrYXJvdW5kIG9uIFdp bmRvd3MgQU1ELCBwbGVhc2UgZml4IHRoZSB0ZXN0IGZpcnN0LgorICAgIEFOR0xFX0ZFQVRVUkVf Q09ORElUSU9OKAorICAgICAgICBmZWF0dXJlcywgZW11bGF0ZUNvcHlUZXhJbWFnZTJERnJvbVJl bmRlcmJ1ZmZlcnMsCisgICAgICAgIElzQXBwbGUoKSAmJiBmdW5jdGlvbnMtPnN0YW5kYXJkID09 IFNUQU5EQVJEX0dMX0VTICYmICEoaXNBTUQgJiYgSXNXaW5kb3dzKCkpKTsKIH0KIAogdm9pZCBJ bml0aWFsaXplRnJvbnRlbmRGZWF0dXJlcyhjb25zdCBGdW5jdGlvbnNHTCAqZnVuY3Rpb25zLCBh bmdsZTo6RnJvbnRlbmRGZWF0dXJlcyAqZmVhdHVyZXMpCmRpZmYgLS1naXQgYS9Tb3VyY2UvVGhp cmRQYXJ0eS9BTkdMRS9zcmMvdGVzdHMvZ2xfdGVzdHMvQ29weVRleEltYWdlVGVzdC5jcHAgYi9T b3VyY2UvVGhpcmRQYXJ0eS9BTkdMRS9zcmMvdGVzdHMvZ2xfdGVzdHMvQ29weVRleEltYWdlVGVz dC5jcHAKaW5kZXggMTYwN2JjOWUxNGZmMDI3ZmVhZTg3MjNkMzhkNWZmNGQ3ODYxNmQyYS4uMzk3 ODJhZGFiZTg2YTg3NDhjNDBjZmQwM2UwY2U5NGE5YmE0YjRiNCAxMDA2NDQKLS0tIGEvU291cmNl L1RoaXJkUGFydHkvQU5HTEUvc3JjL3Rlc3RzL2dsX3Rlc3RzL0NvcHlUZXhJbWFnZVRlc3QuY3Bw CisrKyBiL1NvdXJjZS9UaGlyZFBhcnR5L0FOR0xFL3NyYy90ZXN0cy9nbF90ZXN0cy9Db3B5VGV4 SW1hZ2VUZXN0LmNwcApAQCAtODk1LDcgKzg5NSwxMiBAQCBBTkdMRV9JTlNUQU5USUFURV9URVNU KENvcHlUZXhJbWFnZVRlc3QsCiAgICAgICAgICAgICAgICAgICAgICAgIEVTMl9PUEVOR0woKSwK ICAgICAgICAgICAgICAgICAgICAgICAgRVMyX09QRU5HTEVTKCksCiAgICAgICAgICAgICAgICAg ICAgICAgIEVTMl9WVUxLQU4oKSwKLSAgICAgICAgICAgICAgICAgICAgICAgRVMzX1ZVTEtBTigp KTsKLQotQU5HTEVfSU5TVEFOVElBVEVfVEVTVF9FUzMoQ29weVRleEltYWdlVGVzdEVTMyk7Cisg ICAgICAgICAgICAgICAgICAgICAgIEVTM19WVUxLQU4oKSwKKyAgICAgICAgICAgICAgICAgICAg ICAgV2l0aEVtdWxhdGVDb3B5VGV4SW1hZ2UyREZyb21SZW5kZXJidWZmZXJzKEVTMl9PUEVOR0wo KSksCisgICAgICAgICAgICAgICAgICAgICAgIFdpdGhFbXVsYXRlQ29weVRleEltYWdlMkRGcm9t UmVuZGVyYnVmZmVycyhFUzJfT1BFTkdMRVMoKSkpOworCitBTkdMRV9JTlNUQU5USUFURV9URVNU KENvcHlUZXhJbWFnZVRlc3RFUzMsCisgICAgICAgICAgICAgICAgICAgICAgIEFOR0xFX0FMTF9U RVNUX1BMQVRGT1JNU19FUzMsCisgICAgICAgICAgICAgICAgICAgICAgIFdpdGhFbXVsYXRlQ29w eVRleEltYWdlMkRGcm9tUmVuZGVyYnVmZmVycyhFUzNfT1BFTkdMKCkpLAorICAgICAgICAgICAg ICAgICAgICAgICBXaXRoRW11bGF0ZUNvcHlUZXhJbWFnZTJERnJvbVJlbmRlcmJ1ZmZlcnMoRVMz X09QRU5HTEVTKCkpKTsKIH0gIC8vIG5hbWVzcGFjZSBhbmdsZQpkaWZmIC0tZ2l0IGEvU291cmNl L1RoaXJkUGFydHkvQU5HTEUvc3JjL3Rlc3RzL2dsX3Rlc3RzL1RleHR1cmVUZXN0LmNwcCBiL1Nv dXJjZS9UaGlyZFBhcnR5L0FOR0xFL3NyYy90ZXN0cy9nbF90ZXN0cy9UZXh0dXJlVGVzdC5jcHAK aW5kZXggMDdlYTI0ODFiMzNhMWZhYzJiMWViNzkzYmVhNGJhZTc4ODg3N2ZkMS4uMTI2Yjk0OTEw YzJlYTk3Y2E4NDA1YzkwNTdjN2FkMmEwY2NjZDNkZSAxMDA2NDQKLS0tIGEvU291cmNlL1RoaXJk UGFydHkvQU5HTEUvc3JjL3Rlc3RzL2dsX3Rlc3RzL1RleHR1cmVUZXN0LmNwcAorKysgYi9Tb3Vy Y2UvVGhpcmRQYXJ0eS9BTkdMRS9zcmMvdGVzdHMvZ2xfdGVzdHMvVGV4dHVyZVRlc3QuY3BwCkBA IC00NTM3LDYgKzQ1MzcsMTAgQEAgY2xhc3MgVGV4dHVyZTJEUkdUZXN0IDogcHVibGljIFRleHR1 cmUyRFRlc3QKIFRFU1RfUChUZXh0dXJlMkRSR1Rlc3QsIFRleHR1cmVSR1VOb3JtVGVzdCkKIHsK ICAgICBBTkdMRV9TS0lQX1RFU1RfSUYoIUlzR0xFeHRlbnNpb25FbmFibGVkKCJHTF9FWFRfdGV4 dHVyZV9yZyIpKTsKKyAgICAvLyBUaGlzIHdvcmthcm91bmQgY2F1c2VzIGEgR0wgZXJyb3Igb24g V2luZG93cyBBTUQsIHdoaWNoIGlzIGxpa2VseSBhIGRyaXZlciBidWcuCisgICAgLy8gVGhlIHdv cmthcm91bmQgaXMgbm90IGludGVuZGVkIHRvIGJlIGVuYWJsZWQgaW4gdGhpcyBjb25maWd1cmF0 aW9uIHNvIHNraXAgaXQuCisgICAgQU5HTEVfU0tJUF9URVNUX0lGKEdldFBhcmFtKCkuZWdsUGFy YW1ldGVycy5lbXVsYXRlQ29weVRleEltYWdlMkRGcm9tUmVuZGVyYnVmZmVycyAmJgorICAgICAg ICAgICAgICAgICAgICAgICBJc1dpbmRvd3MoKSAmJiBJc0FNRCgpKTsKIAogICAgIEdMdWJ5dGUg cGl4ZWxWYWx1ZSAgPSAweGFiOwogICAgIEdMdWJ5dGUgaW1hZ2VEYXRhW10gPSB7cGl4ZWxWYWx1 ZSwgcGl4ZWxWYWx1ZX07CkBAIC02MjA4LDcgKzYyMTIsMTMgQEAgVEVTVF9QKEVUQzFDb21wcmVz c2VkVGV4dHVyZVRlc3QsIEVUQzFTaHJpbmtUaGVuR3Jvd01heExldmVscykKIAogLy8gVXNlIHRo aXMgdG8gc2VsZWN0IHdoaWNoIGNvbmZpZ3VyYXRpb25zIChlLmcuIHdoaWNoIHJlbmRlcmVyLCB3 aGljaCBHTEVTIG1ham9yIHZlcnNpb24pIHRoZXNlCiAvLyB0ZXN0cyBzaG91bGQgYmUgcnVuIGFn YWluc3QuCi1BTkdMRV9JTlNUQU5USUFURV9URVNUX0VTMihUZXh0dXJlMkRUZXN0KTsKKyNkZWZp bmUgRVMyX0VNVUxBVEVfQ09QWV9URVhfSU1BR0UoKSAgICAgICAgICAgICAgICAgICAgICAgICAg XAorICAgIFdpdGhFbXVsYXRlQ29weVRleEltYWdlMkRGcm9tUmVuZGVyYnVmZmVycyhFUzJfT1BF TkdMKCkpLCBcCisgICAgICAgIFdpdGhFbXVsYXRlQ29weVRleEltYWdlMkRGcm9tUmVuZGVyYnVm ZmVycyhFUzJfT1BFTkdMRVMoKSkKKyNkZWZpbmUgRVMzX0VNVUxBVEVfQ09QWV9URVhfSU1BR0Uo KSAgICAgICAgICAgICAgICAgICAgICAgICAgXAorICAgIFdpdGhFbXVsYXRlQ29weVRleEltYWdl MkRGcm9tUmVuZGVyYnVmZmVycyhFUzNfT1BFTkdMKCkpLCBcCisgICAgICAgIFdpdGhFbXVsYXRl Q29weVRleEltYWdlMkRGcm9tUmVuZGVyYnVmZmVycyhFUzNfT1BFTkdMRVMoKSkKK0FOR0xFX0lO U1RBTlRJQVRFX1RFU1QoVGV4dHVyZTJEVGVzdCwgQU5HTEVfQUxMX1RFU1RfUExBVEZPUk1TX0VT MiwgRVMyX0VNVUxBVEVfQ09QWV9URVhfSU1BR0UoKSk7CiBBTkdMRV9JTlNUQU5USUFURV9URVNU X0VTMihUZXh0dXJlQ3ViZVRlc3QpOwogQU5HTEVfSU5TVEFOVElBVEVfVEVTVF9FUzIoVGV4dHVy ZTJEVGVzdFdpdGhEcmF3U2NhbGUpOwogQU5HTEVfSU5TVEFOVElBVEVfVEVTVF9FUzIoU2FtcGxl cjJEQXNGdW5jdGlvblBhcmFtZXRlclRlc3QpOwpAQCAtNjIzMyw3ICs2MjQzLDExIEBAIEFOR0xF X0lOU1RBTlRJQVRFX1RFU1RfRVMzKFRleHR1cmVCb3JkZXJDbGFtcFRlc3RFUzMpOwogQU5HTEVf SU5TVEFOVElBVEVfVEVTVF9FUzMoVGV4dHVyZUJvcmRlckNsYW1wSW50ZWdlclRlc3RFUzMpOwog QU5HTEVfSU5TVEFOVElBVEVfVEVTVF9FUzIoVGV4dHVyZUxpbWl0c1Rlc3QpOwogQU5HTEVfSU5T VEFOVElBVEVfVEVTVF9FUzMoVGV4dHVyZTJETm9ybTE2VGVzdEVTMyk7Ci1BTkdMRV9JTlNUQU5U SUFURV9URVNUX0VTMl9BTkRfRVMzKFRleHR1cmUyRFJHVGVzdCk7CitBTkdMRV9JTlNUQU5USUFU RV9URVNUKFRleHR1cmUyRFJHVGVzdCwKKyAgICAgICAgICAgICAgICAgICAgICAgQU5HTEVfQUxM X1RFU1RfUExBVEZPUk1TX0VTMiwKKyAgICAgICAgICAgICAgICAgICAgICAgQU5HTEVfQUxMX1RF U1RfUExBVEZPUk1TX0VTMywKKyAgICAgICAgICAgICAgICAgICAgICAgRVMyX0VNVUxBVEVfQ09Q WV9URVhfSU1BR0UoKSwKKyAgICAgICAgICAgICAgICAgICAgICAgRVMzX0VNVUxBVEVfQ09QWV9U RVhfSU1BR0UoKSk7CiBBTkdMRV9JTlNUQU5USUFURV9URVNUX0VTMyhUZXh0dXJlMkRGbG9hdFRl c3RFUzMpOwogQU5HTEVfSU5TVEFOVElBVEVfVEVTVF9FUzIoVGV4dHVyZTJERmxvYXRUZXN0RVMy KTsKIEFOR0xFX0lOU1RBTlRJQVRFX1RFU1RfRVMzKFRleHR1cmVDdWJlVGVzdEVTMyk7CmRpZmYg LS1naXQgYS9Tb3VyY2UvVGhpcmRQYXJ0eS9BTkdMRS9zcmMvdGVzdHMvdGVzdF91dGlscy9hbmds ZV90ZXN0X2NvbmZpZ3MuY3BwIGIvU291cmNlL1RoaXJkUGFydHkvQU5HTEUvc3JjL3Rlc3RzL3Rl c3RfdXRpbHMvYW5nbGVfdGVzdF9jb25maWdzLmNwcAppbmRleCBkMzdiZmNkN2EwOGEyZjQ5MTJl YzMxODg0ODE5YjczNWY4ZTBlNjAzLi5mZmU3YjU5M2Y5YTk5YzNlNDNmOTVkZDYyNjUxZGM5Nzll OGY5NDM5IDEwMDY0NAotLS0gYS9Tb3VyY2UvVGhpcmRQYXJ0eS9BTkdMRS9zcmMvdGVzdHMvdGVz dF91dGlscy9hbmdsZV90ZXN0X2NvbmZpZ3MuY3BwCisrKyBiL1NvdXJjZS9UaGlyZFBhcnR5L0FO R0xFL3NyYy90ZXN0cy90ZXN0X3V0aWxzL2FuZ2xlX3Rlc3RfY29uZmlncy5jcHAKQEAgLTIwNCw2 ICsyMDQsMTEgQEAgc3RkOjpvc3RyZWFtICZvcGVyYXRvcjw8KHN0ZDo6b3N0cmVhbSAmc3RyZWFt LCBjb25zdCBQbGF0Zm9ybVBhcmFtZXRlcnMgJnBwKQogICAgICAgICBzdHJlYW0gPDwgIl9BbGxv Y2F0ZU5vblplcm9NZW1vcnkiOwogICAgIH0KIAorICAgIGlmIChwcC5lZ2xQYXJhbWV0ZXJzLmVt dWxhdGVDb3B5VGV4SW1hZ2UyREZyb21SZW5kZXJidWZmZXJzID09IEVHTF9UUlVFKQorICAgIHsK KyAgICAgICAgc3RyZWFtIDw8ICJfRW11bGF0ZUNvcHlUZXhJbWFnZTJERnJvbVJlbmRlcmJ1ZmZl cnMiOworICAgIH0KKwogICAgIHJldHVybiBzdHJlYW07CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJj ZS9UaGlyZFBhcnR5L0FOR0xFL3NyYy90ZXN0cy90ZXN0X3V0aWxzL2FuZ2xlX3Rlc3RfY29uZmln cy5oIGIvU291cmNlL1RoaXJkUGFydHkvQU5HTEUvc3JjL3Rlc3RzL3Rlc3RfdXRpbHMvYW5nbGVf dGVzdF9jb25maWdzLmgKaW5kZXggYzZkNDQ2MDc1MWYyMDZjZDBkNDM4ZjY0YjAzODljNGFjZTJl ZDRkNS4uNDlkMDRmMzExMDkzZjhjNDQ2MDBlYzk2YjE3OGNmNTYxOTQyNzdmNiAxMDA2NDQKLS0t IGEvU291cmNlL1RoaXJkUGFydHkvQU5HTEUvc3JjL3Rlc3RzL3Rlc3RfdXRpbHMvYW5nbGVfdGVz dF9jb25maWdzLmgKKysrIGIvU291cmNlL1RoaXJkUGFydHkvQU5HTEUvc3JjL3Rlc3RzL3Rlc3Rf dXRpbHMvYW5nbGVfdGVzdF9jb25maWdzLmgKQEAgLTIxOSw2ICsyMTksMTQgQEAgaW5saW5lIFBs YXRmb3JtUGFyYW1ldGVycyBXaXRoQWxsb2NhdGVOb25aZXJvTWVtb3J5KGNvbnN0IFBsYXRmb3Jt UGFyYW1ldGVycyAmcGEKICAgICByZXR1cm4gYWxsb2NhdGVOb25aZXJvOwogfQogCitpbmxpbmUg UGxhdGZvcm1QYXJhbWV0ZXJzIFdpdGhFbXVsYXRlQ29weVRleEltYWdlMkRGcm9tUmVuZGVyYnVm ZmVycygKKyAgICBjb25zdCBQbGF0Zm9ybVBhcmFtZXRlcnMgJnBhcmFtcykKK3sKKyAgICBQbGF0 Zm9ybVBhcmFtZXRlcnMgcCAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgPSBwYXJh bXM7CisgICAgcC5lZ2xQYXJhbWV0ZXJzLmVtdWxhdGVDb3B5VGV4SW1hZ2UyREZyb21SZW5kZXJi dWZmZXJzID0gRUdMX1RSVUU7CisgICAgcmV0dXJuIHA7Cit9CisKIGlubGluZSBQbGF0Zm9ybVBh cmFtZXRlcnMgV2l0aFJvYnVzdG5lc3MoY29uc3QgUGxhdGZvcm1QYXJhbWV0ZXJzICZwYXJhbXMp CiB7CiAgICAgUGxhdGZvcm1QYXJhbWV0ZXJzIHdpdGhSb2J1c3RuZXNzICAgICAgID0gcGFyYW1z OwpkaWZmIC0tZ2l0IGEvU291cmNlL1RoaXJkUGFydHkvQU5HTEUvdXRpbC9FR0xQbGF0Zm9ybVBh cmFtZXRlcnMuaCBiL1NvdXJjZS9UaGlyZFBhcnR5L0FOR0xFL3V0aWwvRUdMUGxhdGZvcm1QYXJh bWV0ZXJzLmgKaW5kZXggOTEyMjM2N2NhN2RmOWEyNzM0OGU4YzNiYWMxNDhjZTYwYzRlNGNmNC4u OTRhYTZkMTcxZDI4MGEyNjM3YTllOTdmOTY5Mjc2Y2E5NjAwYTU0YiAxMDA2NDQKLS0tIGEvU291 cmNlL1RoaXJkUGFydHkvQU5HTEUvdXRpbC9FR0xQbGF0Zm9ybVBhcmFtZXRlcnMuaAorKysgYi9T b3VyY2UvVGhpcmRQYXJ0eS9BTkdMRS91dGlsL0VHTFBsYXRmb3JtUGFyYW1ldGVycy5oCkBAIC02 MCwyMCArNjAsMjIgQEAgc3RydWN0IEVHTFBsYXRmb3JtUGFyYW1ldGVycwogICAgIHsKICAgICAg ICAgcmV0dXJuIHN0ZDo6dGllKHJlbmRlcmVyLCBtYWpvclZlcnNpb24sIG1pbm9yVmVyc2lvbiwg ZGV2aWNlVHlwZSwgcHJlc2VudFBhdGgsCiAgICAgICAgICAgICAgICAgICAgICAgICBkZWJ1Z0xh eWVyc0VuYWJsZWQsIGNvbnRleHRWaXJ0dWFsaXphdGlvbiwgdHJhbnNmb3JtRmVlZGJhY2tGZWF0 dXJlLAotICAgICAgICAgICAgICAgICAgICAgICAgYWxsb2NhdGVOb25aZXJvTWVtb3J5RmVhdHVy ZSwgcGxhdGZvcm1NZXRob2RzLCByb2J1c3RuZXNzKTsKKyAgICAgICAgICAgICAgICAgICAgICAg IGFsbG9jYXRlTm9uWmVyb01lbW9yeUZlYXR1cmUsIGVtdWxhdGVDb3B5VGV4SW1hZ2UyREZyb21S ZW5kZXJidWZmZXJzLAorICAgICAgICAgICAgICAgICAgICAgICAgcGxhdGZvcm1NZXRob2RzLCBy b2J1c3RuZXNzKTsKICAgICB9CiAKLSAgICBFR0xpbnQgcmVuZGVyZXIgICAgICAgICAgICAgICAg ICAgICAgICAgPSBFR0xfUExBVEZPUk1fQU5HTEVfVFlQRV9ERUZBVUxUX0FOR0xFOwotICAgIEVH TGludCBtYWpvclZlcnNpb24gICAgICAgICAgICAgICAgICAgICA9IEVHTF9ET05UX0NBUkU7Ci0g ICAgRUdMaW50IG1pbm9yVmVyc2lvbiAgICAgICAgICAgICAgICAgICAgID0gRUdMX0RPTlRfQ0FS RTsKLSAgICBFR0xpbnQgZGV2aWNlVHlwZSAgICAgICAgICAgICAgICAgICAgICAgPSBFR0xfUExB VEZPUk1fQU5HTEVfREVWSUNFX1RZUEVfSEFSRFdBUkVfQU5HTEU7Ci0gICAgRUdMaW50IHByZXNl bnRQYXRoICAgICAgICAgICAgICAgICAgICAgID0gRUdMX0RPTlRfQ0FSRTsKLSAgICBFR0xpbnQg ZGVidWdMYXllcnNFbmFibGVkICAgICAgICAgICAgICAgPSBFR0xfRE9OVF9DQVJFOwotICAgIEVH TGludCBjb250ZXh0VmlydHVhbGl6YXRpb24gICAgICAgICAgICA9IEVHTF9ET05UX0NBUkU7Ci0g ICAgRUdMaW50IHJvYnVzdG5lc3MgICAgICAgICAgICAgICAgICAgICAgID0gRUdMX0RPTlRfQ0FS RTsKLSAgICBFR0xpbnQgdHJhbnNmb3JtRmVlZGJhY2tGZWF0dXJlICAgICAgICAgPSBFR0xfRE9O VF9DQVJFOwotICAgIEVHTGludCBhbGxvY2F0ZU5vblplcm9NZW1vcnlGZWF0dXJlICAgICA9IEVH TF9ET05UX0NBUkU7Ci0gICAgYW5nbGU6OlBsYXRmb3JtTWV0aG9kcyAqcGxhdGZvcm1NZXRob2Rz ID0gbnVsbHB0cjsKKyAgICBFR0xpbnQgcmVuZGVyZXIgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgPSBFR0xfUExBVEZPUk1fQU5HTEVfVFlQRV9ERUZBVUxUX0FOR0xFOworICAgIEVHTGlu dCBtYWpvclZlcnNpb24gICAgICAgICAgICAgICAgICAgICAgICAgICA9IEVHTF9ET05UX0NBUkU7 CisgICAgRUdMaW50IG1pbm9yVmVyc2lvbiAgICAgICAgICAgICAgICAgICAgICAgICAgID0gRUdM X0RPTlRfQ0FSRTsKKyAgICBFR0xpbnQgZGV2aWNlVHlwZSAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgPSBFR0xfUExBVEZPUk1fQU5HTEVfREVWSUNFX1RZUEVfSEFSRFdBUkVfQU5HTEU7Cisg ICAgRUdMaW50IHByZXNlbnRQYXRoICAgICAgICAgICAgICAgICAgICAgICAgICAgID0gRUdMX0RP TlRfQ0FSRTsKKyAgICBFR0xpbnQgZGVidWdMYXllcnNFbmFibGVkICAgICAgICAgICAgICAgICAg ICAgPSBFR0xfRE9OVF9DQVJFOworICAgIEVHTGludCBjb250ZXh0VmlydHVhbGl6YXRpb24gICAg ICAgICAgICAgICAgICA9IEVHTF9ET05UX0NBUkU7CisgICAgRUdMaW50IHJvYnVzdG5lc3MgICAg ICAgICAgICAgICAgICAgICAgICAgICAgID0gRUdMX0RPTlRfQ0FSRTsKKyAgICBFR0xpbnQgdHJh bnNmb3JtRmVlZGJhY2tGZWF0dXJlICAgICAgICAgICAgICAgPSBFR0xfRE9OVF9DQVJFOworICAg IEVHTGludCBhbGxvY2F0ZU5vblplcm9NZW1vcnlGZWF0dXJlICAgICAgICAgICA9IEVHTF9ET05U X0NBUkU7CisgICAgRUdMaW50IGVtdWxhdGVDb3B5VGV4SW1hZ2UyREZyb21SZW5kZXJidWZmZXJz ID0gRUdMX0RPTlRfQ0FSRTsKKyAgICBhbmdsZTo6UGxhdGZvcm1NZXRob2RzICpwbGF0Zm9ybU1l dGhvZHMgICAgICAgPSBudWxscHRyOwogfTsKIAogaW5saW5lIGJvb2wgb3BlcmF0b3I8KGNvbnN0 IEVHTFBsYXRmb3JtUGFyYW1ldGVycyAmYSwgY29uc3QgRUdMUGxhdGZvcm1QYXJhbWV0ZXJzICZi KQpkaWZmIC0tZ2l0IGEvU291cmNlL1RoaXJkUGFydHkvQU5HTEUvdXRpbC9FR0xXaW5kb3cuY3Bw IGIvU291cmNlL1RoaXJkUGFydHkvQU5HTEUvdXRpbC9FR0xXaW5kb3cuY3BwCmluZGV4IGMyNTcy OTBkZmM0NTliZDlkNjY0OTI5MjNjYzFkMDc2MjlkMmIxMDAuLmI3MjNhYWNkZDhjNzc3NTVhODA4 NjhkZTI3MjY5ZDQ5YzRiMzJmNTMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9UaGlyZFBhcnR5L0FOR0xF L3V0aWwvRUdMV2luZG93LmNwcAorKysgYi9Tb3VyY2UvVGhpcmRQYXJ0eS9BTkdMRS91dGlsL0VH TFdpbmRvdy5jcHAKQEAgLTE5MSw2ICsxOTEsMTEgQEAgYm9vbCBFR0xXaW5kb3c6OmluaXRpYWxp emVEaXNwbGF5KE9TV2luZG93ICpvc1dpbmRvdywKICAgICAgICAgZGlzYWJsZWRGZWF0dXJlT3Zl cnJpZGVzLnB1c2hfYmFjaygiYWxsb2NhdGVfbm9uX3plcm9fbWVtb3J5Iik7CiAgICAgfQogCisg ICAgaWYgKHBhcmFtcy5lbXVsYXRlQ29weVRleEltYWdlMkRGcm9tUmVuZGVyYnVmZmVycyA9PSBF R0xfVFJVRSkKKyAgICB7CisgICAgICAgIGVuYWJsZWRGZWF0dXJlT3ZlcnJpZGVzLnB1c2hfYmFj aygiZW11bGF0ZV9jb3B5dGV4aW1hZ2UyZF9mcm9tX3JlbmRlcmJ1ZmZlcnMiKTsKKyAgICB9CisK ICAgICBpZiAoIWRpc2FibGVkRmVhdHVyZU92ZXJyaWRlcy5lbXB0eSgpKQogICAgIHsKICAgICAg ICAgaWYgKHN0cnN0cihleHRlbnNpb25TdHJpbmcsICJFR0xfQU5HTEVfZmVhdHVyZV9jb250cm9s IikgPT0gbnVsbHB0cikK 401205 2020-06-05 15:13:53 -0700 2020-06-07 14:08:04 -0700 Patch bug-212249-20200605151352.patch text/plain 21675 jdarpinian U3VidmVyc2lvbiBSZXZpc2lvbjogMjYyNTg5CmRpZmYgLS1naXQgYS9Tb3VyY2UvVGhpcmRQYXJ0 eS9BTkdMRS9DaGFuZ2VMb2cgYi9Tb3VyY2UvVGhpcmRQYXJ0eS9BTkdMRS9DaGFuZ2VMb2cKaW5k ZXggZWZlZjM0MTZmOGUyMzc1NzY1YTExMGIzOWZjZGQ3NDg5ZWIxMDg0OC4uOTcxNWMyMTdhODFk OWVmYmVhNmRmYjAxNWQzY2Y1YTk1Yzg3MmFjNyAxMDA2NDQKLS0tIGEvU291cmNlL1RoaXJkUGFy dHkvQU5HTEUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9UaGlyZFBhcnR5L0FOR0xFL0NoYW5nZUxv ZwpAQCAtMSwzICsxLDMzIEBACisyMDIwLTA2LTA0ICBKYW1lcyBEYXJwaW5pYW4gIDxqZGFycGlu aWFuQGNocm9taXVtLm9yZz4KKworICAgICAgICBbQU5HTEUgLSBpT1NdIGZhc3QvY2FudmFzL3dl YmdsL3VuaW5pdGlhbGl6ZWQtdGVzdC5odG1sIGlzIHN0aWxsIGZhaWxpbmcKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIxMjI0OQorCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIGNvcHlUZXhJbWFnZTJEIGlzIGJy b2tlbiBpbiBzb21lIHdheSBvbiBpT1MuIFdvcmsgYXJvdW5kIGl0IGJ5IHJlaW1wbGVtZW50aW5n CisgICAgICAgIGl0IHdpdGggQU5HTEUncyBCbGl0R0wgY2xhc3MuCisKKyAgICAgICAgKiBpbmNs dWRlL3BsYXRmb3JtL0ZlYXR1cmVzR0wuaDoKKyAgICAgICAgKiBzcmMvbGliQU5HTEUvcmVuZGVy ZXIvZ2wvQmxpdEdMLmNwcDoKKyAgICAgICAgKHJ4OjpCbGl0R0w6OmJsaXRDb2xvckJ1ZmZlcldp dGhTaGFkZXIpOgorICAgICAgICAqIHNyYy9saWJBTkdMRS9yZW5kZXJlci9nbC9CbGl0R0wuaDoK KyAgICAgICAgKiBzcmMvbGliQU5HTEUvcmVuZGVyZXIvZ2wvVGV4dHVyZUdMLmNwcDoKKyAgICAg ICAgKHJ4OjpUZXh0dXJlR0w6OmNvcHlJbWFnZSk6CisgICAgICAgIChyeDo6VGV4dHVyZUdMOjpj b3B5U3ViSW1hZ2UpOgorICAgICAgICAqIHNyYy9saWJBTkdMRS9yZW5kZXJlci9nbC9yZW5kZXJl cmdsX3V0aWxzLmNwcDoKKyAgICAgICAgKHJ4OjpuYXRpdmVnbF9nbDo6SW5pdGlhbGl6ZUZlYXR1 cmVzKToKKyAgICAgICAgKiBzcmMvdGVzdHMvZ2xfdGVzdHMvQ29weVRleEltYWdlVGVzdC5jcHA6 CisgICAgICAgICogc3JjL3Rlc3RzL2dsX3Rlc3RzL1RleHR1cmVUZXN0LmNwcDoKKyAgICAgICAg KiBzcmMvdGVzdHMvdGVzdF91dGlscy9hbmdsZV90ZXN0X2NvbmZpZ3MuY3BwOgorICAgICAgICAo YW5nbGU6Om9wZXJhdG9yPDwpOgorICAgICAgICAqIHNyYy90ZXN0cy90ZXN0X3V0aWxzL2FuZ2xl X3Rlc3RfY29uZmlncy5oOgorICAgICAgICAoYW5nbGU6OldpdGhFbXVsYXRlQ29weVRleEltYWdl MkRGcm9tUmVuZGVyYnVmZmVycyk6CisgICAgICAgICogdXRpbC9FR0xQbGF0Zm9ybVBhcmFtZXRl cnMuaDoKKyAgICAgICAgKEVHTFBsYXRmb3JtUGFyYW1ldGVyczo6dGllIGNvbnN0KToKKyAgICAg ICAgKiB1dGlsL0VHTFdpbmRvdy5jcHA6CisgICAgICAgIChFR0xXaW5kb3c6OmluaXRpYWxpemVE aXNwbGF5KToKKwogMjAyMC0wNi0wNCAgVGltIEhvcnRvbiAgPHRpbW90aHlfaG9ydG9uQGFwcGxl LmNvbT4KIAogICAgICAgICBXb3JrIGFyb3VuZCBicm9rZW4gc3lzdGVtIHZlcnNpb24gbWFjcm8K ZGlmZiAtLWdpdCBhL1NvdXJjZS9UaGlyZFBhcnR5L0FOR0xFL2luY2x1ZGUvcGxhdGZvcm0vRmVh dHVyZXNHTC5oIGIvU291cmNlL1RoaXJkUGFydHkvQU5HTEUvaW5jbHVkZS9wbGF0Zm9ybS9GZWF0 dXJlc0dMLmgKaW5kZXggNTc1NjAyOWZiNTM4ZmQwYTZmMGMzYjNhYTM5YjA1ZWJmN2UyZTRhNC4u NDExYzllNDM2MzlhZGMzZTE0ZjAzNjVlN2QzZWI2ODc1N2NiZGQ0ZCAxMDA2NDQKLS0tIGEvU291 cmNlL1RoaXJkUGFydHkvQU5HTEUvaW5jbHVkZS9wbGF0Zm9ybS9GZWF0dXJlc0dMLmgKKysrIGIv U291cmNlL1RoaXJkUGFydHkvQU5HTEUvaW5jbHVkZS9wbGF0Zm9ybS9GZWF0dXJlc0dMLmgKQEAg LTQ0Miw2ICs0NDIsMTEgQEAgc3RydWN0IEZlYXR1cmVzR0wgOiBGZWF0dXJlU2V0QmFzZQogICAg IEZlYXR1cmUgZGlzYWJsZVNlbWFwaG9yZUZkID0geyJkaXNhYmxlX3NlbWFwaG9yZV9mZCIsIEZl YXR1cmVDYXRlZ29yeTo6T3BlbkdMV29ya2Fyb3VuZHMsCiAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgIkRpc2FibGUgR0xfRVhUX3NlbWFwaG9yZV9mZCBleHRlbnNpb24iLCAmbWVt YmVycywKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAiaHR0cHM6Ly9jcmJ1Zy5j b20vMTA0NjQ2MiJ9OworCisgICAgRmVhdHVyZSBlbXVsYXRlQ29weVRleEltYWdlMkRGcm9tUmVu ZGVyYnVmZmVycyA9IHsKKyAgICAgICAgImVtdWxhdGVfY29weXRleGltYWdlMmRfZnJvbV9yZW5k ZXJidWZmZXJzIiwgRmVhdHVyZUNhdGVnb3J5OjpPcGVuR0xXb3JrYXJvdW5kcywKKyAgICAgICAg IkNvcHlUZXhJbWFnZTJEIHNwdXJpb3VzbHkgcmV0dXJucyBlcnJvcnMgb24gaU9TIHdoZW4gY29w eWluZyBmcm9tIHJlbmRlcmJ1ZmZlcnMuIiwKKyAgICAgICAgJm1lbWJlcnMsICJodHRwczovL2Fu Z2xlYnVnLmNvbS80Njc0In07CiB9OwogCiBpbmxpbmUgRmVhdHVyZXNHTDo6RmVhdHVyZXNHTCgp ICA9IGRlZmF1bHQ7CmRpZmYgLS1naXQgYS9Tb3VyY2UvVGhpcmRQYXJ0eS9BTkdMRS9zcmMvbGli QU5HTEUvcmVuZGVyZXIvZ2wvQmxpdEdMLmNwcCBiL1NvdXJjZS9UaGlyZFBhcnR5L0FOR0xFL3Ny Yy9saWJBTkdMRS9yZW5kZXJlci9nbC9CbGl0R0wuY3BwCmluZGV4IDc1NzE2OGNlYTNlZDJhNTEx ZmMyZWEyZDMxNzk3ODBiZWMwODQzOTUuLjVmZTYxZmY4ZDU0MWViYjk0OGI3MGQ4YmFhY2U5ZTBk NGQ2MWZhYzkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9UaGlyZFBhcnR5L0FOR0xFL3NyYy9saWJBTkdM RS9yZW5kZXJlci9nbC9CbGl0R0wuY3BwCisrKyBiL1NvdXJjZS9UaGlyZFBhcnR5L0FOR0xFL3Ny Yy9saWJBTkdMRS9yZW5kZXJlci9nbC9CbGl0R0wuY3BwCkBAIC0zOTMsNiArMzkzLDM0IEBAIGFu Z2xlOjpSZXN1bHQgQmxpdEdMOjpjb3B5U3ViSW1hZ2VUb0xVTUFXb3JrYXJvdW5kVGV4dHVyZShj b25zdCBnbDo6Q29udGV4dCAqY29uCiAgICAgcmV0dXJuIGFuZ2xlOjpSZXN1bHQ6OkNvbnRpbnVl OwogfQogCithbmdsZTo6UmVzdWx0IEJsaXRHTDo6YmxpdENvbG9yQnVmZmVyV2l0aFNoYWRlcihj b25zdCBnbDo6Q29udGV4dCAqY29udGV4dCwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgIGNvbnN0IGdsOjpGcmFtZWJ1ZmZlciAqc291cmNlLAorICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgY29uc3QgR0x1aW50IGRl c3RUZXh0dXJlLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgY29uc3QgZ2w6OlRleHR1cmVUYXJnZXQgZGVzdFRhcmdldCwKKyAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGNvbnN0IHNpemVfdCBkZXN0TGV2ZWwsCisg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBjb25zdCBnbDo6 UmVjdGFuZ2xlICZzb3VyY2VBcmVhSW4sCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICBjb25zdCBnbDo6UmVjdGFuZ2xlICZkZXN0QXJlYUluLAorICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgR0xlbnVtIGZpbHRlciwK KyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGJvb2wgd3Jp dGVBbHBoYSkKK3sKKyAgICBBTkdMRV9UUlkoaW5pdGlhbGl6ZVJlc291cmNlcyhjb250ZXh0KSk7 CisgICAgbVN0YXRlTWFuYWdlci0+YmluZEZyYW1lYnVmZmVyKEdMX0ZSQU1FQlVGRkVSLCBtU2Ny YXRjaEZCTyk7CisgICAgQU5HTEVfR0xfVFJZKGNvbnRleHQsIG1GdW5jdGlvbnMtPmZyYW1lYnVm ZmVyVGV4dHVyZTJEKEdMX0ZSQU1FQlVGRkVSLCBHTF9DT0xPUl9BVFRBQ0hNRU5UMCwKKyAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgVG9H TGVudW0oZGVzdFRhcmdldCksIGRlc3RUZXh0dXJlLAorICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBzdGF0aWNfY2FzdDxHTGludD4oZGVz dExldmVsKSkpOworICAgIEdMZW51bSBzdGF0dXMgPSBBTkdMRV9HTF9UUlkoY29udGV4dCwgbUZ1 bmN0aW9ucy0+Y2hlY2tGcmFtZWJ1ZmZlclN0YXR1cyhHTF9GUkFNRUJVRkZFUikpOworICAgIGlm IChzdGF0dXMgIT0gR0xfRlJBTUVCVUZGRVJfQ09NUExFVEUpCisgICAgeworICAgICAgICByZXR1 cm4gYW5nbGU6OlJlc3VsdDo6U3RvcDsKKyAgICB9CisgICAgYW5nbGU6OlJlc3VsdCByZXN1bHQg PSBibGl0Q29sb3JCdWZmZXJXaXRoU2hhZGVyKGNvbnRleHQsIHNvdXJjZSwgbVNjcmF0Y2hGQk8s IHNvdXJjZUFyZWFJbiwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgZGVzdEFyZWFJbiwgZmlsdGVyLCB3cml0ZUFscGhhKTsKKyAgICAvLyBVbmJp bmQgdGhlIHRleHR1cmUgZnJvbSB0aGUgdGhlIHNjcmF0Y2ggZnJhbWVidWZmZXIuCisgICAgQU5H TEVfR0xfVFJZKGNvbnRleHQsIG1GdW5jdGlvbnMtPmZyYW1lYnVmZmVyUmVuZGVyYnVmZmVyKEdM X0ZSQU1FQlVGRkVSLCBHTF9DT0xPUl9BVFRBQ0hNRU5UMCwKKyAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgR0xfUkVOREVSQlVGRkVS LCAwKSk7CisgICAgcmV0dXJuIHJlc3VsdDsKK30KKwogYW5nbGU6OlJlc3VsdCBCbGl0R0w6OmJs aXRDb2xvckJ1ZmZlcldpdGhTaGFkZXIoY29uc3QgZ2w6OkNvbnRleHQgKmNvbnRleHQsCiAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBjb25zdCBnbDo6RnJh bWVidWZmZXIgKnNvdXJjZSwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgIGNvbnN0IGdsOjpGcmFtZWJ1ZmZlciAqZGVzdCwKQEAgLTQwMCw2ICs0MjgsMTkg QEAgYW5nbGU6OlJlc3VsdCBCbGl0R0w6OmJsaXRDb2xvckJ1ZmZlcldpdGhTaGFkZXIoY29uc3Qg Z2w6OkNvbnRleHQgKmNvbnRleHQsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICBjb25zdCBnbDo6UmVjdGFuZ2xlICZkZXN0QXJlYUluLAogICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgR0xlbnVtIGZpbHRlciwKICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGJvb2wgd3JpdGVB bHBoYSkKK3sKKyAgICBjb25zdCBGcmFtZWJ1ZmZlckdMICpkZXN0R0wgPSBHZXRJbXBsQXM8RnJh bWVidWZmZXJHTD4oZGVzdCk7CisgICAgcmV0dXJuIGJsaXRDb2xvckJ1ZmZlcldpdGhTaGFkZXIo Y29udGV4dCwgc291cmNlLCBkZXN0R0wtPmdldEZyYW1lYnVmZmVySUQoKSwgc291cmNlQXJlYUlu LAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGRlc3RBcmVhSW4sIGZpbHRl ciwgd3JpdGVBbHBoYSk7Cit9CisKK2FuZ2xlOjpSZXN1bHQgQmxpdEdMOjpibGl0Q29sb3JCdWZm ZXJXaXRoU2hhZGVyKGNvbnN0IGdsOjpDb250ZXh0ICpjb250ZXh0LAorICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgY29uc3QgZ2w6OkZyYW1lYnVmZmVyICpz b3VyY2UsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBj b25zdCBHTHVpbnQgZGVzdEZyYW1lYnVmZmVyLAorICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgY29uc3QgZ2w6OlJlY3RhbmdsZSAmc291cmNlQXJlYUluLAor ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgY29uc3QgZ2w6 OlJlY3RhbmdsZSAmZGVzdEFyZWFJbiwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgIEdMZW51bSBmaWx0ZXIsCisgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICBib29sIHdyaXRlQWxwaGEpCiB7CiAgICAgQU5HTEVfVFJZ KGluaXRpYWxpemVSZXNvdXJjZXMoY29udGV4dCkpOwogCkBAIC01MDUsOCArNTQ2LDcgQEAgYW5n bGU6OlJlc3VsdCBCbGl0R0w6OmJsaXRDb2xvckJ1ZmZlcldpdGhTaGFkZXIoY29uc3QgZ2w6OkNv bnRleHQgKmNvbnRleHQsCiAgICAgQU5HTEVfR0xfVFJZKGNvbnRleHQsIG1GdW5jdGlvbnMtPnVu aWZvcm0xaShibGl0UHJvZ3JhbS0+bXVsdGlwbHlBbHBoYUxvY2F0aW9uLCAwKSk7CiAgICAgQU5H TEVfR0xfVFJZKGNvbnRleHQsIG1GdW5jdGlvbnMtPnVuaWZvcm0xaShibGl0UHJvZ3JhbS0+dW5N dWx0aXBseUFscGhhTG9jYXRpb24sIDApKTsKIAotICAgIGNvbnN0IEZyYW1lYnVmZmVyR0wgKmRl c3RHTCA9IEdldEltcGxBczxGcmFtZWJ1ZmZlckdMPihkZXN0KTsKLSAgICBtU3RhdGVNYW5hZ2Vy LT5iaW5kRnJhbWVidWZmZXIoR0xfRFJBV19GUkFNRUJVRkZFUiwgZGVzdEdMLT5nZXRGcmFtZWJ1 ZmZlcklEKCkpOworICAgIG1TdGF0ZU1hbmFnZXItPmJpbmRGcmFtZWJ1ZmZlcihHTF9EUkFXX0ZS QU1FQlVGRkVSLCBkZXN0RnJhbWVidWZmZXIpOwogCiAgICAgbVN0YXRlTWFuYWdlci0+YmluZFZl cnRleEFycmF5KG1WQU8sIDApOwogICAgIEFOR0xFX0dMX1RSWShjb250ZXh0LCBtRnVuY3Rpb25z LT5kcmF3QXJyYXlzKEdMX1RSSUFOR0xFUywgMCwgMykpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1Ro aXJkUGFydHkvQU5HTEUvc3JjL2xpYkFOR0xFL3JlbmRlcmVyL2dsL0JsaXRHTC5oIGIvU291cmNl L1RoaXJkUGFydHkvQU5HTEUvc3JjL2xpYkFOR0xFL3JlbmRlcmVyL2dsL0JsaXRHTC5oCmluZGV4 IGMxZmEzMjQ5ZjUwNmQ2OGJhMDMxNjJjYjEwNDY2MjU5NWFjM2Y1NTQuLjdjMjNkYmQ2MmMyYWQ4 M2UxNTk4ZDRmYzdmMzI5NGJmMDljZGZmODQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9UaGlyZFBhcnR5 L0FOR0xFL3NyYy9saWJBTkdMRS9yZW5kZXJlci9nbC9CbGl0R0wuaAorKysgYi9Tb3VyY2UvVGhp cmRQYXJ0eS9BTkdMRS9zcmMvbGliQU5HTEUvcmVuZGVyZXIvZ2wvQmxpdEdMLmgKQEAgLTcyLDYg KzcyLDI0IEBAIGNsYXNzIEJsaXRHTCA6IGFuZ2xlOjpOb25Db3B5YWJsZQogICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBHTGVudW0gZmlsdGVyLAogICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBib29sIHdyaXRlQWxwaGEpOwogCisg ICAgYW5nbGU6OlJlc3VsdCBibGl0Q29sb3JCdWZmZXJXaXRoU2hhZGVyKGNvbnN0IGdsOjpDb250 ZXh0ICpjb250ZXh0LAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICBjb25zdCBnbDo6RnJhbWVidWZmZXIgKnNvdXJjZSwKKyAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgY29uc3QgR0x1aW50IGRlc3RGcmFtZWJ1ZmZlciwKKyAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgY29uc3QgZ2w6OlJlY3Rhbmds ZSAmc291cmNlQXJlYSwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgY29uc3QgZ2w6OlJlY3RhbmdsZSAmZGVzdEFyZWEsCisgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgIEdMZW51bSBmaWx0ZXIsCisgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgIGJvb2wgd3JpdGVBbHBoYSk7CisKKyAgICBhbmdsZTo6 UmVzdWx0IGJsaXRDb2xvckJ1ZmZlcldpdGhTaGFkZXIoY29uc3QgZ2w6OkNvbnRleHQgKmNvbnRl eHQsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGNvbnN0IGds OjpGcmFtZWJ1ZmZlciAqc291cmNlLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICBjb25zdCBHTHVpbnQgZGVzdFRleHR1cmUsCisgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgIGNvbnN0IGdsOjpUZXh0dXJlVGFyZ2V0IGRlc3RUYXJn ZXQsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGNvbnN0IHNp emVfdCBkZXN0TGV2ZWwsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgIGNvbnN0IGdsOjpSZWN0YW5nbGUgJnNvdXJjZUFyZWEsCisgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgIGNvbnN0IGdsOjpSZWN0YW5nbGUgJmRlc3RBcmVhLAor ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBHTGVudW0gZmlsdGVy LAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBib29sIHdyaXRl QWxwaGEpOworCiAgICAgYW5nbGU6OlJlc3VsdCBjb3B5U3ViVGV4dHVyZShjb25zdCBnbDo6Q29u dGV4dCAqY29udGV4dCwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIFRleHR1cmVH TCAqc291cmNlLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgc2l6ZV90IHNvdXJj ZUxldmVsLApkaWZmIC0tZ2l0IGEvU291cmNlL1RoaXJkUGFydHkvQU5HTEUvc3JjL2xpYkFOR0xF L3JlbmRlcmVyL2dsL1RleHR1cmVHTC5jcHAgYi9Tb3VyY2UvVGhpcmRQYXJ0eS9BTkdMRS9zcmMv bGliQU5HTEUvcmVuZGVyZXIvZ2wvVGV4dHVyZUdMLmNwcAppbmRleCA2NmM0ZmZjZjY4ODBmYmE3 NTU4MmQ1NTQzMjU3ZjNhZWNlZTQyOWVjLi44ZTk5NDkwODYwZGUyMjUzNDYyMjY3ZGVhMzljZjBi NWQ5NzYyYTg0IDEwMDY0NAotLS0gYS9Tb3VyY2UvVGhpcmRQYXJ0eS9BTkdMRS9zcmMvbGliQU5H TEUvcmVuZGVyZXIvZ2wvVGV4dHVyZUdMLmNwcAorKysgYi9Tb3VyY2UvVGhpcmRQYXJ0eS9BTkdM RS9zcmMvbGliQU5HTEUvcmVuZGVyZXIvZ2wvVGV4dHVyZUdMLmNwcApAQCAtNzEzLDcgKzcxMywx NyBAQCBhbmdsZTo6UmVzdWx0IFRleHR1cmVHTDo6Y29weUltYWdlKGNvbnN0IGdsOjpDb250ZXh0 ICpjb250ZXh0LAogICAgICAgICAgICAgQVNTRVJUKG5hdGl2ZWdsOjpVc2VUZXhJbWFnZTJEKGdl dFR5cGUoKSkpOwogICAgICAgICAgICAgc3RhdGVNYW5hZ2VyLT5iaW5kRnJhbWVidWZmZXIoR0xf UkVBRF9GUkFNRUJVRkZFUiwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgIHNvdXJjZUZyYW1lYnVmZmVyR0wtPmdldEZyYW1lYnVmZmVySUQoKSk7Ci0gICAgICAgICAg ICBpZiAocmVxdWlyZXNJbml0aWFsaXphdGlvbikKKyAgICAgICAgICAgIGlmIChmZWF0dXJlcy5l bXVsYXRlQ29weVRleEltYWdlMkRGcm9tUmVuZGVyYnVmZmVycy5lbmFibGVkICYmIHJlYWRCdWZm ZXIgJiYKKyAgICAgICAgICAgICAgICByZWFkQnVmZmVyLT50eXBlKCkgPT0gR0xfUkVOREVSQlVG RkVSKQorICAgICAgICAgICAgeworICAgICAgICAgICAgICAgIEJsaXRHTCAqYmxpdHRlciA9IEdl dEJsaXRHTChjb250ZXh0KTsKKyAgICAgICAgICAgICAgICBBTkdMRV9UUlkoYmxpdHRlci0+Ymxp dENvbG9yQnVmZmVyV2l0aFNoYWRlcigKKyAgICAgICAgICAgICAgICAgICAgY29udGV4dCwgc291 cmNlLCBtVGV4dHVyZUlELCB0YXJnZXQsIGxldmVsLCBjbGlwcGVkQXJlYSwKKyAgICAgICAgICAg ICAgICAgICAgZ2w6OlJlY3RhbmdsZShkZXN0T2Zmc2V0LngsIGRlc3RPZmZzZXQueSwgY2xpcHBl ZEFyZWEud2lkdGgsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgY2xpcHBlZEFy ZWEuaGVpZ2h0KSwKKyAgICAgICAgICAgICAgICAgICAgR0xfTkVBUkVTVCwgdHJ1ZSkpOworICAg ICAgICAgICAgfQorICAgICAgICAgICAgZWxzZSBpZiAocmVxdWlyZXNJbml0aWFsaXphdGlvbikK ICAgICAgICAgICAgIHsKICAgICAgICAgICAgICAgICBBTkdMRV9HTF9UUlkoY29udGV4dCwgZnVu Y3Rpb25zLT5jb3B5VGV4U3ViSW1hZ2UyRCgKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgIFRvR0xlbnVtKHRhcmdldCksIHN0YXRpY19jYXN0PEdMaW50PihsZXZlbCks IGRlc3RPZmZzZXQueCwKQEAgLTc4MSwxMCArNzkxLDI0IEBAIGFuZ2xlOjpSZXN1bHQgVGV4dHVy ZUdMOjpjb3B5U3ViSW1hZ2UoY29uc3QgZ2w6OkNvbnRleHQgKmNvbnRleHQsCiAgICAgICAgIGlm IChuYXRpdmVnbDo6VXNlVGV4SW1hZ2UyRChnZXRUeXBlKCkpKQogICAgICAgICB7CiAgICAgICAg ICAgICBBU1NFUlQoY2xpcHBlZE9mZnNldC56ID09IDApOwotICAgICAgICAgICAgQU5HTEVfR0xf VFJZKGNvbnRleHQsIGZ1bmN0aW9ucy0+Y29weVRleFN1YkltYWdlMkQoCi0gICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgIFRvR0xlbnVtKHRhcmdldCksIHN0YXRpY19jYXN0PEdM aW50PihsZXZlbCksIGNsaXBwZWRPZmZzZXQueCwKLSAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgY2xpcHBlZE9mZnNldC55LCBjbGlwcGVkQXJlYS54LCBjbGlwcGVkQXJlYS55 LAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBjbGlwcGVkQXJlYS53aWR0 aCwgY2xpcHBlZEFyZWEuaGVpZ2h0KSk7CisgICAgICAgICAgICBpZiAoZmVhdHVyZXMuZW11bGF0 ZUNvcHlUZXhJbWFnZTJERnJvbVJlbmRlcmJ1ZmZlcnMuZW5hYmxlZCAmJgorICAgICAgICAgICAg ICAgIHNvdXJjZS0+Z2V0UmVhZENvbG9yQXR0YWNobWVudCgpICYmCisgICAgICAgICAgICAgICAg c291cmNlLT5nZXRSZWFkQ29sb3JBdHRhY2htZW50KCktPnR5cGUoKSA9PSBHTF9SRU5ERVJCVUZG RVIpCisgICAgICAgICAgICB7CisgICAgICAgICAgICAgICAgQmxpdEdMICpibGl0dGVyID0gR2V0 QmxpdEdMKGNvbnRleHQpOworICAgICAgICAgICAgICAgIEFOR0xFX1RSWShibGl0dGVyLT5ibGl0 Q29sb3JCdWZmZXJXaXRoU2hhZGVyKAorICAgICAgICAgICAgICAgICAgICBjb250ZXh0LCBzb3Vy Y2UsIG1UZXh0dXJlSUQsIHRhcmdldCwgbGV2ZWwsIGNsaXBwZWRBcmVhLAorICAgICAgICAgICAg ICAgICAgICBnbDo6UmVjdGFuZ2xlKGNsaXBwZWRPZmZzZXQueCwgY2xpcHBlZE9mZnNldC55LCBj bGlwcGVkQXJlYS53aWR0aCwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBjbGlw cGVkQXJlYS5oZWlnaHQpLAorICAgICAgICAgICAgICAgICAgICBHTF9ORUFSRVNULCB0cnVlKSk7 CisgICAgICAgICAgICB9CisgICAgICAgICAgICBlbHNlCisgICAgICAgICAgICB7CisgICAgICAg ICAgICAgICAgQU5HTEVfR0xfVFJZKGNvbnRleHQsIGZ1bmN0aW9ucy0+Y29weVRleFN1YkltYWdl MkQoCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBUb0dMZW51bSh0 YXJnZXQpLCBzdGF0aWNfY2FzdDxHTGludD4obGV2ZWwpLAorICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgY2xpcHBlZE9mZnNldC54LCBjbGlwcGVkT2Zmc2V0LnksIGNs aXBwZWRBcmVhLngsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBj bGlwcGVkQXJlYS55LCBjbGlwcGVkQXJlYS53aWR0aCwgY2xpcHBlZEFyZWEuaGVpZ2h0KSk7Cisg ICAgICAgICAgICB9CiAgICAgICAgIH0KICAgICAgICAgZWxzZQogICAgICAgICB7CmRpZmYgLS1n aXQgYS9Tb3VyY2UvVGhpcmRQYXJ0eS9BTkdMRS9zcmMvbGliQU5HTEUvcmVuZGVyZXIvZ2wvcmVu ZGVyZXJnbF91dGlscy5jcHAgYi9Tb3VyY2UvVGhpcmRQYXJ0eS9BTkdMRS9zcmMvbGliQU5HTEUv cmVuZGVyZXIvZ2wvcmVuZGVyZXJnbF91dGlscy5jcHAKaW5kZXggZTlkZjU1MGI5MmQzNGMxZWYw YjkxYzFkNzNlMzc4NjI3YTAyMDU4Ni4uNjZmZjEwOWU0Mzk2MDMxMzg2NTU4NGFmMGY1YjE0Yzhm MDgyOGM2YiAxMDA2NDQKLS0tIGEvU291cmNlL1RoaXJkUGFydHkvQU5HTEUvc3JjL2xpYkFOR0xF L3JlbmRlcmVyL2dsL3JlbmRlcmVyZ2xfdXRpbHMuY3BwCisrKyBiL1NvdXJjZS9UaGlyZFBhcnR5 L0FOR0xFL3NyYy9saWJBTkdMRS9yZW5kZXJlci9nbC9yZW5kZXJlcmdsX3V0aWxzLmNwcApAQCAt MTcyMiw2ICsxNzIyLDE0IEBAIHZvaWQgSW5pdGlhbGl6ZUZlYXR1cmVzKGNvbnN0IEZ1bmN0aW9u c0dMICpmdW5jdGlvbnMsIGFuZ2xlOjpGZWF0dXJlc0dMICpmZWF0dXJlCiAgICAgQU5HTEVfRkVB VFVSRV9DT05ESVRJT04oCiAgICAgICAgIGZlYXR1cmVzLCBkaXNhYmxlU2VtYXBob3JlRmQsCiAg ICAgICAgIElzTGludXgoKSAmJiBpc0FNRCAmJiBpc01lc2EgJiYgbWVzYVZlcnNpb24gPCAoc3Rk OjphcnJheTxpbnQsIDM+ezE5LCAzLCA1fSkpOworCisgICAgLy8gYW5nbGVidWcuY29tLzQ2NzQK KyAgICAvLyBUaGUgKHJlZHVuZGFudCkgZXhwbGljaXQgZXhjbHVzaW9uIG9mIFdpbmRvd3MgQU1E IGlzIGJlY2F1c2UgdGhlIHdvcmthcm91bmQgZmFpbHMKKyAgICAvLyBUZXh0dXJlMkRSR1Rlc3Qu VGV4dHVyZVJHVU5vcm1UZXN0IG9uIHRoYXQgcGxhdGZvcm0sIGFuZCB0aGUgdGVzdCBpcyBza2lw cGVkLiBJZgorICAgIC8vIHlvdSdkIGxpa2UgdG8gZW5hYmxlIHRoZSB3b3JrYXJvdW5kIG9uIFdp bmRvd3MgQU1ELCBwbGVhc2UgZml4IHRoZSB0ZXN0IGZpcnN0LgorICAgIEFOR0xFX0ZFQVRVUkVf Q09ORElUSU9OKAorICAgICAgICBmZWF0dXJlcywgZW11bGF0ZUNvcHlUZXhJbWFnZTJERnJvbVJl bmRlcmJ1ZmZlcnMsCisgICAgICAgIElzQXBwbGUoKSAmJiBmdW5jdGlvbnMtPnN0YW5kYXJkID09 IFNUQU5EQVJEX0dMX0VTICYmICEoaXNBTUQgJiYgSXNXaW5kb3dzKCkpKTsKIH0KIAogdm9pZCBJ bml0aWFsaXplRnJvbnRlbmRGZWF0dXJlcyhjb25zdCBGdW5jdGlvbnNHTCAqZnVuY3Rpb25zLCBh bmdsZTo6RnJvbnRlbmRGZWF0dXJlcyAqZmVhdHVyZXMpCmRpZmYgLS1naXQgYS9Tb3VyY2UvVGhp cmRQYXJ0eS9BTkdMRS9zcmMvdGVzdHMvZ2xfdGVzdHMvQ29weVRleEltYWdlVGVzdC5jcHAgYi9T b3VyY2UvVGhpcmRQYXJ0eS9BTkdMRS9zcmMvdGVzdHMvZ2xfdGVzdHMvQ29weVRleEltYWdlVGVz dC5jcHAKaW5kZXggMTYwN2JjOWUxNGZmMDI3ZmVhZTg3MjNkMzhkNWZmNGQ3ODYxNmQyYS4uMzk3 ODJhZGFiZTg2YTg3NDhjNDBjZmQwM2UwY2U5NGE5YmE0YjRiNCAxMDA2NDQKLS0tIGEvU291cmNl L1RoaXJkUGFydHkvQU5HTEUvc3JjL3Rlc3RzL2dsX3Rlc3RzL0NvcHlUZXhJbWFnZVRlc3QuY3Bw CisrKyBiL1NvdXJjZS9UaGlyZFBhcnR5L0FOR0xFL3NyYy90ZXN0cy9nbF90ZXN0cy9Db3B5VGV4 SW1hZ2VUZXN0LmNwcApAQCAtODk1LDcgKzg5NSwxMiBAQCBBTkdMRV9JTlNUQU5USUFURV9URVNU KENvcHlUZXhJbWFnZVRlc3QsCiAgICAgICAgICAgICAgICAgICAgICAgIEVTMl9PUEVOR0woKSwK ICAgICAgICAgICAgICAgICAgICAgICAgRVMyX09QRU5HTEVTKCksCiAgICAgICAgICAgICAgICAg ICAgICAgIEVTMl9WVUxLQU4oKSwKLSAgICAgICAgICAgICAgICAgICAgICAgRVMzX1ZVTEtBTigp KTsKLQotQU5HTEVfSU5TVEFOVElBVEVfVEVTVF9FUzMoQ29weVRleEltYWdlVGVzdEVTMyk7Cisg ICAgICAgICAgICAgICAgICAgICAgIEVTM19WVUxLQU4oKSwKKyAgICAgICAgICAgICAgICAgICAg ICAgV2l0aEVtdWxhdGVDb3B5VGV4SW1hZ2UyREZyb21SZW5kZXJidWZmZXJzKEVTMl9PUEVOR0wo KSksCisgICAgICAgICAgICAgICAgICAgICAgIFdpdGhFbXVsYXRlQ29weVRleEltYWdlMkRGcm9t UmVuZGVyYnVmZmVycyhFUzJfT1BFTkdMRVMoKSkpOworCitBTkdMRV9JTlNUQU5USUFURV9URVNU KENvcHlUZXhJbWFnZVRlc3RFUzMsCisgICAgICAgICAgICAgICAgICAgICAgIEFOR0xFX0FMTF9U RVNUX1BMQVRGT1JNU19FUzMsCisgICAgICAgICAgICAgICAgICAgICAgIFdpdGhFbXVsYXRlQ29w eVRleEltYWdlMkRGcm9tUmVuZGVyYnVmZmVycyhFUzNfT1BFTkdMKCkpLAorICAgICAgICAgICAg ICAgICAgICAgICBXaXRoRW11bGF0ZUNvcHlUZXhJbWFnZTJERnJvbVJlbmRlcmJ1ZmZlcnMoRVMz X09QRU5HTEVTKCkpKTsKIH0gIC8vIG5hbWVzcGFjZSBhbmdsZQpkaWZmIC0tZ2l0IGEvU291cmNl L1RoaXJkUGFydHkvQU5HTEUvc3JjL3Rlc3RzL2dsX3Rlc3RzL1RleHR1cmVUZXN0LmNwcCBiL1Nv dXJjZS9UaGlyZFBhcnR5L0FOR0xFL3NyYy90ZXN0cy9nbF90ZXN0cy9UZXh0dXJlVGVzdC5jcHAK aW5kZXggMDdlYTI0ODFiMzNhMWZhYzJiMWViNzkzYmVhNGJhZTc4ODg3N2ZkMS4uMTI2Yjk0OTEw YzJlYTk3Y2E4NDA1YzkwNTdjN2FkMmEwY2NjZDNkZSAxMDA2NDQKLS0tIGEvU291cmNlL1RoaXJk UGFydHkvQU5HTEUvc3JjL3Rlc3RzL2dsX3Rlc3RzL1RleHR1cmVUZXN0LmNwcAorKysgYi9Tb3Vy Y2UvVGhpcmRQYXJ0eS9BTkdMRS9zcmMvdGVzdHMvZ2xfdGVzdHMvVGV4dHVyZVRlc3QuY3BwCkBA IC00NTM3LDYgKzQ1MzcsMTAgQEAgY2xhc3MgVGV4dHVyZTJEUkdUZXN0IDogcHVibGljIFRleHR1 cmUyRFRlc3QKIFRFU1RfUChUZXh0dXJlMkRSR1Rlc3QsIFRleHR1cmVSR1VOb3JtVGVzdCkKIHsK ICAgICBBTkdMRV9TS0lQX1RFU1RfSUYoIUlzR0xFeHRlbnNpb25FbmFibGVkKCJHTF9FWFRfdGV4 dHVyZV9yZyIpKTsKKyAgICAvLyBUaGlzIHdvcmthcm91bmQgY2F1c2VzIGEgR0wgZXJyb3Igb24g V2luZG93cyBBTUQsIHdoaWNoIGlzIGxpa2VseSBhIGRyaXZlciBidWcuCisgICAgLy8gVGhlIHdv cmthcm91bmQgaXMgbm90IGludGVuZGVkIHRvIGJlIGVuYWJsZWQgaW4gdGhpcyBjb25maWd1cmF0 aW9uIHNvIHNraXAgaXQuCisgICAgQU5HTEVfU0tJUF9URVNUX0lGKEdldFBhcmFtKCkuZWdsUGFy YW1ldGVycy5lbXVsYXRlQ29weVRleEltYWdlMkRGcm9tUmVuZGVyYnVmZmVycyAmJgorICAgICAg ICAgICAgICAgICAgICAgICBJc1dpbmRvd3MoKSAmJiBJc0FNRCgpKTsKIAogICAgIEdMdWJ5dGUg cGl4ZWxWYWx1ZSAgPSAweGFiOwogICAgIEdMdWJ5dGUgaW1hZ2VEYXRhW10gPSB7cGl4ZWxWYWx1 ZSwgcGl4ZWxWYWx1ZX07CkBAIC02MjA4LDcgKzYyMTIsMTMgQEAgVEVTVF9QKEVUQzFDb21wcmVz c2VkVGV4dHVyZVRlc3QsIEVUQzFTaHJpbmtUaGVuR3Jvd01heExldmVscykKIAogLy8gVXNlIHRo aXMgdG8gc2VsZWN0IHdoaWNoIGNvbmZpZ3VyYXRpb25zIChlLmcuIHdoaWNoIHJlbmRlcmVyLCB3 aGljaCBHTEVTIG1ham9yIHZlcnNpb24pIHRoZXNlCiAvLyB0ZXN0cyBzaG91bGQgYmUgcnVuIGFn YWluc3QuCi1BTkdMRV9JTlNUQU5USUFURV9URVNUX0VTMihUZXh0dXJlMkRUZXN0KTsKKyNkZWZp bmUgRVMyX0VNVUxBVEVfQ09QWV9URVhfSU1BR0UoKSAgICAgICAgICAgICAgICAgICAgICAgICAg XAorICAgIFdpdGhFbXVsYXRlQ29weVRleEltYWdlMkRGcm9tUmVuZGVyYnVmZmVycyhFUzJfT1BF TkdMKCkpLCBcCisgICAgICAgIFdpdGhFbXVsYXRlQ29weVRleEltYWdlMkRGcm9tUmVuZGVyYnVm ZmVycyhFUzJfT1BFTkdMRVMoKSkKKyNkZWZpbmUgRVMzX0VNVUxBVEVfQ09QWV9URVhfSU1BR0Uo KSAgICAgICAgICAgICAgICAgICAgICAgICAgXAorICAgIFdpdGhFbXVsYXRlQ29weVRleEltYWdl MkRGcm9tUmVuZGVyYnVmZmVycyhFUzNfT1BFTkdMKCkpLCBcCisgICAgICAgIFdpdGhFbXVsYXRl Q29weVRleEltYWdlMkRGcm9tUmVuZGVyYnVmZmVycyhFUzNfT1BFTkdMRVMoKSkKK0FOR0xFX0lO U1RBTlRJQVRFX1RFU1QoVGV4dHVyZTJEVGVzdCwgQU5HTEVfQUxMX1RFU1RfUExBVEZPUk1TX0VT MiwgRVMyX0VNVUxBVEVfQ09QWV9URVhfSU1BR0UoKSk7CiBBTkdMRV9JTlNUQU5USUFURV9URVNU X0VTMihUZXh0dXJlQ3ViZVRlc3QpOwogQU5HTEVfSU5TVEFOVElBVEVfVEVTVF9FUzIoVGV4dHVy ZTJEVGVzdFdpdGhEcmF3U2NhbGUpOwogQU5HTEVfSU5TVEFOVElBVEVfVEVTVF9FUzIoU2FtcGxl cjJEQXNGdW5jdGlvblBhcmFtZXRlclRlc3QpOwpAQCAtNjIzMyw3ICs2MjQzLDExIEBAIEFOR0xF X0lOU1RBTlRJQVRFX1RFU1RfRVMzKFRleHR1cmVCb3JkZXJDbGFtcFRlc3RFUzMpOwogQU5HTEVf SU5TVEFOVElBVEVfVEVTVF9FUzMoVGV4dHVyZUJvcmRlckNsYW1wSW50ZWdlclRlc3RFUzMpOwog QU5HTEVfSU5TVEFOVElBVEVfVEVTVF9FUzIoVGV4dHVyZUxpbWl0c1Rlc3QpOwogQU5HTEVfSU5T VEFOVElBVEVfVEVTVF9FUzMoVGV4dHVyZTJETm9ybTE2VGVzdEVTMyk7Ci1BTkdMRV9JTlNUQU5U SUFURV9URVNUX0VTMl9BTkRfRVMzKFRleHR1cmUyRFJHVGVzdCk7CitBTkdMRV9JTlNUQU5USUFU RV9URVNUKFRleHR1cmUyRFJHVGVzdCwKKyAgICAgICAgICAgICAgICAgICAgICAgQU5HTEVfQUxM X1RFU1RfUExBVEZPUk1TX0VTMiwKKyAgICAgICAgICAgICAgICAgICAgICAgQU5HTEVfQUxMX1RF U1RfUExBVEZPUk1TX0VTMywKKyAgICAgICAgICAgICAgICAgICAgICAgRVMyX0VNVUxBVEVfQ09Q WV9URVhfSU1BR0UoKSwKKyAgICAgICAgICAgICAgICAgICAgICAgRVMzX0VNVUxBVEVfQ09QWV9U RVhfSU1BR0UoKSk7CiBBTkdMRV9JTlNUQU5USUFURV9URVNUX0VTMyhUZXh0dXJlMkRGbG9hdFRl c3RFUzMpOwogQU5HTEVfSU5TVEFOVElBVEVfVEVTVF9FUzIoVGV4dHVyZTJERmxvYXRUZXN0RVMy KTsKIEFOR0xFX0lOU1RBTlRJQVRFX1RFU1RfRVMzKFRleHR1cmVDdWJlVGVzdEVTMyk7CmRpZmYg LS1naXQgYS9Tb3VyY2UvVGhpcmRQYXJ0eS9BTkdMRS9zcmMvdGVzdHMvdGVzdF91dGlscy9hbmds ZV90ZXN0X2NvbmZpZ3MuY3BwIGIvU291cmNlL1RoaXJkUGFydHkvQU5HTEUvc3JjL3Rlc3RzL3Rl c3RfdXRpbHMvYW5nbGVfdGVzdF9jb25maWdzLmNwcAppbmRleCBkMzdiZmNkN2EwOGEyZjQ5MTJl YzMxODg0ODE5YjczNWY4ZTBlNjAzLi5mZmU3YjU5M2Y5YTk5YzNlNDNmOTVkZDYyNjUxZGM5Nzll OGY5NDM5IDEwMDY0NAotLS0gYS9Tb3VyY2UvVGhpcmRQYXJ0eS9BTkdMRS9zcmMvdGVzdHMvdGVz dF91dGlscy9hbmdsZV90ZXN0X2NvbmZpZ3MuY3BwCisrKyBiL1NvdXJjZS9UaGlyZFBhcnR5L0FO R0xFL3NyYy90ZXN0cy90ZXN0X3V0aWxzL2FuZ2xlX3Rlc3RfY29uZmlncy5jcHAKQEAgLTIwNCw2 ICsyMDQsMTEgQEAgc3RkOjpvc3RyZWFtICZvcGVyYXRvcjw8KHN0ZDo6b3N0cmVhbSAmc3RyZWFt LCBjb25zdCBQbGF0Zm9ybVBhcmFtZXRlcnMgJnBwKQogICAgICAgICBzdHJlYW0gPDwgIl9BbGxv Y2F0ZU5vblplcm9NZW1vcnkiOwogICAgIH0KIAorICAgIGlmIChwcC5lZ2xQYXJhbWV0ZXJzLmVt dWxhdGVDb3B5VGV4SW1hZ2UyREZyb21SZW5kZXJidWZmZXJzID09IEVHTF9UUlVFKQorICAgIHsK KyAgICAgICAgc3RyZWFtIDw8ICJfRW11bGF0ZUNvcHlUZXhJbWFnZTJERnJvbVJlbmRlcmJ1ZmZl cnMiOworICAgIH0KKwogICAgIHJldHVybiBzdHJlYW07CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJj ZS9UaGlyZFBhcnR5L0FOR0xFL3NyYy90ZXN0cy90ZXN0X3V0aWxzL2FuZ2xlX3Rlc3RfY29uZmln cy5oIGIvU291cmNlL1RoaXJkUGFydHkvQU5HTEUvc3JjL3Rlc3RzL3Rlc3RfdXRpbHMvYW5nbGVf dGVzdF9jb25maWdzLmgKaW5kZXggYzZkNDQ2MDc1MWYyMDZjZDBkNDM4ZjY0YjAzODljNGFjZTJl ZDRkNS4uNDlkMDRmMzExMDkzZjhjNDQ2MDBlYzk2YjE3OGNmNTYxOTQyNzdmNiAxMDA2NDQKLS0t IGEvU291cmNlL1RoaXJkUGFydHkvQU5HTEUvc3JjL3Rlc3RzL3Rlc3RfdXRpbHMvYW5nbGVfdGVz dF9jb25maWdzLmgKKysrIGIvU291cmNlL1RoaXJkUGFydHkvQU5HTEUvc3JjL3Rlc3RzL3Rlc3Rf dXRpbHMvYW5nbGVfdGVzdF9jb25maWdzLmgKQEAgLTIxOSw2ICsyMTksMTQgQEAgaW5saW5lIFBs YXRmb3JtUGFyYW1ldGVycyBXaXRoQWxsb2NhdGVOb25aZXJvTWVtb3J5KGNvbnN0IFBsYXRmb3Jt UGFyYW1ldGVycyAmcGEKICAgICByZXR1cm4gYWxsb2NhdGVOb25aZXJvOwogfQogCitpbmxpbmUg UGxhdGZvcm1QYXJhbWV0ZXJzIFdpdGhFbXVsYXRlQ29weVRleEltYWdlMkRGcm9tUmVuZGVyYnVm ZmVycygKKyAgICBjb25zdCBQbGF0Zm9ybVBhcmFtZXRlcnMgJnBhcmFtcykKK3sKKyAgICBQbGF0 Zm9ybVBhcmFtZXRlcnMgcCAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgPSBwYXJh bXM7CisgICAgcC5lZ2xQYXJhbWV0ZXJzLmVtdWxhdGVDb3B5VGV4SW1hZ2UyREZyb21SZW5kZXJi dWZmZXJzID0gRUdMX1RSVUU7CisgICAgcmV0dXJuIHA7Cit9CisKIGlubGluZSBQbGF0Zm9ybVBh cmFtZXRlcnMgV2l0aFJvYnVzdG5lc3MoY29uc3QgUGxhdGZvcm1QYXJhbWV0ZXJzICZwYXJhbXMp CiB7CiAgICAgUGxhdGZvcm1QYXJhbWV0ZXJzIHdpdGhSb2J1c3RuZXNzICAgICAgID0gcGFyYW1z OwpkaWZmIC0tZ2l0IGEvU291cmNlL1RoaXJkUGFydHkvQU5HTEUvdXRpbC9FR0xQbGF0Zm9ybVBh cmFtZXRlcnMuaCBiL1NvdXJjZS9UaGlyZFBhcnR5L0FOR0xFL3V0aWwvRUdMUGxhdGZvcm1QYXJh bWV0ZXJzLmgKaW5kZXggOTEyMjM2N2NhN2RmOWEyNzM0OGU4YzNiYWMxNDhjZTYwYzRlNGNmNC4u OTRhYTZkMTcxZDI4MGEyNjM3YTllOTdmOTY5Mjc2Y2E5NjAwYTU0YiAxMDA2NDQKLS0tIGEvU291 cmNlL1RoaXJkUGFydHkvQU5HTEUvdXRpbC9FR0xQbGF0Zm9ybVBhcmFtZXRlcnMuaAorKysgYi9T b3VyY2UvVGhpcmRQYXJ0eS9BTkdMRS91dGlsL0VHTFBsYXRmb3JtUGFyYW1ldGVycy5oCkBAIC02 MCwyMCArNjAsMjIgQEAgc3RydWN0IEVHTFBsYXRmb3JtUGFyYW1ldGVycwogICAgIHsKICAgICAg ICAgcmV0dXJuIHN0ZDo6dGllKHJlbmRlcmVyLCBtYWpvclZlcnNpb24sIG1pbm9yVmVyc2lvbiwg ZGV2aWNlVHlwZSwgcHJlc2VudFBhdGgsCiAgICAgICAgICAgICAgICAgICAgICAgICBkZWJ1Z0xh eWVyc0VuYWJsZWQsIGNvbnRleHRWaXJ0dWFsaXphdGlvbiwgdHJhbnNmb3JtRmVlZGJhY2tGZWF0 dXJlLAotICAgICAgICAgICAgICAgICAgICAgICAgYWxsb2NhdGVOb25aZXJvTWVtb3J5RmVhdHVy ZSwgcGxhdGZvcm1NZXRob2RzLCByb2J1c3RuZXNzKTsKKyAgICAgICAgICAgICAgICAgICAgICAg IGFsbG9jYXRlTm9uWmVyb01lbW9yeUZlYXR1cmUsIGVtdWxhdGVDb3B5VGV4SW1hZ2UyREZyb21S ZW5kZXJidWZmZXJzLAorICAgICAgICAgICAgICAgICAgICAgICAgcGxhdGZvcm1NZXRob2RzLCBy b2J1c3RuZXNzKTsKICAgICB9CiAKLSAgICBFR0xpbnQgcmVuZGVyZXIgICAgICAgICAgICAgICAg ICAgICAgICAgPSBFR0xfUExBVEZPUk1fQU5HTEVfVFlQRV9ERUZBVUxUX0FOR0xFOwotICAgIEVH TGludCBtYWpvclZlcnNpb24gICAgICAgICAgICAgICAgICAgICA9IEVHTF9ET05UX0NBUkU7Ci0g ICAgRUdMaW50IG1pbm9yVmVyc2lvbiAgICAgICAgICAgICAgICAgICAgID0gRUdMX0RPTlRfQ0FS RTsKLSAgICBFR0xpbnQgZGV2aWNlVHlwZSAgICAgICAgICAgICAgICAgICAgICAgPSBFR0xfUExB VEZPUk1fQU5HTEVfREVWSUNFX1RZUEVfSEFSRFdBUkVfQU5HTEU7Ci0gICAgRUdMaW50IHByZXNl bnRQYXRoICAgICAgICAgICAgICAgICAgICAgID0gRUdMX0RPTlRfQ0FSRTsKLSAgICBFR0xpbnQg ZGVidWdMYXllcnNFbmFibGVkICAgICAgICAgICAgICAgPSBFR0xfRE9OVF9DQVJFOwotICAgIEVH TGludCBjb250ZXh0VmlydHVhbGl6YXRpb24gICAgICAgICAgICA9IEVHTF9ET05UX0NBUkU7Ci0g ICAgRUdMaW50IHJvYnVzdG5lc3MgICAgICAgICAgICAgICAgICAgICAgID0gRUdMX0RPTlRfQ0FS RTsKLSAgICBFR0xpbnQgdHJhbnNmb3JtRmVlZGJhY2tGZWF0dXJlICAgICAgICAgPSBFR0xfRE9O VF9DQVJFOwotICAgIEVHTGludCBhbGxvY2F0ZU5vblplcm9NZW1vcnlGZWF0dXJlICAgICA9IEVH TF9ET05UX0NBUkU7Ci0gICAgYW5nbGU6OlBsYXRmb3JtTWV0aG9kcyAqcGxhdGZvcm1NZXRob2Rz ID0gbnVsbHB0cjsKKyAgICBFR0xpbnQgcmVuZGVyZXIgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgPSBFR0xfUExBVEZPUk1fQU5HTEVfVFlQRV9ERUZBVUxUX0FOR0xFOworICAgIEVHTGlu dCBtYWpvclZlcnNpb24gICAgICAgICAgICAgICAgICAgICAgICAgICA9IEVHTF9ET05UX0NBUkU7 CisgICAgRUdMaW50IG1pbm9yVmVyc2lvbiAgICAgICAgICAgICAgICAgICAgICAgICAgID0gRUdM X0RPTlRfQ0FSRTsKKyAgICBFR0xpbnQgZGV2aWNlVHlwZSAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgPSBFR0xfUExBVEZPUk1fQU5HTEVfREVWSUNFX1RZUEVfSEFSRFdBUkVfQU5HTEU7Cisg ICAgRUdMaW50IHByZXNlbnRQYXRoICAgICAgICAgICAgICAgICAgICAgICAgICAgID0gRUdMX0RP TlRfQ0FSRTsKKyAgICBFR0xpbnQgZGVidWdMYXllcnNFbmFibGVkICAgICAgICAgICAgICAgICAg ICAgPSBFR0xfRE9OVF9DQVJFOworICAgIEVHTGludCBjb250ZXh0VmlydHVhbGl6YXRpb24gICAg ICAgICAgICAgICAgICA9IEVHTF9ET05UX0NBUkU7CisgICAgRUdMaW50IHJvYnVzdG5lc3MgICAg ICAgICAgICAgICAgICAgICAgICAgICAgID0gRUdMX0RPTlRfQ0FSRTsKKyAgICBFR0xpbnQgdHJh bnNmb3JtRmVlZGJhY2tGZWF0dXJlICAgICAgICAgICAgICAgPSBFR0xfRE9OVF9DQVJFOworICAg IEVHTGludCBhbGxvY2F0ZU5vblplcm9NZW1vcnlGZWF0dXJlICAgICAgICAgICA9IEVHTF9ET05U X0NBUkU7CisgICAgRUdMaW50IGVtdWxhdGVDb3B5VGV4SW1hZ2UyREZyb21SZW5kZXJidWZmZXJz ID0gRUdMX0RPTlRfQ0FSRTsKKyAgICBhbmdsZTo6UGxhdGZvcm1NZXRob2RzICpwbGF0Zm9ybU1l dGhvZHMgICAgICAgPSBudWxscHRyOwogfTsKIAogaW5saW5lIGJvb2wgb3BlcmF0b3I8KGNvbnN0 IEVHTFBsYXRmb3JtUGFyYW1ldGVycyAmYSwgY29uc3QgRUdMUGxhdGZvcm1QYXJhbWV0ZXJzICZi KQpkaWZmIC0tZ2l0IGEvU291cmNlL1RoaXJkUGFydHkvQU5HTEUvdXRpbC9FR0xXaW5kb3cuY3Bw IGIvU291cmNlL1RoaXJkUGFydHkvQU5HTEUvdXRpbC9FR0xXaW5kb3cuY3BwCmluZGV4IGMyNTcy OTBkZmM0NTliZDlkNjY0OTI5MjNjYzFkMDc2MjlkMmIxMDAuLmI3MjNhYWNkZDhjNzc3NTVhODA4 NjhkZTI3MjY5ZDQ5YzRiMzJmNTMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9UaGlyZFBhcnR5L0FOR0xF L3V0aWwvRUdMV2luZG93LmNwcAorKysgYi9Tb3VyY2UvVGhpcmRQYXJ0eS9BTkdMRS91dGlsL0VH TFdpbmRvdy5jcHAKQEAgLTE5MSw2ICsxOTEsMTEgQEAgYm9vbCBFR0xXaW5kb3c6OmluaXRpYWxp emVEaXNwbGF5KE9TV2luZG93ICpvc1dpbmRvdywKICAgICAgICAgZGlzYWJsZWRGZWF0dXJlT3Zl cnJpZGVzLnB1c2hfYmFjaygiYWxsb2NhdGVfbm9uX3plcm9fbWVtb3J5Iik7CiAgICAgfQogCisg ICAgaWYgKHBhcmFtcy5lbXVsYXRlQ29weVRleEltYWdlMkRGcm9tUmVuZGVyYnVmZmVycyA9PSBF R0xfVFJVRSkKKyAgICB7CisgICAgICAgIGVuYWJsZWRGZWF0dXJlT3ZlcnJpZGVzLnB1c2hfYmFj aygiZW11bGF0ZV9jb3B5dGV4aW1hZ2UyZF9mcm9tX3JlbmRlcmJ1ZmZlcnMiKTsKKyAgICB9CisK ICAgICBpZiAoIWRpc2FibGVkRmVhdHVyZU92ZXJyaWRlcy5lbXB0eSgpKQogICAgIHsKICAgICAg ICAgaWYgKHN0cnN0cihleHRlbnNpb25TdHJpbmcsICJFR0xfQU5HTEVfZmVhdHVyZV9jb250cm9s IikgPT0gbnVsbHB0cikK