224835 2021-04-20 15:32:02 -0700 Fix handling of overflow of /= and *= operators with double over Checked<uint64_t> and other 64-bit types. 2021-04-27 13:24:03 -0700 1 1 1 Unclassified WebKit Platform WebKit Nightly Build All All RESOLVED FIXED InRadar P2 Normal --- 1 basuke darin basuke benjamin cdumez changseok cmarcelo darin dino ews-watchlist graouts kondapallykalyan mmaxfield webkit-bug-importer oldest_to_newest 1752458 0 basuke 2021-04-20 15:32:02 -0700 When building with clang 11 for PlayStation, it generates warning like this: WTF/Headers\wtf/CheckedArithmetic.h:836:58: warning: implicit conversion from 'std::numeric_limits<unsigned long>::_Ty' (aka 'unsigned long') to 'double' changes value from 18446744073709551615 to 18446744073709551616 [-Wimplicit-const-int-float-conversion] if (!(std::numeric_limits<T>::min() <= result && std::numeric_limits<T>::max() >= result)) ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ~~ ../../Tools/TestWebKitAPI/Tests/WTF/CheckedArithmeticOperations.cpp:511:10: note: in instantiation of member function 'WTF::Checked<uint64_t, WTF::RecordOverflow>::operator/=' requested here size /= 10.5; ^ 1 warning generated. In file included from WebCore/DerivedSources/unified-sources/UnifiedSource-043dd90b-5.cpp:8: ../../Source/WebCore\rendering/RenderBlockFlow.cpp:1785:25: warning: implicit conversion from 'const int' to 'const float' changes value from 33554431 to 33554432 [-Wimplicit-const-int-float-conversion] logicalOffset = intMaxForLayoutUnit; ~ ^~~~~~~~~~~~~~~~~~~ 1 warning generated. https://github.com/WebKit/WebKit/blob/f3be0ab411b677048ba40b760a6a65760ca64c1c/Source/WTF/wtf/CheckedArithmetic.h#L836 It says when converting the maximum number of unsigned long (8 byte) which is 0xffff'ffff'ffff'ffff (18'446'744'073'709'551'615) to double, that value is converted to 18'446'744'073'709'551'616 which is 0x1'0000'0000'0000'0000. This won't catch the case when result is 0x1'0000'0000'0000'0000. 1752460 1 basuke 2021-04-20 15:32:34 -0700 Early discussion was on this bug. https://bugs.webkit.org/show_bug.cgi?id=224797 1752463 2 basuke 2021-04-20 15:34:04 -0700 We need to make sure the warning is correct by adding the test case for 64-bit used with Checked type. If that is proofed, we need to seek how we can resolve this. 1752472 3 darin 2021-04-20 15:38:52 -0700 The title here is too oblique. The issue is not the precision. The issue is that we will fail to correctly do the overflow check! We will allow overflow! 1752491 4 basuke 2021-04-20 16:07:57 -0700 How about this title? 1752549 5 darin 2021-04-20 18:07:33 -0700 Better! 1753864 6 darin 2021-04-24 10:30:11 -0700 I suggest we use this code that selects either double or long double based on the size of the integer. std::conditional<sizeof(m_value) <= 4, double, long double>::type result = rhs; result *= m_value; Note the importance of converting rhs to long double *before* doing the multiplication. I’m grabbing this bug and will fix it. 1754014 7 darin 2021-04-25 09:59:26 -0700 (In reply to Darin Adler from comment #6) > I suggest we use this code that selects either double or long double based > on the size of the integer. I learned more about the problem. That technique will *not* work. Fixing this is harder than it looks. 1754035 8 darin 2021-04-25 12:05:20 -0700 I had a hard enough timing fixing this that I considered just deleting the *= overloads for double and float, since the rest of CheckedArithmetic.h doesn’t have any floating point type support. When I tried that (and it still might be the best solution to this annoyingly thorny problem), I found one call site that is using this, which may be the *only* call site using it, GPUBindGroupAllocator::reallocate: newLength *= 1.25 I think now that I should just rewrite this to: newLength += newLength / 4; 1754052 9 427009 darin 2021-04-25 13:02:07 -0700 Created attachment 427009 Patch 1754053 10 427010 darin 2021-04-25 13:13:23 -0700 Created attachment 427010 Patch 1754054 11 webkit-bug-importer 2021-04-25 13:14:17 -0700 <rdar://problem/77126529> 1754084 12 ews-feeder 2021-04-25 15:59:11 -0700 Committed r276577 (237013@main): <https://commits.webkit.org/237013@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 427010. 1754369 13 basuke 2021-04-26 14:18:06 -0700 Thanks Darin. Removing this feature is the best way. Less feature, less bug. (In reply to Darin Adler from comment #6) > I suggest we use this code that selects either double or long double based > on the size of the integer. > > std::conditional<sizeof(m_value) <= 4, double, long double>::type result > = rhs; > result *= m_value; > > Note the importance of converting rhs to long double *before* doing the > multiplication. I’m grabbing this bug and will fix it. Can I ask what was wrong with this trial? Just curious about that. I see platform issue on long double. Are there any others? 1754415 14 darin 2021-04-26 15:53:41 -0700 The result needs to match what C++ specifies for "64-bit integer * double", which is "convert 64-bit integer to double, multiply by double, convert back to 64-bit integer, truncating". If you use long double, you get a different result. It’s not OK to just get a different result. We want the correct result, but also correctly checked for overflow. So using "long double" lets you compute something *different* and range check that, but it doesn’t let you compute what "64-bit-int *= double" would do, with the expected loss of precision. Even more extreme is what "64-bit-int *= float" is supposed to do in terms of loss of precision. Same issue. When I wrote test cases I became sensitive to what it would take to do this absolutely correctly, reading up what the C++ standard specifies. In my view it’s important that the checked version does the same operation that the non-checked equivalent would do, but also checks for overflow. 1754759 15 basuke 2021-04-27 13:24:03 -0700 Got it. Thanks for clarification. 427009 2021-04-25 13:02:07 -0700 2021-04-25 13:14:35 -0700 Patch bug-224835-20210425130207.patch text/plain 7811 darin U3VidmVyc2lvbiBSZXZpc2lvbjogMjc2NTY3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL0NoYW5n ZUxvZyBiL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCmluZGV4IDYxZDhhZmFjOGM2MmUwZDlmMTI3NTFj ZGNmNjFhNDUzMzEwOGNiYzcuLjMxNjg0NzdlNTgyMjg2ZDZkMDA3YzkxYzM2M2VmYWMyMzA4MjJl NGIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XVEYvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMTYgQEAKKzIwMjEtMDQtMjUgIERhcmluIEFkbGVyICA8ZGFyaW5A YXBwbGUuY29tPgorCisgICAgICAgIEZpeCBoYW5kbGluZyBvZiBvdmVyZmxvdyBvZiAvPSBhbmQg Kj0gb3BlcmF0b3JzIHdpdGggZG91YmxlIG92ZXIgQ2hlY2tlZDx1aW50NjRfdD4gYW5kIG90aGVy IDY0LWJpdCB0eXBlcy4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTIyNDgzNQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgICogd3RmL0NoZWNrZWRBcml0aG1ldGljLmg6IFNpbmNlIGl0IGlzIHF1aXRlIGRpZmZp Y3VsdCB0byB3cml0ZSBjb3JyZWN0IGltcGxlbWVudGF0aW9ucyBvZiB0aGUKKyAgICAgICAgb3Bl cmF0aW9ucyB3aGVyZSB3ZSBtdWx0aXBseSBvciBkaXZpZGUgYSBjaGVja2VkIGludGVnZXIgYnkg YSBmbG9hdGluZyBwb2ludCBudW1iZXIsIGRlbGV0ZWQKKyAgICAgICAgdGhvc2UgZnVuY3Rpb25z LCB3aGljaCB3ZXJlIGJhcmVseSB1c2VkLiBBbHNvIGNvcnJlY3RlZCByZXR1cm4gdHlwZXMgb2Yg dmFyaW91cyBtZW1iZXIgZnVuY3Rpb25zLAorICAgICAgICB3aGljaCB3ZXJlIHVuY29udmVudGlv bmFsICJjb25zdCBUeXBlIiwgcmVwbGFjaW5nIHRoZW0gd2l0aCB0aGUgY29udmVudGlvbmFsICJU eXBlIiBmb3IgZnVuY3Rpb25zCisgICAgICAgIHRoYXQgcmV0dXJuIGEgZGlzdGluY3QgdmFsdWUs ICJUeXBlJiIgZm9yIGFzc2lnbm1lbnQgb3BlcmF0b3JzLCBhbmQgYm9vbCBmb3IgcmVsYXRpb25h bCBvcGVyYXRvcnMuCisKIDIwMjEtMDQtMjMgIERhcmluIEFkbGVyICA8ZGFyaW5AYXBwbGUuY29t PgogCiAgICAgICAgIFJlbW92ZSBkZWNvZGVyIG1lbW9yeSBhbGxvY2F0aW9ucyBiYXNlZCBvbiB1 bnRydXN0ZWQgZGF0YSAoc2l6ZXMpIGluIHRoZSBzdHJlYW07IHJlbGF0ZWQgY2hhbmdlcwpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCmluZGV4IGFlNjRlNTY0M2ViNzkxOTU5MWFiY2JkMzI4NjhhZTc5ODlmMjcwZTAuLmE1MDUz ZTdkYTQ5NDI0Y2EzNzllMDYzMjQ1OTRmZTdiMWNlMmVkZTAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyAr MSwxNCBAQAorMjAyMS0wNC0yNSAgRGFyaW4gQWRsZXIgIDxkYXJpbkBhcHBsZS5jb20+CisKKyAg ICAgICAgRml4IGhhbmRsaW5nIG9mIG92ZXJmbG93IG9mIC89IGFuZCAqPSBvcGVyYXRvcnMgd2l0 aCBkb3VibGUgb3ZlciBDaGVja2VkPHVpbnQ2NF90PiBhbmQgb3RoZXIgNjQtYml0IHR5cGVzLgor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjI0ODM1CisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBwbGF0Zm9y bS9ncmFwaGljcy9ncHUvY29jb2EvR1BVQmluZEdyb3VwQWxsb2NhdG9yTWV0YWwubW06CisgICAg ICAgIChXZWJDb3JlOjpHUFVCaW5kR3JvdXBBbGxvY2F0b3I6OnJlYWxsb2NhdGUpOiBVc2UgaW50 ZWdlciBtYXRoIGluc3RlYWQgb2YgZmxvYXRpbmcgcG9pbnQgbWF0aCB0byBpbmNyZWFzZQorICAg ICAgICB0aGUgc2l6ZSBieSAyNSUgZWFjaCB0aW1lIHRocm91Z2ggdGhlIGxvb3AsIHN0YXlpbmcg d2l0aGluIHRoZSBjYXBhYmlsaXRpZXMgb2Ygb3VyIGNoZWNrZWQgaW50ZWdlciBjbGFzcy4KKwog MjAyMS0wNC0yNSAgVHlsZXIgV2lsY29jayAgPHR3aWxjby5vQHByb3Rvbm1haWwuY29tPgogCiAg ICAgICAgIGNzcy1jb250YWluIGNhdGVnb3J5IG1pc3NpbmcgZnJvbSBDU1NQcm9wZXJ0aWVzLmpz b24KZGlmZiAtLWdpdCBhL1NvdXJjZS9XVEYvd3RmL0NoZWNrZWRBcml0aG1ldGljLmggYi9Tb3Vy Y2UvV1RGL3d0Zi9DaGVja2VkQXJpdGhtZXRpYy5oCmluZGV4IDc0MGJlNDY2MDhiODk3ZTliYjI2 MzE1NGIzNzE1ODk3MjRlYmI3MzYuLmI4NTE2Zjg4MWUwYzRiYTNmZjFhYWMxNTg2MDZjOWVmOWQ1 NzMwYWMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvd3RmL0NoZWNrZWRBcml0aG1ldGljLmgKKysr IGIvU291cmNlL1dURi93dGYvQ2hlY2tlZEFyaXRobWV0aWMuaApAQCAtNzAzLDcgKzcwMyw3IEBA IHB1YmxpYzoKICAgICAgICAgbV92YWx1ZSA9IHN0YXRpY19jYXN0PFQ+KHJocy5tX3ZhbHVlKTsK ICAgICB9CiAgICAgCi0gICAgY29uc3QgQ2hlY2tlZCYgb3BlcmF0b3I9KENoZWNrZWQgcmhzKQor ICAgIENoZWNrZWQmIG9wZXJhdG9yPShDaGVja2VkIHJocykKICAgICB7CiAgICAgICAgIHRoaXMt PmNsZWFyT3ZlcmZsb3coKTsKICAgICAgICAgaWYgKHJocy5oYXNPdmVyZmxvd2VkKCkpCkBAIC03 MTIsMTggKzcxMiwxOCBAQCBwdWJsaWM6CiAgICAgICAgIHJldHVybiAqdGhpczsKICAgICB9CiAg ICAgCi0gICAgdGVtcGxhdGUgPHR5cGVuYW1lIFU+IGNvbnN0IENoZWNrZWQmIG9wZXJhdG9yPShV IHZhbHVlKQorICAgIHRlbXBsYXRlIDx0eXBlbmFtZSBVPiBDaGVja2VkJiBvcGVyYXRvcj0oVSB2 YWx1ZSkKICAgICB7CiAgICAgICAgIHJldHVybiAqdGhpcyA9IENoZWNrZWQodmFsdWUpOwogICAg IH0KICAgICAKLSAgICB0ZW1wbGF0ZSA8dHlwZW5hbWUgVSwgdHlwZW5hbWUgVj4gY29uc3QgQ2hl Y2tlZCYgb3BlcmF0b3I9KGNvbnN0IENoZWNrZWQ8VSwgVj4mIHJocykKKyAgICB0ZW1wbGF0ZSA8 dHlwZW5hbWUgVSwgdHlwZW5hbWUgVj4gQ2hlY2tlZCYgb3BlcmF0b3I9KGNvbnN0IENoZWNrZWQ8 VSwgVj4mIHJocykKICAgICB7CiAgICAgICAgIHJldHVybiAqdGhpcyA9IENoZWNrZWQocmhzKTsK ICAgICB9CiAgICAgCiAgICAgLy8gcHJlZml4Ci0gICAgY29uc3QgQ2hlY2tlZCYgb3BlcmF0b3Ir KygpCisgICAgQ2hlY2tlZCYgb3BlcmF0b3IrKygpCiAgICAgewogICAgICAgICBpZiAobV92YWx1 ZSA9PSBzdGQ6Om51bWVyaWNfbGltaXRzPFQ+OjptYXgoKSkKICAgICAgICAgICAgIHRoaXMtPm92 ZXJmbG93ZWQoKTsKQEAgLTczMSw3ICs3MzEsNyBAQCBwdWJsaWM6CiAgICAgICAgIHJldHVybiAq dGhpczsKICAgICB9CiAgICAgCi0gICAgY29uc3QgQ2hlY2tlZCYgb3BlcmF0b3ItLSgpCisgICAg Q2hlY2tlZCYgb3BlcmF0b3ItLSgpCiAgICAgewogICAgICAgICBpZiAobV92YWx1ZSA9PSBzdGQ6 Om51bWVyaWNfbGltaXRzPFQ+OjptaW4oKSkKICAgICAgICAgICAgIHRoaXMtPm92ZXJmbG93ZWQo KTsKQEAgLTc0MCwxNCArNzQwLDE0IEBAIHB1YmxpYzoKICAgICB9CiAgICAgCiAgICAgLy8gcG9z dGZpeCBvcGVyYXRvcnMKLSAgICBjb25zdCBDaGVja2VkIG9wZXJhdG9yKysoaW50KQorICAgIENo ZWNrZWQgb3BlcmF0b3IrKyhpbnQpCiAgICAgewogICAgICAgICBpZiAobV92YWx1ZSA9PSBzdGQ6 Om51bWVyaWNfbGltaXRzPFQ+OjptYXgoKSkKICAgICAgICAgICAgIHRoaXMtPm92ZXJmbG93ZWQo KTsKICAgICAgICAgcmV0dXJuIENoZWNrZWQobV92YWx1ZSsrKTsKICAgICB9CiAgICAgCi0gICAg Y29uc3QgQ2hlY2tlZCBvcGVyYXRvci0tKGludCkKKyAgICBDaGVja2VkIG9wZXJhdG9yLS0oaW50 KQogICAgIHsKICAgICAgICAgaWYgKG1fdmFsdWUgPT0gc3RkOjpudW1lcmljX2xpbWl0czxUPjo6 bWluKCkpCiAgICAgICAgICAgICB0aGlzLT5vdmVyZmxvd2VkKCk7CkBAIC03ODcsODMgKzc4Nyw0 OSBAQCBwdWJsaWM6CiAgICAgfQogCiAgICAgLy8gTXV0YXRpbmcgYXNzaWdubWVudAotICAgIHRl bXBsYXRlIDx0eXBlbmFtZSBVPiBjb25zdCBDaGVja2VkIG9wZXJhdG9yKz0oVSByaHMpCisgICAg dGVtcGxhdGUgPHR5cGVuYW1lIFU+IENoZWNrZWQmIG9wZXJhdG9yKz0oVSByaHMpCiAgICAgewog ICAgICAgICBpZiAoIXNhZmVBZGQ8T3ZlcmZsb3dIYW5kbGVyPihtX3ZhbHVlLCByaHMsIG1fdmFs dWUpKQogICAgICAgICAgICAgdGhpcy0+b3ZlcmZsb3dlZCgpOwogICAgICAgICByZXR1cm4gKnRo aXM7CiAgICAgfQogCi0gICAgdGVtcGxhdGUgPHR5cGVuYW1lIFU+IGNvbnN0IENoZWNrZWQgb3Bl cmF0b3ItPShVIHJocykKKyAgICB0ZW1wbGF0ZSA8dHlwZW5hbWUgVT4gQ2hlY2tlZCYgb3BlcmF0 b3ItPShVIHJocykKICAgICB7CiAgICAgICAgIGlmICghc2FmZVN1YjxPdmVyZmxvd0hhbmRsZXI+ KG1fdmFsdWUsIHJocywgbV92YWx1ZSkpCiAgICAgICAgICAgICB0aGlzLT5vdmVyZmxvd2VkKCk7 CiAgICAgICAgIHJldHVybiAqdGhpczsKICAgICB9CiAKLSAgICB0ZW1wbGF0ZSA8dHlwZW5hbWUg VT4gY29uc3QgQ2hlY2tlZCBvcGVyYXRvcio9KFUgcmhzKQorICAgIHRlbXBsYXRlIDx0eXBlbmFt ZSBVPiBDaGVja2VkJiBvcGVyYXRvcio9KFUgcmhzKQogICAgIHsKICAgICAgICAgaWYgKCFzYWZl TXVsdGlwbHk8T3ZlcmZsb3dIYW5kbGVyPihtX3ZhbHVlLCByaHMsIG1fdmFsdWUpKQogICAgICAg ICAgICAgdGhpcy0+b3ZlcmZsb3dlZCgpOwogICAgICAgICByZXR1cm4gKnRoaXM7CiAgICAgfQog Ci0gICAgdGVtcGxhdGUgPHR5cGVuYW1lIFU+IGNvbnN0IENoZWNrZWQgb3BlcmF0b3IvPShVIHJo cykKKyAgICB0ZW1wbGF0ZSA8dHlwZW5hbWUgVT4gQ2hlY2tlZCYgb3BlcmF0b3IvPShVIHJocykK ICAgICB7CiAgICAgICAgIGlmICghc2FmZURpdmlkZTxPdmVyZmxvd0hhbmRsZXI+KG1fdmFsdWUs IHJocywgbV92YWx1ZSkpCiAgICAgICAgICAgICB0aGlzLT5vdmVyZmxvd2VkKCk7CiAgICAgICAg IHJldHVybiAqdGhpczsKICAgICB9CiAKLSAgICBjb25zdCBDaGVja2VkIG9wZXJhdG9yKj0oZG91 YmxlIHJocykKLSAgICB7Ci0gICAgICAgIGRvdWJsZSByZXN1bHQgPSByaHMgKiBtX3ZhbHVlOwot ICAgICAgICAvLyBIYW5kbGUgKy8tIGluZmluaXR5IGFuZCBOYU4KLSAgICAgICAgaWYgKCEoc3Rk OjpudW1lcmljX2xpbWl0czxUPjo6bWluKCkgPD0gcmVzdWx0ICYmIHN0ZDo6bnVtZXJpY19saW1p dHM8VD46Om1heCgpID49IHJlc3VsdCkpCi0gICAgICAgICAgICB0aGlzLT5vdmVyZmxvd2VkKCk7 Ci0gICAgICAgIG1fdmFsdWUgPSAoVClyZXN1bHQ7Ci0gICAgICAgIHJldHVybiAqdGhpczsKLSAg ICB9Ci0KLSAgICBjb25zdCBDaGVja2VkIG9wZXJhdG9yLz0oZG91YmxlIHJocykKLSAgICB7Ci0g ICAgICAgIGlmICghcmhzKSB7Ci0gICAgICAgICAgICB0aGlzLT5vdmVyZmxvd2VkKCk7Ci0gICAg ICAgICAgICByZXR1cm4gKnRoaXM7Ci0gICAgICAgIH0KLSAgICAgICAgZG91YmxlIHJlc3VsdCA9 IG1fdmFsdWUgLyByaHM7Ci0gICAgICAgIC8vIEhhbmRsZSArLy0gaW5maW5pdHkgYW5kIE5hTgot ICAgICAgICBpZiAoIShzdGQ6Om51bWVyaWNfbGltaXRzPFQ+OjptaW4oKSA8PSByZXN1bHQgJiYg c3RkOjpudW1lcmljX2xpbWl0czxUPjo6bWF4KCkgPj0gcmVzdWx0KSkKLSAgICAgICAgICAgIHRo aXMtPm92ZXJmbG93ZWQoKTsKLSAgICAgICAgbV92YWx1ZSA9IChUKXJlc3VsdDsKLSAgICAgICAg cmV0dXJuICp0aGlzOwotICAgIH0KLQotICAgIGNvbnN0IENoZWNrZWQgb3BlcmF0b3IqPShmbG9h dCByaHMpCi0gICAgewotICAgICAgICByZXR1cm4gKnRoaXMgKj0gKGRvdWJsZSlyaHM7Ci0gICAg fQotCi0gICAgY29uc3QgQ2hlY2tlZCBvcGVyYXRvci89KGZsb2F0IHJocykKLSAgICB7Ci0gICAg ICAgIHJldHVybiAqdGhpcyAvPSAoZG91YmxlKXJoczsKLSAgICB9Ci0gICAgCi0gICAgdGVtcGxh dGUgPHR5cGVuYW1lIFUsIHR5cGVuYW1lIFY+IGNvbnN0IENoZWNrZWQgb3BlcmF0b3IrPShDaGVj a2VkPFUsIFY+IHJocykKKyAgICB0ZW1wbGF0ZSA8dHlwZW5hbWUgVSwgdHlwZW5hbWUgVj4gQ2hl Y2tlZCYgb3BlcmF0b3IrPShDaGVja2VkPFUsIFY+IHJocykKICAgICB7CiAgICAgICAgIGlmIChy aHMuaGFzT3ZlcmZsb3dlZCgpKQogICAgICAgICAgICAgdGhpcy0+b3ZlcmZsb3dlZCgpOwogICAg ICAgICByZXR1cm4gKnRoaXMgKz0gcmhzLm1fdmFsdWU7CiAgICAgfQogCi0gICAgdGVtcGxhdGUg PHR5cGVuYW1lIFUsIHR5cGVuYW1lIFY+IGNvbnN0IENoZWNrZWQgb3BlcmF0b3ItPShDaGVja2Vk PFUsIFY+IHJocykKKyAgICB0ZW1wbGF0ZSA8dHlwZW5hbWUgVSwgdHlwZW5hbWUgVj4gQ2hlY2tl ZCYgb3BlcmF0b3ItPShDaGVja2VkPFUsIFY+IHJocykKICAgICB7CiAgICAgICAgIGlmIChyaHMu aGFzT3ZlcmZsb3dlZCgpKQogICAgICAgICAgICAgdGhpcy0+b3ZlcmZsb3dlZCgpOwogICAgICAg ICByZXR1cm4gKnRoaXMgLT0gcmhzLm1fdmFsdWU7CiAgICAgfQogCi0gICAgdGVtcGxhdGUgPHR5 cGVuYW1lIFUsIHR5cGVuYW1lIFY+IGNvbnN0IENoZWNrZWQgb3BlcmF0b3IqPShDaGVja2VkPFUs IFY+IHJocykKKyAgICB0ZW1wbGF0ZSA8dHlwZW5hbWUgVSwgdHlwZW5hbWUgVj4gQ2hlY2tlZCYg b3BlcmF0b3IqPShDaGVja2VkPFUsIFY+IHJocykKICAgICB7CiAgICAgICAgIGlmIChyaHMuaGFz T3ZlcmZsb3dlZCgpKQogICAgICAgICAgICAgdGhpcy0+b3ZlcmZsb3dlZCgpOwpAQCAtODgzLDcg Kzg0OSw3IEBAIHB1YmxpYzoKICAgICAgICAgcmV0dXJuIHNhZmVFcXVhbHMobV92YWx1ZSwgcmhz KTsKICAgICB9CiAgICAgCi0gICAgdGVtcGxhdGUgPHR5cGVuYW1lIFUsIHR5cGVuYW1lIFY+IGNv bnN0IENoZWNrZWQgb3BlcmF0b3I9PShDaGVja2VkPFUsIFY+IHJocykKKyAgICB0ZW1wbGF0ZSA8 dHlwZW5hbWUgVSwgdHlwZW5hbWUgVj4gYm9vbCBvcGVyYXRvcj09KENoZWNrZWQ8VSwgVj4gcmhz KQogICAgIHsKICAgICAgICAgcmV0dXJuIHVuc2FmZUdldCgpID09IENoZWNrZWQocmhzLnVuc2Fm ZUdldCgpKTsKICAgICB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFw aGljcy9ncHUvY29jb2EvR1BVQmluZEdyb3VwQWxsb2NhdG9yTWV0YWwubW0gYi9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9ncmFwaGljcy9ncHUvY29jb2EvR1BVQmluZEdyb3VwQWxsb2NhdG9yTWV0 YWwubW0KaW5kZXggMWYxOGIyMjBiNTA4OWZhNmQ4ZWFlZjViYzY2ZmFlODIxODcwNTc2OS4uNDhm YjAyZGZjOTQyNDAxMTlmMjZkNGMwMGRkZWZiZjU1MzgxNGYzZiAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3B1L2NvY29hL0dQVUJpbmRHcm91cEFsbG9jYXRv ck1ldGFsLm1tCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dwdS9jb2Nv YS9HUFVCaW5kR3JvdXBBbGxvY2F0b3JNZXRhbC5tbQpAQCAtMTMwLDcgKzEzMCw3IEBAIGJvb2wg R1BVQmluZEdyb3VwQWxsb2NhdG9yOjpyZWFsbG9jYXRlKE5TVUludGVnZXIgbmV3T2Zmc2V0KQog CiAgICAgYXV0byBuZXdMZW5ndGggPSBDaGVja2VkPE5TVUludGVnZXI+KG1fYXJndW1lbnRCdWZm ZXIuZ2V0KCkubGVuZ3RoKTsKICAgICB3aGlsZSAobmV3TGVuZ3RoIDwgbmV3T2Zmc2V0KSB7Ci0g ICAgICAgIG5ld0xlbmd0aCAqPSAxLjI1OworICAgICAgICBuZXdMZW5ndGggKz0gbmV3TGVuZ3Ro IC8gNFU7CiAKICAgICAgICAgaWYgKG5ld0xlbmd0aC5oYXNPdmVyZmxvd2VkKCkpIHsKICAgICAg ICAgICAgIG5ld0xlbmd0aCA9IHN0ZDo6bnVtZXJpY19saW1pdHM8TlNVSW50ZWdlcj46Om1heCgp Owo= 427010 2021-04-25 13:13:23 -0700 2021-04-25 15:59:13 -0700 Patch bug-224835-20210425131322.patch text/plain 9320 darin U3VidmVyc2lvbiBSZXZpc2lvbjogMjc2NTY3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL0NoYW5n ZUxvZyBiL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCmluZGV4IDYxZDhhZmFjOGM2MmUwZDlmMTI3NTFj ZGNmNjFhNDUzMzEwOGNiYzcuLjMxNjg0NzdlNTgyMjg2ZDZkMDA3YzkxYzM2M2VmYWMyMzA4MjJl NGIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XVEYvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMTYgQEAKKzIwMjEtMDQtMjUgIERhcmluIEFkbGVyICA8ZGFyaW5A YXBwbGUuY29tPgorCisgICAgICAgIEZpeCBoYW5kbGluZyBvZiBvdmVyZmxvdyBvZiAvPSBhbmQg Kj0gb3BlcmF0b3JzIHdpdGggZG91YmxlIG92ZXIgQ2hlY2tlZDx1aW50NjRfdD4gYW5kIG90aGVy IDY0LWJpdCB0eXBlcy4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTIyNDgzNQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgICogd3RmL0NoZWNrZWRBcml0aG1ldGljLmg6IFNpbmNlIGl0IGlzIHF1aXRlIGRpZmZp Y3VsdCB0byB3cml0ZSBjb3JyZWN0IGltcGxlbWVudGF0aW9ucyBvZiB0aGUKKyAgICAgICAgb3Bl cmF0aW9ucyB3aGVyZSB3ZSBtdWx0aXBseSBvciBkaXZpZGUgYSBjaGVja2VkIGludGVnZXIgYnkg YSBmbG9hdGluZyBwb2ludCBudW1iZXIsIGRlbGV0ZWQKKyAgICAgICAgdGhvc2UgZnVuY3Rpb25z LCB3aGljaCB3ZXJlIGJhcmVseSB1c2VkLiBBbHNvIGNvcnJlY3RlZCByZXR1cm4gdHlwZXMgb2Yg dmFyaW91cyBtZW1iZXIgZnVuY3Rpb25zLAorICAgICAgICB3aGljaCB3ZXJlIHVuY29udmVudGlv bmFsICJjb25zdCBUeXBlIiwgcmVwbGFjaW5nIHRoZW0gd2l0aCB0aGUgY29udmVudGlvbmFsICJU eXBlIiBmb3IgZnVuY3Rpb25zCisgICAgICAgIHRoYXQgcmV0dXJuIGEgZGlzdGluY3QgdmFsdWUs ICJUeXBlJiIgZm9yIGFzc2lnbm1lbnQgb3BlcmF0b3JzLCBhbmQgYm9vbCBmb3IgcmVsYXRpb25h bCBvcGVyYXRvcnMuCisKIDIwMjEtMDQtMjMgIERhcmluIEFkbGVyICA8ZGFyaW5AYXBwbGUuY29t PgogCiAgICAgICAgIFJlbW92ZSBkZWNvZGVyIG1lbW9yeSBhbGxvY2F0aW9ucyBiYXNlZCBvbiB1 bnRydXN0ZWQgZGF0YSAoc2l6ZXMpIGluIHRoZSBzdHJlYW07IHJlbGF0ZWQgY2hhbmdlcwpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCmluZGV4IGFlNjRlNTY0M2ViNzkxOTU5MWFiY2JkMzI4NjhhZTc5ODlmMjcwZTAuLmE1MDUz ZTdkYTQ5NDI0Y2EzNzllMDYzMjQ1OTRmZTdiMWNlMmVkZTAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyAr MSwxNCBAQAorMjAyMS0wNC0yNSAgRGFyaW4gQWRsZXIgIDxkYXJpbkBhcHBsZS5jb20+CisKKyAg ICAgICAgRml4IGhhbmRsaW5nIG9mIG92ZXJmbG93IG9mIC89IGFuZCAqPSBvcGVyYXRvcnMgd2l0 aCBkb3VibGUgb3ZlciBDaGVja2VkPHVpbnQ2NF90PiBhbmQgb3RoZXIgNjQtYml0IHR5cGVzLgor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjI0ODM1CisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBwbGF0Zm9y bS9ncmFwaGljcy9ncHUvY29jb2EvR1BVQmluZEdyb3VwQWxsb2NhdG9yTWV0YWwubW06CisgICAg ICAgIChXZWJDb3JlOjpHUFVCaW5kR3JvdXBBbGxvY2F0b3I6OnJlYWxsb2NhdGUpOiBVc2UgaW50 ZWdlciBtYXRoIGluc3RlYWQgb2YgZmxvYXRpbmcgcG9pbnQgbWF0aCB0byBpbmNyZWFzZQorICAg ICAgICB0aGUgc2l6ZSBieSAyNSUgZWFjaCB0aW1lIHRocm91Z2ggdGhlIGxvb3AsIHN0YXlpbmcg d2l0aGluIHRoZSBjYXBhYmlsaXRpZXMgb2Ygb3VyIGNoZWNrZWQgaW50ZWdlciBjbGFzcy4KKwog MjAyMS0wNC0yNSAgVHlsZXIgV2lsY29jayAgPHR3aWxjby5vQHByb3Rvbm1haWwuY29tPgogCiAg ICAgICAgIGNzcy1jb250YWluIGNhdGVnb3J5IG1pc3NpbmcgZnJvbSBDU1NQcm9wZXJ0aWVzLmpz b24KZGlmZiAtLWdpdCBhL1NvdXJjZS9XVEYvd3RmL0NoZWNrZWRBcml0aG1ldGljLmggYi9Tb3Vy Y2UvV1RGL3d0Zi9DaGVja2VkQXJpdGhtZXRpYy5oCmluZGV4IDc0MGJlNDY2MDhiODk3ZTliYjI2 MzE1NGIzNzE1ODk3MjRlYmI3MzYuLmI4NTE2Zjg4MWUwYzRiYTNmZjFhYWMxNTg2MDZjOWVmOWQ1 NzMwYWMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvd3RmL0NoZWNrZWRBcml0aG1ldGljLmgKKysr IGIvU291cmNlL1dURi93dGYvQ2hlY2tlZEFyaXRobWV0aWMuaApAQCAtNzAzLDcgKzcwMyw3IEBA IHB1YmxpYzoKICAgICAgICAgbV92YWx1ZSA9IHN0YXRpY19jYXN0PFQ+KHJocy5tX3ZhbHVlKTsK ICAgICB9CiAgICAgCi0gICAgY29uc3QgQ2hlY2tlZCYgb3BlcmF0b3I9KENoZWNrZWQgcmhzKQor ICAgIENoZWNrZWQmIG9wZXJhdG9yPShDaGVja2VkIHJocykKICAgICB7CiAgICAgICAgIHRoaXMt PmNsZWFyT3ZlcmZsb3coKTsKICAgICAgICAgaWYgKHJocy5oYXNPdmVyZmxvd2VkKCkpCkBAIC03 MTIsMTggKzcxMiwxOCBAQCBwdWJsaWM6CiAgICAgICAgIHJldHVybiAqdGhpczsKICAgICB9CiAg ICAgCi0gICAgdGVtcGxhdGUgPHR5cGVuYW1lIFU+IGNvbnN0IENoZWNrZWQmIG9wZXJhdG9yPShV IHZhbHVlKQorICAgIHRlbXBsYXRlIDx0eXBlbmFtZSBVPiBDaGVja2VkJiBvcGVyYXRvcj0oVSB2 YWx1ZSkKICAgICB7CiAgICAgICAgIHJldHVybiAqdGhpcyA9IENoZWNrZWQodmFsdWUpOwogICAg IH0KICAgICAKLSAgICB0ZW1wbGF0ZSA8dHlwZW5hbWUgVSwgdHlwZW5hbWUgVj4gY29uc3QgQ2hl Y2tlZCYgb3BlcmF0b3I9KGNvbnN0IENoZWNrZWQ8VSwgVj4mIHJocykKKyAgICB0ZW1wbGF0ZSA8 dHlwZW5hbWUgVSwgdHlwZW5hbWUgVj4gQ2hlY2tlZCYgb3BlcmF0b3I9KGNvbnN0IENoZWNrZWQ8 VSwgVj4mIHJocykKICAgICB7CiAgICAgICAgIHJldHVybiAqdGhpcyA9IENoZWNrZWQocmhzKTsK ICAgICB9CiAgICAgCiAgICAgLy8gcHJlZml4Ci0gICAgY29uc3QgQ2hlY2tlZCYgb3BlcmF0b3Ir KygpCisgICAgQ2hlY2tlZCYgb3BlcmF0b3IrKygpCiAgICAgewogICAgICAgICBpZiAobV92YWx1 ZSA9PSBzdGQ6Om51bWVyaWNfbGltaXRzPFQ+OjptYXgoKSkKICAgICAgICAgICAgIHRoaXMtPm92 ZXJmbG93ZWQoKTsKQEAgLTczMSw3ICs3MzEsNyBAQCBwdWJsaWM6CiAgICAgICAgIHJldHVybiAq dGhpczsKICAgICB9CiAgICAgCi0gICAgY29uc3QgQ2hlY2tlZCYgb3BlcmF0b3ItLSgpCisgICAg Q2hlY2tlZCYgb3BlcmF0b3ItLSgpCiAgICAgewogICAgICAgICBpZiAobV92YWx1ZSA9PSBzdGQ6 Om51bWVyaWNfbGltaXRzPFQ+OjptaW4oKSkKICAgICAgICAgICAgIHRoaXMtPm92ZXJmbG93ZWQo KTsKQEAgLTc0MCwxNCArNzQwLDE0IEBAIHB1YmxpYzoKICAgICB9CiAgICAgCiAgICAgLy8gcG9z dGZpeCBvcGVyYXRvcnMKLSAgICBjb25zdCBDaGVja2VkIG9wZXJhdG9yKysoaW50KQorICAgIENo ZWNrZWQgb3BlcmF0b3IrKyhpbnQpCiAgICAgewogICAgICAgICBpZiAobV92YWx1ZSA9PSBzdGQ6 Om51bWVyaWNfbGltaXRzPFQ+OjptYXgoKSkKICAgICAgICAgICAgIHRoaXMtPm92ZXJmbG93ZWQo KTsKICAgICAgICAgcmV0dXJuIENoZWNrZWQobV92YWx1ZSsrKTsKICAgICB9CiAgICAgCi0gICAg Y29uc3QgQ2hlY2tlZCBvcGVyYXRvci0tKGludCkKKyAgICBDaGVja2VkIG9wZXJhdG9yLS0oaW50 KQogICAgIHsKICAgICAgICAgaWYgKG1fdmFsdWUgPT0gc3RkOjpudW1lcmljX2xpbWl0czxUPjo6 bWluKCkpCiAgICAgICAgICAgICB0aGlzLT5vdmVyZmxvd2VkKCk7CkBAIC03ODcsODMgKzc4Nyw0 OSBAQCBwdWJsaWM6CiAgICAgfQogCiAgICAgLy8gTXV0YXRpbmcgYXNzaWdubWVudAotICAgIHRl bXBsYXRlIDx0eXBlbmFtZSBVPiBjb25zdCBDaGVja2VkIG9wZXJhdG9yKz0oVSByaHMpCisgICAg dGVtcGxhdGUgPHR5cGVuYW1lIFU+IENoZWNrZWQmIG9wZXJhdG9yKz0oVSByaHMpCiAgICAgewog ICAgICAgICBpZiAoIXNhZmVBZGQ8T3ZlcmZsb3dIYW5kbGVyPihtX3ZhbHVlLCByaHMsIG1fdmFs dWUpKQogICAgICAgICAgICAgdGhpcy0+b3ZlcmZsb3dlZCgpOwogICAgICAgICByZXR1cm4gKnRo aXM7CiAgICAgfQogCi0gICAgdGVtcGxhdGUgPHR5cGVuYW1lIFU+IGNvbnN0IENoZWNrZWQgb3Bl cmF0b3ItPShVIHJocykKKyAgICB0ZW1wbGF0ZSA8dHlwZW5hbWUgVT4gQ2hlY2tlZCYgb3BlcmF0 b3ItPShVIHJocykKICAgICB7CiAgICAgICAgIGlmICghc2FmZVN1YjxPdmVyZmxvd0hhbmRsZXI+ KG1fdmFsdWUsIHJocywgbV92YWx1ZSkpCiAgICAgICAgICAgICB0aGlzLT5vdmVyZmxvd2VkKCk7 CiAgICAgICAgIHJldHVybiAqdGhpczsKICAgICB9CiAKLSAgICB0ZW1wbGF0ZSA8dHlwZW5hbWUg VT4gY29uc3QgQ2hlY2tlZCBvcGVyYXRvcio9KFUgcmhzKQorICAgIHRlbXBsYXRlIDx0eXBlbmFt ZSBVPiBDaGVja2VkJiBvcGVyYXRvcio9KFUgcmhzKQogICAgIHsKICAgICAgICAgaWYgKCFzYWZl TXVsdGlwbHk8T3ZlcmZsb3dIYW5kbGVyPihtX3ZhbHVlLCByaHMsIG1fdmFsdWUpKQogICAgICAg ICAgICAgdGhpcy0+b3ZlcmZsb3dlZCgpOwogICAgICAgICByZXR1cm4gKnRoaXM7CiAgICAgfQog Ci0gICAgdGVtcGxhdGUgPHR5cGVuYW1lIFU+IGNvbnN0IENoZWNrZWQgb3BlcmF0b3IvPShVIHJo cykKKyAgICB0ZW1wbGF0ZSA8dHlwZW5hbWUgVT4gQ2hlY2tlZCYgb3BlcmF0b3IvPShVIHJocykK ICAgICB7CiAgICAgICAgIGlmICghc2FmZURpdmlkZTxPdmVyZmxvd0hhbmRsZXI+KG1fdmFsdWUs IHJocywgbV92YWx1ZSkpCiAgICAgICAgICAgICB0aGlzLT5vdmVyZmxvd2VkKCk7CiAgICAgICAg IHJldHVybiAqdGhpczsKICAgICB9CiAKLSAgICBjb25zdCBDaGVja2VkIG9wZXJhdG9yKj0oZG91 YmxlIHJocykKLSAgICB7Ci0gICAgICAgIGRvdWJsZSByZXN1bHQgPSByaHMgKiBtX3ZhbHVlOwot ICAgICAgICAvLyBIYW5kbGUgKy8tIGluZmluaXR5IGFuZCBOYU4KLSAgICAgICAgaWYgKCEoc3Rk OjpudW1lcmljX2xpbWl0czxUPjo6bWluKCkgPD0gcmVzdWx0ICYmIHN0ZDo6bnVtZXJpY19saW1p dHM8VD46Om1heCgpID49IHJlc3VsdCkpCi0gICAgICAgICAgICB0aGlzLT5vdmVyZmxvd2VkKCk7 Ci0gICAgICAgIG1fdmFsdWUgPSAoVClyZXN1bHQ7Ci0gICAgICAgIHJldHVybiAqdGhpczsKLSAg ICB9Ci0KLSAgICBjb25zdCBDaGVja2VkIG9wZXJhdG9yLz0oZG91YmxlIHJocykKLSAgICB7Ci0g ICAgICAgIGlmICghcmhzKSB7Ci0gICAgICAgICAgICB0aGlzLT5vdmVyZmxvd2VkKCk7Ci0gICAg ICAgICAgICByZXR1cm4gKnRoaXM7Ci0gICAgICAgIH0KLSAgICAgICAgZG91YmxlIHJlc3VsdCA9 IG1fdmFsdWUgLyByaHM7Ci0gICAgICAgIC8vIEhhbmRsZSArLy0gaW5maW5pdHkgYW5kIE5hTgot ICAgICAgICBpZiAoIShzdGQ6Om51bWVyaWNfbGltaXRzPFQ+OjptaW4oKSA8PSByZXN1bHQgJiYg c3RkOjpudW1lcmljX2xpbWl0czxUPjo6bWF4KCkgPj0gcmVzdWx0KSkKLSAgICAgICAgICAgIHRo aXMtPm92ZXJmbG93ZWQoKTsKLSAgICAgICAgbV92YWx1ZSA9IChUKXJlc3VsdDsKLSAgICAgICAg cmV0dXJuICp0aGlzOwotICAgIH0KLQotICAgIGNvbnN0IENoZWNrZWQgb3BlcmF0b3IqPShmbG9h dCByaHMpCi0gICAgewotICAgICAgICByZXR1cm4gKnRoaXMgKj0gKGRvdWJsZSlyaHM7Ci0gICAg fQotCi0gICAgY29uc3QgQ2hlY2tlZCBvcGVyYXRvci89KGZsb2F0IHJocykKLSAgICB7Ci0gICAg ICAgIHJldHVybiAqdGhpcyAvPSAoZG91YmxlKXJoczsKLSAgICB9Ci0gICAgCi0gICAgdGVtcGxh dGUgPHR5cGVuYW1lIFUsIHR5cGVuYW1lIFY+IGNvbnN0IENoZWNrZWQgb3BlcmF0b3IrPShDaGVj a2VkPFUsIFY+IHJocykKKyAgICB0ZW1wbGF0ZSA8dHlwZW5hbWUgVSwgdHlwZW5hbWUgVj4gQ2hl Y2tlZCYgb3BlcmF0b3IrPShDaGVja2VkPFUsIFY+IHJocykKICAgICB7CiAgICAgICAgIGlmIChy aHMuaGFzT3ZlcmZsb3dlZCgpKQogICAgICAgICAgICAgdGhpcy0+b3ZlcmZsb3dlZCgpOwogICAg ICAgICByZXR1cm4gKnRoaXMgKz0gcmhzLm1fdmFsdWU7CiAgICAgfQogCi0gICAgdGVtcGxhdGUg PHR5cGVuYW1lIFUsIHR5cGVuYW1lIFY+IGNvbnN0IENoZWNrZWQgb3BlcmF0b3ItPShDaGVja2Vk PFUsIFY+IHJocykKKyAgICB0ZW1wbGF0ZSA8dHlwZW5hbWUgVSwgdHlwZW5hbWUgVj4gQ2hlY2tl ZCYgb3BlcmF0b3ItPShDaGVja2VkPFUsIFY+IHJocykKICAgICB7CiAgICAgICAgIGlmIChyaHMu aGFzT3ZlcmZsb3dlZCgpKQogICAgICAgICAgICAgdGhpcy0+b3ZlcmZsb3dlZCgpOwogICAgICAg ICByZXR1cm4gKnRoaXMgLT0gcmhzLm1fdmFsdWU7CiAgICAgfQogCi0gICAgdGVtcGxhdGUgPHR5 cGVuYW1lIFUsIHR5cGVuYW1lIFY+IGNvbnN0IENoZWNrZWQgb3BlcmF0b3IqPShDaGVja2VkPFUs IFY+IHJocykKKyAgICB0ZW1wbGF0ZSA8dHlwZW5hbWUgVSwgdHlwZW5hbWUgVj4gQ2hlY2tlZCYg b3BlcmF0b3IqPShDaGVja2VkPFUsIFY+IHJocykKICAgICB7CiAgICAgICAgIGlmIChyaHMuaGFz T3ZlcmZsb3dlZCgpKQogICAgICAgICAgICAgdGhpcy0+b3ZlcmZsb3dlZCgpOwpAQCAtODgzLDcg Kzg0OSw3IEBAIHB1YmxpYzoKICAgICAgICAgcmV0dXJuIHNhZmVFcXVhbHMobV92YWx1ZSwgcmhz KTsKICAgICB9CiAgICAgCi0gICAgdGVtcGxhdGUgPHR5cGVuYW1lIFUsIHR5cGVuYW1lIFY+IGNv bnN0IENoZWNrZWQgb3BlcmF0b3I9PShDaGVja2VkPFUsIFY+IHJocykKKyAgICB0ZW1wbGF0ZSA8 dHlwZW5hbWUgVSwgdHlwZW5hbWUgVj4gYm9vbCBvcGVyYXRvcj09KENoZWNrZWQ8VSwgVj4gcmhz KQogICAgIHsKICAgICAgICAgcmV0dXJuIHVuc2FmZUdldCgpID09IENoZWNrZWQocmhzLnVuc2Fm ZUdldCgpKTsKICAgICB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFw aGljcy9ncHUvY29jb2EvR1BVQmluZEdyb3VwQWxsb2NhdG9yTWV0YWwubW0gYi9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9ncmFwaGljcy9ncHUvY29jb2EvR1BVQmluZEdyb3VwQWxsb2NhdG9yTWV0 YWwubW0KaW5kZXggMWYxOGIyMjBiNTA4OWZhNmQ4ZWFlZjViYzY2ZmFlODIxODcwNTc2OS4uNDhm YjAyZGZjOTQyNDAxMTlmMjZkNGMwMGRkZWZiZjU1MzgxNGYzZiAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3B1L2NvY29hL0dQVUJpbmRHcm91cEFsbG9jYXRv ck1ldGFsLm1tCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dwdS9jb2Nv YS9HUFVCaW5kR3JvdXBBbGxvY2F0b3JNZXRhbC5tbQpAQCAtMTMwLDcgKzEzMCw3IEBAIGJvb2wg R1BVQmluZEdyb3VwQWxsb2NhdG9yOjpyZWFsbG9jYXRlKE5TVUludGVnZXIgbmV3T2Zmc2V0KQog CiAgICAgYXV0byBuZXdMZW5ndGggPSBDaGVja2VkPE5TVUludGVnZXI+KG1fYXJndW1lbnRCdWZm ZXIuZ2V0KCkubGVuZ3RoKTsKICAgICB3aGlsZSAobmV3TGVuZ3RoIDwgbmV3T2Zmc2V0KSB7Ci0g ICAgICAgIG5ld0xlbmd0aCAqPSAxLjI1OworICAgICAgICBuZXdMZW5ndGggKz0gbmV3TGVuZ3Ro IC8gNFU7CiAKICAgICAgICAgaWYgKG5ld0xlbmd0aC5oYXNPdmVyZmxvd2VkKCkpIHsKICAgICAg ICAgICAgIG5ld0xlbmd0aCA9IHN0ZDo6bnVtZXJpY19saW1pdHM8TlNVSW50ZWdlcj46Om1heCgp OwpkaWZmIC0tZ2l0IGEvVG9vbHMvQ2hhbmdlTG9nIGIvVG9vbHMvQ2hhbmdlTG9nCmluZGV4IDhh OTRkZWUyMTIxNzI1NTIyZWUxODU1YzViNzYyMjdmZmVlOGMwZTUuLjNkOTdkZjQyYjhiZWMyMDEy MjcyMjZhMmYxNTg3Mjk4MjA3NzAxMDQgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0NoYW5nZUxvZworKysg Yi9Ub29scy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxMyBAQAorMjAyMS0wNC0yNSAgRGFyaW4gQWRs ZXIgIDxkYXJpbkBhcHBsZS5jb20+CisKKyAgICAgICAgRml4IGhhbmRsaW5nIG9mIG92ZXJmbG93 IG9mIC89IGFuZCAqPSBvcGVyYXRvcnMgd2l0aCBkb3VibGUgb3ZlciBDaGVja2VkPHVpbnQ2NF90 PiBhbmQgb3RoZXIgNjQtYml0IHR5cGVzLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MjI0ODM1CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgKiBUZXN0V2ViS2l0QVBJL1Rlc3RzL1dURi9DaGVja2VkQXJpdGht ZXRpY09wZXJhdGlvbnMuY3BwOgorICAgICAgICBSZW1vdmVkIHRlc3RzIG9mIHRoZSAiLz0iIG9w ZXJhdG9yIHdpdGggZmxvYXRpbmcgcG9pbnQgYXJndW1lbnRzLCBubyBsb25nZXIgc3VwcG9ydGVk LgorCiAyMDIxLTA0LTI1ICBUeWxlciBXaWxjb2NrICA8dHdpbGNvLm9AcHJvdG9ubWFpbC5jb20+ CiAKICAgICAgICAganNvbmNoZWNrZXIucHkgdmFsaWRhdGVfc3RyaW5nIHVzZXMgUHl0aG9uIDIg YmFzZXN0cmluZyB0eXBlIGluc3RlYWQgb2YgUHl0aG9uIDIvMyBzdHIgdHlwZQpkaWZmIC0tZ2l0 IGEvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XVEYvQ2hlY2tlZEFyaXRobWV0aWNPcGVyYXRp b25zLmNwcCBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV1RGL0NoZWNrZWRBcml0aG1ldGlj T3BlcmF0aW9ucy5jcHAKaW5kZXggM2UzMTFiYmFlOTM3OTY2NjhkODBhNTMwYzU5NDY3M2MxZWI2 MTcyMC4uNmQ5NzcyYzk2MGFjNDA2OTg5NGNhNzU4MDVlNWQ3M2JiOTFiZTQzOCAxMDA2NDQKLS0t IGEvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XVEYvQ2hlY2tlZEFyaXRobWV0aWNPcGVyYXRp b25zLmNwcAorKysgYi9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dURi9DaGVja2VkQXJpdGht ZXRpY09wZXJhdGlvbnMuY3BwCkBAIC01MDcsMTMgKzUwNyw2IEBAIFRFU1QoQ2hlY2tlZEFyaXRo bWV0aWNUZXN0LCBEaXZpc2lvbikKICAgICBzaXplID0gMTAwOwogICAgIEVYUEVDVF9GQUxTRShz aXplLmhhc092ZXJmbG93ZWQoKSk7CiAgICAgRVhQRUNUX0VRKDEwMFUsIHNpemUudW5zYWZlR2V0 KCkpOwotCi0gICAgc2l6ZSAvPSAxMC41OwotICAgIEVYUEVDVF9GQUxTRShzaXplLmhhc092ZXJm bG93ZWQoKSk7Ci0gICAgRVhQRUNUX0VRKDlVLCBzaXplLnVuc2FmZUdldCgpKTsKLQotICAgIHNp emUgLz0gMC4wOwotICAgIEVYUEVDVF9UUlVFKHNpemUuaGFzT3ZlcmZsb3dlZCgpKTsKIH0KIAog fSAvLyBuYW1lc3BhY2UgVGVzdFdlYktpdEFQSQo=