235760 2022-01-28 02:08:46 -0800 [GStreamer] GstStructure to JSON serialization 2022-01-30 05:21:18 -0800 1 1 1 Unclassified WebKit Platform WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 pnormand pnormand calvaris cgarcia ews-watchlist gustavo menard vjaquez webkit-bug-importer oldest_to_newest 1834862 0 pnormand 2022-01-28 02:08:46 -0800 Would be useful for gstwebrtc stats logging. 1834871 1 450217 pnormand 2022-01-28 02:57:06 -0800 Created attachment 450217 Patch 1834985 2 450217 calvaris 2022-01-28 08:26:24 -0800 Comment on attachment 450217 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=450217&action=review > Source/WebCore/platform/graphics/gstreamer/GStreamerCommon.cpp:556 > + auto resultArray = array->asArray(); > + return resultArray->asValue(); I would collapse these two lines if possible. > Source/WebCore/platform/graphics/gstreamer/GStreamerCommon.h:322 > +String structureToJSONString(const GstStructure*); I might go (not only for this method, but for the other ones as well) for something like gstStructureTo... > Tools/TestWebKitAPI/Tests/WebCore/gstreamer/GStreamerTest.cpp:57 > + ASSERT_EQ(jsonString, "{\"int-val\":5,\"str-val\":\"foo\",\"bool-val\":1}"); Are we not interested in printing the structure name? 1834998 3 450217 pnormand 2022-01-28 09:01:22 -0800 Comment on attachment 450217 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=450217&action=review >> Tools/TestWebKitAPI/Tests/WebCore/gstreamer/GStreamerTest.cpp:57 >> + ASSERT_EQ(jsonString, "{\"int-val\":5,\"str-val\":\"foo\",\"bool-val\":1}"); > > Are we not interested in printing the structure name? For non-nested structures I don't see the point and it would add one level of nesting, only for the name: {"name": {...}}. > Tools/TestWebKitAPI/Tests/WebCore/gstreamer/GStreamerTest.cpp:62 > + ASSERT_EQ(jsonString, "{\"int-val\":5,\"str-val\":\"foo\",\"bool-val\":1,\"inner\":{\"boo\":0,\"double-val\":2.42}}"); Here the nested struct is identified by its name though. 1835372 4 450358 pnormand 2022-01-30 04:24:48 -0800 Created attachment 450358 Patch 1835373 5 ews-feeder 2022-01-30 05:20:33 -0800 Committed r288799 (246575@main): <https://commits.webkit.org/246575@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 450358. 1835374 6 webkit-bug-importer 2022-01-30 05:21:18 -0800 <rdar://problem/88239833> 450217 2022-01-28 02:57:06 -0800 2022-01-30 04:24:43 -0800 Patch bug-235760-20220128025704.patch text/plain 7243 pnormand U3VidmVyc2lvbiBSZXZpc2lvbjogMjg4NzM0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYTc2MjQzYjA4YzE5OGRm ZGNmYTM5Y2EyMDhmNjJlMDc2MjM5OTY5MC4uYzg3YmY4ZDBjNzBjODhlYmVjMTMwN2NkOGJhNTdi ZjNjODc1OGI1YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDIyLTAxLTI4ICBQaGls aXBwZSBOb3JtYW5kICA8cG5vcm1hbmRAaWdhbGlhLmNvbT4KKworICAgICAgICBbR1N0cmVhbWVy XSBHc3RTdHJ1Y3R1cmUgdG8gSlNPTiBzZXJpYWxpemF0aW9uCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzU3NjAKKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBGb3IgR3N0V2ViUlRDIHN0YXRzIGxvZ2dpbmcg cHVycG9zZXMgSlNPTiBpcyBhIGdvb2QgcGF5bG9hZCBmb3JtYXQuIEFzIHRoZSBzdGF0cyBhcmUK KyAgICAgICAgaW5pdGlhbGx5IG5vdGlmaWVkIHZpYSBHc3RTdHJ1Y3R1cmVzIHdlIG5lZWQgYSB3 YXkgdG8gZXhwb3J0IHRob3NlIHRvIEpTT04sIHVzaW5nIGEgbmV3IEFQSQorICAgICAgICBpbiBH U3RyZWFtZXJDb21tb24uCisKKyAgICAgICAgQ292ZXJlZCBieSBBUEkgdGVzdHMuCisKKyAgICAg ICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvR1N0cmVhbWVyQ29tbW9uLmNwcDoKKyAg ICAgICAgKFdlYkNvcmU6OnN0cnVjdHVyZVZhbHVlVG9KU09OKToKKyAgICAgICAgKFdlYkNvcmU6 OnBhcnNlU3RydWN0dXJlVmFsdWUpOgorICAgICAgICAoV2ViQ29yZTo6c3RydWN0dXJlVG9KU09O KToKKyAgICAgICAgKFdlYkNvcmU6OnN0cnVjdHVyZVRvSlNPTlN0cmluZyk6CisgICAgICAgICog cGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL0dTdHJlYW1lckNvbW1vbi5oOgorCiAyMDIyLTAx LTI3ICBDaHJpcyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CiAKICAgICAgICAgUmFkaW8gYnV0 dG9ucyB3aXRoIG5vIGZvcm0gb3duZXIgYXJlIG5vdCBncm91cGVkCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvR1N0cmVhbWVyQ29tbW9uLmNw cCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9HU3RyZWFtZXJD b21tb24uY3BwCmluZGV4IGNkZWQ0YTYwYjUwYmJiYWVhNWI4NDViZGVmYmI2ODZmZTI1MjU5MzMu LmRkMTcwNGFkYTU4YTQzMDQ5OTc4MmVkZjQ5ZDk4YTM4NmE5NDNiOGEgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9HU3RyZWFtZXJDb21tb24u Y3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9HU3Ry ZWFtZXJDb21tb24uY3BwCkBAIC01MzgsNiArNTM4LDg1IEBAIEdzdEVsZW1lbnQqIG1ha2VHU3Ry ZWFtZXJCaW4oY29uc3QgY2hhciogZGVzY3JpcHRpb24sIGJvb2wgZ2hvc3RVbmxpbmtlZFBhZHMp CiAgICAgcmV0dXJuIGJpbjsKIH0KIAorc3RhdGljIFJlZlB0cjxKU09OOjpWYWx1ZT4gc3RydWN0 dXJlVG9KU09OKGNvbnN0IEdzdFN0cnVjdHVyZSopOworCitzdGF0aWMgc3RkOjpvcHRpb25hbDxS ZWZQdHI8SlNPTjo6VmFsdWU+PiBzdHJ1Y3R1cmVWYWx1ZVRvSlNPTihjb25zdCBHVmFsdWUqIHZh bHVlKQoreworICAgIGlmIChHU1RfVkFMVUVfSE9MRFNfU1RSVUNUVVJFKHZhbHVlKSkKKyAgICAg ICAgcmV0dXJuIHN0cnVjdHVyZVRvSlNPTihnc3RfdmFsdWVfZ2V0X3N0cnVjdHVyZSh2YWx1ZSkp OworCisgICAgaWYgKEdTVF9WQUxVRV9IT0xEU19BUlJBWSh2YWx1ZSkpIHsKKyAgICAgICAgdW5z aWduZWQgc2l6ZSA9IGdzdF92YWx1ZV9hcnJheV9nZXRfc2l6ZSh2YWx1ZSk7CisgICAgICAgIGF1 dG8gYXJyYXkgPSBKU09OOjpBcnJheTo6Y3JlYXRlKCk7CisgICAgICAgIGZvciAodW5zaWduZWQg aSA9IDA7IGkgPCBzaXplOyBpKyspIHsKKyAgICAgICAgICAgIGlmIChhdXRvIGlubmVySnNvbiA9 IHN0cnVjdHVyZVZhbHVlVG9KU09OKGdzdF92YWx1ZV9hcnJheV9nZXRfdmFsdWUodmFsdWUsIGkp KSkKKyAgICAgICAgICAgICAgICBhcnJheS0+cHVzaFZhbHVlKGlubmVySnNvbi0+cmVsZWFzZU5v bk51bGwoKSk7CisgICAgICAgIH0KKyAgICAgICAgYXV0byByZXN1bHRBcnJheSA9IGFycmF5LT5h c0FycmF5KCk7CisgICAgICAgIHJldHVybiByZXN1bHRBcnJheS0+YXNWYWx1ZSgpOworICAgIH0K KyAgICBhdXRvIHZhbHVlVHlwZSA9IEdfVkFMVUVfVFlQRSh2YWx1ZSk7CisgICAgaWYgKHZhbHVl VHlwZSA9PSBHX1RZUEVfQk9PTEVBTikgeworICAgICAgICBhdXRvIGJvb2xWYWx1ZSA9IEpTT046 OlZhbHVlOjpjcmVhdGUoZ192YWx1ZV9nZXRfYm9vbGVhbih2YWx1ZSkpOworICAgICAgICByZXR1 cm4gYm9vbFZhbHVlLT5hc1ZhbHVlKCk7CisgICAgfQorICAgIGlmICh2YWx1ZVR5cGUgPT0gR19U WVBFX0lOVCkgeworICAgICAgICBhdXRvIGludFZhbHVlID0gSlNPTjo6VmFsdWU6OmNyZWF0ZShn X3ZhbHVlX2dldF9pbnQodmFsdWUpKTsKKyAgICAgICAgcmV0dXJuIGludFZhbHVlLT5hc1ZhbHVl KCk7CisgICAgfQorICAgIGlmICh2YWx1ZVR5cGUgPT0gR19UWVBFX1VJTlQpIHsKKyAgICAgICAg YXV0byB1aW50VmFsdWUgPSBKU09OOjpWYWx1ZTo6Y3JlYXRlKHN0YXRpY19jYXN0PGludD4oZ192 YWx1ZV9nZXRfdWludCh2YWx1ZSkpKTsKKyAgICAgICAgcmV0dXJuIHVpbnRWYWx1ZS0+YXNWYWx1 ZSgpOworICAgIH0KKyAgICBpZiAodmFsdWVUeXBlID09IEdfVFlQRV9ET1VCTEUpIHsKKyAgICAg ICAgYXV0byBkb3VibGVWYWx1ZSA9IEpTT046OlZhbHVlOjpjcmVhdGUoZ192YWx1ZV9nZXRfZG91 YmxlKHZhbHVlKSk7CisgICAgICAgIHJldHVybiBkb3VibGVWYWx1ZS0+YXNWYWx1ZSgpOworICAg IH0KKyAgICBpZiAodmFsdWVUeXBlID09IEdfVFlQRV9GTE9BVCkgeworICAgICAgICBhdXRvIGZs b2F0VmFsdWUgPSBKU09OOjpWYWx1ZTo6Y3JlYXRlKHN0YXRpY19jYXN0PGRvdWJsZT4oZ192YWx1 ZV9nZXRfZmxvYXQodmFsdWUpKSk7CisgICAgICAgIHJldHVybiBmbG9hdFZhbHVlLT5hc1ZhbHVl KCk7CisgICAgfQorICAgIGlmICh2YWx1ZVR5cGUgPT0gR19UWVBFX1VJTlQ2NCkgeworICAgICAg ICAvLyBGSVhNRTogYmlnaW50IHN1cHBvcnQgbWlzc2luZyBpbiBKU09OLgorICAgICAgICBhdXRv IGludFZhbHVlID0gSlNPTjo6VmFsdWU6OmNyZWF0ZShzdGF0aWNfY2FzdDxpbnQ+KGdfdmFsdWVf Z2V0X3VpbnQ2NCh2YWx1ZSkpKTsKKyAgICAgICAgcmV0dXJuIGludFZhbHVlLT5hc1ZhbHVlKCk7 CisgICAgfQorICAgIGlmICh2YWx1ZVR5cGUgPT0gR19UWVBFX1NUUklORykgeworICAgICAgICBh dXRvIHN0cmluZ1ZhbHVlID0gSlNPTjo6VmFsdWU6OmNyZWF0ZShtYWtlU3RyaW5nKGdfdmFsdWVf Z2V0X3N0cmluZyh2YWx1ZSkpKTsKKyAgICAgICAgcmV0dXJuIHN0cmluZ1ZhbHVlLT5hc1ZhbHVl KCk7CisgICAgfQorICAgIEdTVF9XQVJOSU5HKCJVbmhhbmRsZWQgR1ZhbHVlIHR5cGU6ICVzIiwg R19WQUxVRV9UWVBFX05BTUUodmFsdWUpKTsKKyAgICByZXR1cm4gc3RkOjpudWxsb3B0OworfQor CitzdGF0aWMgZ2Jvb2xlYW4gcGFyc2VTdHJ1Y3R1cmVWYWx1ZShHUXVhcmsgZmllbGRJZCwgY29u c3QgR1ZhbHVlKiB2YWx1ZSwgZ3BvaW50ZXIgdXNlckRhdGEpCit7CisgICAgaWYgKGF1dG8ganNv blZhbHVlID0gc3RydWN0dXJlVmFsdWVUb0pTT04odmFsdWUpKSB7CisgICAgICAgIGF1dG8qIG9i amVjdCA9IHJlaW50ZXJwcmV0X2Nhc3Q8SlNPTjo6T2JqZWN0Kj4odXNlckRhdGEpOworICAgICAg ICBvYmplY3QtPnNldFZhbHVlKGdfcXVhcmtfdG9fc3RyaW5nKGZpZWxkSWQpLCBqc29uVmFsdWUt PnJlbGVhc2VOb25OdWxsKCkpOworICAgIH0KKyAgICByZXR1cm4gVFJVRTsKK30KKworc3RhdGlj IFJlZlB0cjxKU09OOjpWYWx1ZT4gc3RydWN0dXJlVG9KU09OKGNvbnN0IEdzdFN0cnVjdHVyZSog c3RydWN0dXJlKQoreworICAgIGF1dG8ganNvbk9iamVjdCA9IEpTT046Ok9iamVjdDo6Y3JlYXRl KCk7CisgICAgYXV0byByZXN1bHRWYWx1ZSA9IGpzb25PYmplY3QtPmFzT2JqZWN0KCk7CisgICAg aWYgKCFyZXN1bHRWYWx1ZSkKKyAgICAgICAgcmV0dXJuIG51bGxwdHI7CisKKyAgICBnc3Rfc3Ry dWN0dXJlX2ZvcmVhY2goc3RydWN0dXJlLCBwYXJzZVN0cnVjdHVyZVZhbHVlLCByZXN1bHRWYWx1 ZS5nZXQoKSk7CisgICAgcmV0dXJuIHJlc3VsdFZhbHVlOworfQorCitTdHJpbmcgc3RydWN0dXJl VG9KU09OU3RyaW5nKGNvbnN0IEdzdFN0cnVjdHVyZSogc3RydWN0dXJlKQoreworICAgIGF1dG8g dmFsdWUgPSBzdHJ1Y3R1cmVUb0pTT04oc3RydWN0dXJlKTsKKyAgICBpZiAoIXZhbHVlKQorICAg ICAgICByZXR1cm4geyB9OworICAgIHJldHVybiB2YWx1ZS0+dG9KU09OU3RyaW5nKCk7Cit9CisK IH0KIAogI2VuZGlmIC8vIFVTRShHU1RSRUFNRVIpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvR1N0cmVhbWVyQ29tbW9uLmggYi9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvR1N0cmVhbWVyQ29tbW9uLmgKaW5k ZXggZTRlN2M4ODk0YzFkM2NmMmEwNWZhNDY4YWIxNDZkMDZjYzRkZjg4Yy4uODA0NGE3YmMxYzc0 ZTQ4NDA1ZjhmNjFhODI2NWI5ODhiNDRkZmJhYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL0dTdHJlYW1lckNvbW1vbi5oCisrKyBiL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9HU3RyZWFtZXJDb21tb24uaApA QCAtMzE5LDYgKzMxOSw4IEBAIEdzdEJ1ZmZlciogZ3N0QnVmZmVyTmV3V3JhcHBlZEZhc3Qodm9p ZCogZGF0YSwgc2l6ZV90IGxlbmd0aCk7CiBHc3RFbGVtZW50KiBtYWtlR1N0cmVhbWVyRWxlbWVu dChjb25zdCBjaGFyKiBmYWN0b3J5TmFtZSwgY29uc3QgY2hhciogbmFtZSk7CiBHc3RFbGVtZW50 KiBtYWtlR1N0cmVhbWVyQmluKGNvbnN0IGNoYXIqIGRlc2NyaXB0aW9uLCBib29sIGdob3N0VW5s aW5rZWRQYWRzKTsKIAorU3RyaW5nIHN0cnVjdHVyZVRvSlNPTlN0cmluZyhjb25zdCBHc3RTdHJ1 Y3R1cmUqKTsKKwogfQogCiAjaWZuZGVmIEdTVF9CVUZGRVJfRFRTX09SX1BUUwpkaWZmIC0tZ2l0 IGEvVG9vbHMvQ2hhbmdlTG9nIGIvVG9vbHMvQ2hhbmdlTG9nCmluZGV4IGE3Yzc0ZGVlMjYwZjA4 NjBkOTA4ZjYwYjc0MWZiNjJkNjI3OWFkNjguLjI4OTY4ZTA5Y2Q2ZjE0OTVjNjdlODNiNTExODU2 Yzk4OGJlNDBlYjYgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0NoYW5nZUxvZworKysgYi9Ub29scy9DaGFu Z2VMb2cKQEAgLTEsMyArMSwxMyBAQAorMjAyMi0wMS0yOCAgUGhpbGlwcGUgTm9ybWFuZCAgPHBu b3JtYW5kQGlnYWxpYS5jb20+CisKKyAgICAgICAgW0dTdHJlYW1lcl0gR3N0U3RydWN0dXJlIHRv IEpTT04gc2VyaWFsaXphdGlvbgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MjM1NzYwCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgKiBUZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYkNvcmUvZ3N0cmVhbWVyL0dTdHJl YW1lclRlc3QuY3BwOgorICAgICAgICAoVGVzdFdlYktpdEFQSTo6VEVTVF9GKToKKwogMjAyMi0w MS0yNyAgQ2FybG9zIEdhcmNpYSBDYW1wb3MgIDxjZ2FyY2lhQGlnYWxpYS5jb20+CiAKICAgICAg ICAgW1dQRV1bYTExeV0gQWRkIG9wdGlvbiB0byBidWlsZCB3aXRoIEFUU1BJCmRpZmYgLS1naXQg YS9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYkNvcmUvZ3N0cmVhbWVyL0dTdHJlYW1lclRl c3QuY3BwIGIvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJDb3JlL2dzdHJlYW1lci9HU3Ry ZWFtZXJUZXN0LmNwcAppbmRleCAzZDdmOTRkZThlN2ZkYTRlZmRjY2JiOTMyZWJhMzkwODY4N2Fi OGY1Li4xYmFiYjljNmY2OTRlOGE5YzdiYTFmYzUzYjRkNTBlYWZiODk0YmE4IDEwMDY0NAotLS0g YS9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYkNvcmUvZ3N0cmVhbWVyL0dTdHJlYW1lclRl c3QuY3BwCisrKyBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViQ29yZS9nc3RyZWFtZXIv R1N0cmVhbWVyVGVzdC5jcHAKQEAgLTUwLDYgKzUwLDE4IEBAIHZvaWQgR1N0cmVhbWVyVGVzdDo6 VGVhckRvd24oKQogICAgIC8vIGluaXRpYWxpemUgR1N0cmVhbWVyIGNvcnJlY3RseS4KIH0KIAor VEVTVF9GKEdTdHJlYW1lclRlc3QsIHN0cnVjdHVyZUpTT05TZXJpYWxpemluZykKK3sKKyAgICBH VW5pcXVlUHRyPEdzdFN0cnVjdHVyZT4gc3RydWN0dXJlKGdzdF9zdHJ1Y3R1cmVfbmV3KCJmb28i LCAiaW50LXZhbCIsIEdfVFlQRV9JTlQsIDUsICJzdHItdmFsIiwgR19UWVBFX1NUUklORywgImZv byIsICJib29sLXZhbCIsIEdfVFlQRV9CT09MRUFOLCBUUlVFLCBudWxscHRyKSk7CisgICAgYXV0 byBqc29uU3RyaW5nID0gc3RydWN0dXJlVG9KU09OU3RyaW5nKHN0cnVjdHVyZS5nZXQoKSk7Cisg ICAgQVNTRVJUX0VRKGpzb25TdHJpbmcsICJ7XCJpbnQtdmFsXCI6NSxcInN0ci12YWxcIjpcImZv b1wiLFwiYm9vbC12YWxcIjoxfSIpOworCisgICAgR1VuaXF1ZVB0cjxHc3RTdHJ1Y3R1cmU+IGlu bmVyU3RydWN0dXJlKGdzdF9zdHJ1Y3R1cmVfbmV3KCJiYXIiLCAiYm9vIiwgR19UWVBFX0JPT0xF QU4sIEZBTFNFLCAiZG91YmxlLXZhbCIsIEdfVFlQRV9ET1VCTEUsIDIuNDIsIG51bGxwdHIpKTsK KyAgICBnc3Rfc3RydWN0dXJlX3NldChzdHJ1Y3R1cmUuZ2V0KCksICJpbm5lciIsIEdTVF9UWVBF X1NUUlVDVFVSRSwgaW5uZXJTdHJ1Y3R1cmUuZ2V0KCksIG51bGxwdHIpOworICAgIGpzb25TdHJp bmcgPSBzdHJ1Y3R1cmVUb0pTT05TdHJpbmcoc3RydWN0dXJlLmdldCgpKTsKKyAgICBBU1NFUlRf RVEoanNvblN0cmluZywgIntcImludC12YWxcIjo1LFwic3RyLXZhbFwiOlwiZm9vXCIsXCJib29s LXZhbFwiOjEsXCJpbm5lclwiOntcImJvb1wiOjAsXCJkb3VibGUtdmFsXCI6Mi40Mn19Iik7Cit9 CisKIH0gLy8gbmFtZXNwYWNlIFRlc3RXZWJLaXRBUEkKIAogI2VuZGlmIC8vIFVTRShHU1RSRUFN RVIpCg== 450358 2022-01-30 04:24:48 -0800 2022-01-30 05:20:34 -0800 Patch bug-235760-20220130042447.patch text/plain 6932 pnormand U3VidmVyc2lvbiBSZXZpc2lvbjogMjg4Nzk3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZGU2OThhNTZiOGY4NzBm MDdlZTBlY2ZhNDYyMjNhNjdkZGM3OWM4ZC4uMzc4OWI4YzY3ZjE1MWU2NzFkYWVlMmQxMTEzYjAw MzcxNzgwMDk2MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDIyLTAxLTI4ICBQaGls aXBwZSBOb3JtYW5kICA8cG5vcm1hbmRAaWdhbGlhLmNvbT4KKworICAgICAgICBbR1N0cmVhbWVy XSBHc3RTdHJ1Y3R1cmUgdG8gSlNPTiBzZXJpYWxpemF0aW9uCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzU3NjAKKworICAgICAgICBSZXZpZXdlZCBi eSBYYWJpZXIgUm9kcmlndWV6LUNhbHZhci4KKworICAgICAgICBGb3IgR3N0V2ViUlRDIHN0YXRz IGxvZ2dpbmcgcHVycG9zZXMgSlNPTiBpcyBhIGdvb2QgcGF5bG9hZCBmb3JtYXQuIEFzIHRoZSBz dGF0cyBhcmUKKyAgICAgICAgaW5pdGlhbGx5IG5vdGlmaWVkIHZpYSBHc3RTdHJ1Y3R1cmVzIHdl IG5lZWQgYSB3YXkgdG8gZXhwb3J0IHRob3NlIHRvIEpTT04sIHVzaW5nIGEgbmV3IEFQSQorICAg ICAgICBpbiBHU3RyZWFtZXJDb21tb24uCisKKyAgICAgICAgQ292ZXJlZCBieSBBUEkgdGVzdHMu CisKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvR1N0cmVhbWVyQ29tbW9u LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OnN0cnVjdHVyZVZhbHVlVG9KU09OKToKKyAgICAgICAg KFdlYkNvcmU6OnBhcnNlU3RydWN0dXJlVmFsdWUpOgorICAgICAgICAoV2ViQ29yZTo6c3RydWN0 dXJlVG9KU09OKToKKyAgICAgICAgKFdlYkNvcmU6OnN0cnVjdHVyZVRvSlNPTlN0cmluZyk6Cisg ICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL0dTdHJlYW1lckNvbW1vbi5oOgor CiAyMDIyLTAxLTI5ICBSeW9zdWtlIE5pd2EgIDxybml3YUB3ZWJraXQub3JnPgogCiAgICAgICAg IERlbGV0ZSBydW50aW1lIHByZWZlcmVuY2UgZm9yIGVuYWJsaW5nIHJlcXVlc3QgYW5pbWF0aW9u IGZyYW1lCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9nc3Ry ZWFtZXIvR1N0cmVhbWVyQ29tbW9uLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBo aWNzL2dzdHJlYW1lci9HU3RyZWFtZXJDb21tb24uY3BwCmluZGV4IGNkZWQ0YTYwYjUwYmJiYWVh NWI4NDViZGVmYmI2ODZmZTI1MjU5MzMuLmUwYWRkNTkwZmRlOGNiN2Q1ODkxMTdjOWRkYmExYjAy MTYyYjk5NDcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dz dHJlYW1lci9HU3RyZWFtZXJDb21tb24uY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L2dyYXBoaWNzL2dzdHJlYW1lci9HU3RyZWFtZXJDb21tb24uY3BwCkBAIC01MzgsNiArNTM4LDc3 IEBAIEdzdEVsZW1lbnQqIG1ha2VHU3RyZWFtZXJCaW4oY29uc3QgY2hhciogZGVzY3JpcHRpb24s IGJvb2wgZ2hvc3RVbmxpbmtlZFBhZHMpCiAgICAgcmV0dXJuIGJpbjsKIH0KIAorc3RhdGljIFJl ZlB0cjxKU09OOjpWYWx1ZT4gZ3N0U3RydWN0dXJlVG9KU09OKGNvbnN0IEdzdFN0cnVjdHVyZSop OworCitzdGF0aWMgc3RkOjpvcHRpb25hbDxSZWZQdHI8SlNPTjo6VmFsdWU+PiBnc3RTdHJ1Y3R1 cmVWYWx1ZVRvSlNPTihjb25zdCBHVmFsdWUqIHZhbHVlKQoreworICAgIGlmIChHU1RfVkFMVUVf SE9MRFNfU1RSVUNUVVJFKHZhbHVlKSkKKyAgICAgICAgcmV0dXJuIGdzdFN0cnVjdHVyZVRvSlNP Tihnc3RfdmFsdWVfZ2V0X3N0cnVjdHVyZSh2YWx1ZSkpOworCisgICAgaWYgKEdTVF9WQUxVRV9I T0xEU19BUlJBWSh2YWx1ZSkpIHsKKyAgICAgICAgdW5zaWduZWQgc2l6ZSA9IGdzdF92YWx1ZV9h cnJheV9nZXRfc2l6ZSh2YWx1ZSk7CisgICAgICAgIGF1dG8gYXJyYXkgPSBKU09OOjpBcnJheTo6 Y3JlYXRlKCk7CisgICAgICAgIGZvciAodW5zaWduZWQgaSA9IDA7IGkgPCBzaXplOyBpKyspIHsK KyAgICAgICAgICAgIGlmIChhdXRvIGlubmVySnNvbiA9IGdzdFN0cnVjdHVyZVZhbHVlVG9KU09O KGdzdF92YWx1ZV9hcnJheV9nZXRfdmFsdWUodmFsdWUsIGkpKSkKKyAgICAgICAgICAgICAgICBh cnJheS0+cHVzaFZhbHVlKGlubmVySnNvbi0+cmVsZWFzZU5vbk51bGwoKSk7CisgICAgICAgIH0K KyAgICAgICAgcmV0dXJuIGFycmF5LT5hc0FycmF5KCktPmFzVmFsdWUoKTsKKyAgICB9CisgICAg YXV0byB2YWx1ZVR5cGUgPSBHX1ZBTFVFX1RZUEUodmFsdWUpOworICAgIGlmICh2YWx1ZVR5cGUg PT0gR19UWVBFX0JPT0xFQU4pCisgICAgICAgIHJldHVybiBKU09OOjpWYWx1ZTo6Y3JlYXRlKGdf dmFsdWVfZ2V0X2Jvb2xlYW4odmFsdWUpKS0+YXNWYWx1ZSgpOworCisgICAgaWYgKHZhbHVlVHlw ZSA9PSBHX1RZUEVfSU5UKQorICAgICAgICByZXR1cm4gSlNPTjo6VmFsdWU6OmNyZWF0ZShnX3Zh bHVlX2dldF9pbnQodmFsdWUpKS0+YXNWYWx1ZSgpOworCisgICAgaWYgKHZhbHVlVHlwZSA9PSBH X1RZUEVfVUlOVCkKKyAgICAgICAgcmV0dXJuIEpTT046OlZhbHVlOjpjcmVhdGUoc3RhdGljX2Nh c3Q8aW50PihnX3ZhbHVlX2dldF91aW50KHZhbHVlKSkpLT5hc1ZhbHVlKCk7CisKKyAgICBpZiAo dmFsdWVUeXBlID09IEdfVFlQRV9ET1VCTEUpCisgICAgICAgIHJldHVybiBKU09OOjpWYWx1ZTo6 Y3JlYXRlKGdfdmFsdWVfZ2V0X2RvdWJsZSh2YWx1ZSkpLT5hc1ZhbHVlKCk7CisKKyAgICBpZiAo dmFsdWVUeXBlID09IEdfVFlQRV9GTE9BVCkKKyAgICAgICAgcmV0dXJuIEpTT046OlZhbHVlOjpj cmVhdGUoc3RhdGljX2Nhc3Q8ZG91YmxlPihnX3ZhbHVlX2dldF9mbG9hdCh2YWx1ZSkpKS0+YXNW YWx1ZSgpOworCisgICAgLy8gRklYTUU6IGJpZ2ludCBzdXBwb3J0IG1pc3NpbmcgaW4gSlNPTi4K KyAgICBpZiAodmFsdWVUeXBlID09IEdfVFlQRV9VSU5UNjQpCisgICAgICAgIHJldHVybiBKU09O OjpWYWx1ZTo6Y3JlYXRlKHN0YXRpY19jYXN0PGludD4oZ192YWx1ZV9nZXRfdWludDY0KHZhbHVl KSkpLT5hc1ZhbHVlKCk7CisKKyAgICBpZiAodmFsdWVUeXBlID09IEdfVFlQRV9TVFJJTkcpCisg ICAgICAgIHJldHVybiBKU09OOjpWYWx1ZTo6Y3JlYXRlKG1ha2VTdHJpbmcoZ192YWx1ZV9nZXRf c3RyaW5nKHZhbHVlKSkpLT5hc1ZhbHVlKCk7CisKKyAgICBHU1RfV0FSTklORygiVW5oYW5kbGVk IEdWYWx1ZSB0eXBlOiAlcyIsIEdfVkFMVUVfVFlQRV9OQU1FKHZhbHVlKSk7CisgICAgcmV0dXJu IHsgfTsKK30KKworc3RhdGljIGdib29sZWFuIHBhcnNlR3N0U3RydWN0dXJlVmFsdWUoR1F1YXJr IGZpZWxkSWQsIGNvbnN0IEdWYWx1ZSogdmFsdWUsIGdwb2ludGVyIHVzZXJEYXRhKQoreworICAg IGlmIChhdXRvIGpzb25WYWx1ZSA9IGdzdFN0cnVjdHVyZVZhbHVlVG9KU09OKHZhbHVlKSkgewor ICAgICAgICBhdXRvKiBvYmplY3QgPSByZWludGVycHJldF9jYXN0PEpTT046Ok9iamVjdCo+KHVz ZXJEYXRhKTsKKyAgICAgICAgb2JqZWN0LT5zZXRWYWx1ZShnX3F1YXJrX3RvX3N0cmluZyhmaWVs ZElkKSwganNvblZhbHVlLT5yZWxlYXNlTm9uTnVsbCgpKTsKKyAgICB9CisgICAgcmV0dXJuIFRS VUU7Cit9CisKK3N0YXRpYyBSZWZQdHI8SlNPTjo6VmFsdWU+IGdzdFN0cnVjdHVyZVRvSlNPTihj b25zdCBHc3RTdHJ1Y3R1cmUqIHN0cnVjdHVyZSkKK3sKKyAgICBhdXRvIGpzb25PYmplY3QgPSBK U09OOjpPYmplY3Q6OmNyZWF0ZSgpOworICAgIGF1dG8gcmVzdWx0VmFsdWUgPSBqc29uT2JqZWN0 LT5hc09iamVjdCgpOworICAgIGlmICghcmVzdWx0VmFsdWUpCisgICAgICAgIHJldHVybiBudWxs cHRyOworCisgICAgZ3N0X3N0cnVjdHVyZV9mb3JlYWNoKHN0cnVjdHVyZSwgcGFyc2VHc3RTdHJ1 Y3R1cmVWYWx1ZSwgcmVzdWx0VmFsdWUuZ2V0KCkpOworICAgIHJldHVybiByZXN1bHRWYWx1ZTsK K30KKworU3RyaW5nIGdzdFN0cnVjdHVyZVRvSlNPTlN0cmluZyhjb25zdCBHc3RTdHJ1Y3R1cmUq IHN0cnVjdHVyZSkKK3sKKyAgICBhdXRvIHZhbHVlID0gZ3N0U3RydWN0dXJlVG9KU09OKHN0cnVj dHVyZSk7CisgICAgaWYgKCF2YWx1ZSkKKyAgICAgICAgcmV0dXJuIHsgfTsKKyAgICByZXR1cm4g dmFsdWUtPnRvSlNPTlN0cmluZygpOworfQorCiB9CiAKICNlbmRpZiAvLyBVU0UoR1NUUkVBTUVS KQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVy L0dTdHJlYW1lckNvbW1vbi5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0 cmVhbWVyL0dTdHJlYW1lckNvbW1vbi5oCmluZGV4IGU0ZTdjODg5NGMxZDNjZjJhMDVmYTQ2OGFi MTQ2ZDA2Y2M0ZGY4OGMuLmM2NTE2OGI5ZDczZDAzYjEyOWNkY2FiY2NjNmVjNzU2ZmFkNzhhYWQg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9H U3RyZWFtZXJDb21tb24uaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9n c3RyZWFtZXIvR1N0cmVhbWVyQ29tbW9uLmgKQEAgLTMxOSw2ICszMTksOCBAQCBHc3RCdWZmZXIq IGdzdEJ1ZmZlck5ld1dyYXBwZWRGYXN0KHZvaWQqIGRhdGEsIHNpemVfdCBsZW5ndGgpOwogR3N0 RWxlbWVudCogbWFrZUdTdHJlYW1lckVsZW1lbnQoY29uc3QgY2hhciogZmFjdG9yeU5hbWUsIGNv bnN0IGNoYXIqIG5hbWUpOwogR3N0RWxlbWVudCogbWFrZUdTdHJlYW1lckJpbihjb25zdCBjaGFy KiBkZXNjcmlwdGlvbiwgYm9vbCBnaG9zdFVubGlua2VkUGFkcyk7CiAKK1N0cmluZyBnc3RTdHJ1 Y3R1cmVUb0pTT05TdHJpbmcoY29uc3QgR3N0U3RydWN0dXJlKik7CisKIH0KIAogI2lmbmRlZiBH U1RfQlVGRkVSX0RUU19PUl9QVFMKZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xz L0NoYW5nZUxvZwppbmRleCBjOGE1ZjllNTE5OTg0MzNlNDI0OGQ5NDZmMDFiYmU0MWVjMGMzY2E4 Li4xNzAwZjBmY2M2NGEzZTc3ZDljZWJhZWViNDFiNGY2ZmY1M2JmY2M5IDEwMDY0NAotLS0gYS9U b29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAKKzIw MjItMDEtMjggIFBoaWxpcHBlIE5vcm1hbmQgIDxwbm9ybWFuZEBpZ2FsaWEuY29tPgorCisgICAg ICAgIFtHU3RyZWFtZXJdIEdzdFN0cnVjdHVyZSB0byBKU09OIHNlcmlhbGl6YXRpb24KKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzNTc2MAorCisgICAg ICAgIFJldmlld2VkIGJ5IFhhYmllciBSb2RyaWd1ZXotQ2FsdmFyLgorCisgICAgICAgICogVGVz dFdlYktpdEFQSS9UZXN0cy9XZWJDb3JlL2dzdHJlYW1lci9HU3RyZWFtZXJUZXN0LmNwcDoKKyAg ICAgICAgKFRlc3RXZWJLaXRBUEk6OlRFU1RfRik6CisKIDIwMjItMDEtMjkgIEJlbiBOaGFtICA8 bmhhbUBhcHBsZS5jb20+CiAKICAgICAgICAgQWRkIHdlYiBwdXNoIG1lc3NhZ2UgZGVjcnlwdGlv biByb3V0aW5lcwpkaWZmIC0tZ2l0IGEvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJDb3Jl L2dzdHJlYW1lci9HU3RyZWFtZXJUZXN0LmNwcCBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMv V2ViQ29yZS9nc3RyZWFtZXIvR1N0cmVhbWVyVGVzdC5jcHAKaW5kZXggM2Q3Zjk0ZGU4ZTdmZGE0 ZWZkY2NiYjkzMmViYTM5MDg2ODdhYjhmNS4uN2RhODRjN2RlM2I0YTA4ZmVmNGQ3Zjg4YWU2NTMy MDY2MTJhMjkwZSAxMDA2NDQKLS0tIGEvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJDb3Jl L2dzdHJlYW1lci9HU3RyZWFtZXJUZXN0LmNwcAorKysgYi9Ub29scy9UZXN0V2ViS2l0QVBJL1Rl c3RzL1dlYkNvcmUvZ3N0cmVhbWVyL0dTdHJlYW1lclRlc3QuY3BwCkBAIC01MCw2ICs1MCwxOCBA QCB2b2lkIEdTdHJlYW1lclRlc3Q6OlRlYXJEb3duKCkKICAgICAvLyBpbml0aWFsaXplIEdTdHJl YW1lciBjb3JyZWN0bHkuCiB9CiAKK1RFU1RfRihHU3RyZWFtZXJUZXN0LCBnc3RTdHJ1Y3R1cmVK U09OU2VyaWFsaXppbmcpCit7CisgICAgR1VuaXF1ZVB0cjxHc3RTdHJ1Y3R1cmU+IHN0cnVjdHVy ZShnc3Rfc3RydWN0dXJlX25ldygiZm9vIiwgImludC12YWwiLCBHX1RZUEVfSU5ULCA1LCAic3Ry LXZhbCIsIEdfVFlQRV9TVFJJTkcsICJmb28iLCAiYm9vbC12YWwiLCBHX1RZUEVfQk9PTEVBTiwg VFJVRSwgbnVsbHB0cikpOworICAgIGF1dG8ganNvblN0cmluZyA9IGdzdFN0cnVjdHVyZVRvSlNP TlN0cmluZyhzdHJ1Y3R1cmUuZ2V0KCkpOworICAgIEFTU0VSVF9FUShqc29uU3RyaW5nLCAie1wi aW50LXZhbFwiOjUsXCJzdHItdmFsXCI6XCJmb29cIixcImJvb2wtdmFsXCI6MX0iKTsKKworICAg IEdVbmlxdWVQdHI8R3N0U3RydWN0dXJlPiBpbm5lclN0cnVjdHVyZShnc3Rfc3RydWN0dXJlX25l dygiYmFyIiwgImJvbyIsIEdfVFlQRV9CT09MRUFOLCBGQUxTRSwgImRvdWJsZS12YWwiLCBHX1RZ UEVfRE9VQkxFLCAyLjQyLCBudWxscHRyKSk7CisgICAgZ3N0X3N0cnVjdHVyZV9zZXQoc3RydWN0 dXJlLmdldCgpLCAiaW5uZXIiLCBHU1RfVFlQRV9TVFJVQ1RVUkUsIGlubmVyU3RydWN0dXJlLmdl dCgpLCBudWxscHRyKTsKKyAgICBqc29uU3RyaW5nID0gZ3N0U3RydWN0dXJlVG9KU09OU3RyaW5n KHN0cnVjdHVyZS5nZXQoKSk7CisgICAgQVNTRVJUX0VRKGpzb25TdHJpbmcsICJ7XCJpbnQtdmFs XCI6NSxcInN0ci12YWxcIjpcImZvb1wiLFwiYm9vbC12YWxcIjoxLFwiaW5uZXJcIjp7XCJib29c IjowLFwiZG91YmxlLXZhbFwiOjIuNDJ9fSIpOworfQorCiB9IC8vIG5hbWVzcGFjZSBUZXN0V2Vi S2l0QVBJCiAKICNlbmRpZiAvLyBVU0UoR1NUUkVBTUVSKQo=