179460 2017-11-08 17:17:14 -0800 Remove TEC decoders that duplicate ICU decoders 2017-11-15 09:38:45 -0800 1 1 1 Unclassified WebKit Text Safari Technology Preview Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 179303 1 mjs mmaxfield achristensen ap commit-queue darin mmaxfield ryanhaddad webkit-bug-importer oldest_to_newest 1369718 0 mjs 2017-11-08 17:17:14 -0800 Remove TEC decoders that duplicate ICU decoders. Some of them define additional aliases, but we can just copy those. There's no need to implement encodings twice. 1369983 1 mmaxfield 2017-11-09 11:31:51 -0800 I would love to do this. 1370171 2 mjs 2017-11-09 19:14:08 -0800 This is the relevant data for when Mac has duplicate encodings and possible extra names: EXTRA NAME: macOS WebKit knows extra nonstandard name isoceltic for ISO-8859-14 EXTRA NAME: macOS WebKit knows extra nonstandard name iso8859101992 for ISO-8859-10 EXTRA NAME: macOS WebKit knows extra nonstandard name isoir226 for ISO-8859-16 EXTRA NAME: macOS WebKit knows extra nonstandard name iso8859141998 for ISO-8859-14 EXTRA NAME: macOS WebKit knows extra nonstandard name iso8859162001 for ISO-8859-16 EXTRA NAME: macOS WebKit knows extra nonstandard name l10 for ISO-8859-16 EXTRA NAME: macOS WebKit knows extra nonstandard name isoir157 for ISO-8859-10 EXTRA NAME: macOS WebKit knows extra nonstandard name isoir199 for ISO-8859-14 EXTRA NAME: macOS WebKit knows extra nonstandard name latin10 for ISO-8859-16 EXTRA NAME: macOS WebKit knows extra nonstandard name latin8 for ISO-8859-14 EXTRA NAME: macOS WebKit knows extra nonstandard name l8 for ISO-8859-14 MULTIPLE CODECS: macOS WebKit supports encoding csisolatin6 through multiple implementations ['TEC', 'ICU'] MULTIPLE CODECS: macOS WebKit supports encoding iso-8859-16 through multiple implementations ['TEC', 'ICU'] MULTIPLE CODECS: macOS WebKit supports encoding iso-8859-14 through multiple implementations ['TEC', 'ICU'] MULTIPLE CODECS: macOS WebKit supports encoding iso-8859-11 through multiple implementations ['TEC', 'ICU'] MULTIPLE CODECS: macOS WebKit supports encoding iso-8859-10 through multiple implementations ['TEC', 'ICU'] MULTIPLE CODECS: macOS WebKit supports encoding latin6 through multiple implementations ['TEC', 'ICU'] MULTIPLE CODECS: macOS WebKit supports encoding koi8-u through multiple implementations ['TEC', 'ICU'] MULTIPLE CODECS: macOS WebKit supports encoding l6 through multiple implementations ['TEC', 'ICU'] 1370208 3 326548 mjs 2017-11-09 21:13:36 -0800 Created attachment 326548 Patch 1370364 4 326548 darin 2017-11-10 09:21:13 -0800 Comment on attachment 326548 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=326548&action=review Fewer encodings in this category than I expected, but I understand that this is just one step on the path. > Source/WebCore/platform/text/TextEncodingRegistry.cpp:125 > + ASSERT_WITH_MESSAGE(!oldAtomicName, "Duplicate text encoding name %s for %s (previously registered as %s)", alias, atomicName, oldAtomicName); Technically, making this an assertion requires changing the #if above to ASSERT_DISABLED rather than ERROR_DISABLED. Makes me think our Assertions.h macros are a bit too complex. 1370372 5 326548 darin 2017-11-10 09:35:45 -0800 Comment on attachment 326548 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=326548&action=review >> Source/WebCore/platform/text/TextEncodingRegistry.cpp:125 >> + ASSERT_WITH_MESSAGE(!oldAtomicName, "Duplicate text encoding name %s for %s (previously registered as %s)", alias, atomicName, oldAtomicName); > > Technically, making this an assertion requires changing the #if above to ASSERT_DISABLED rather than ERROR_DISABLED. Makes me think our Assertions.h macros are a bit too complex. Another way to do it is to get rid of this function and at the single call site put this one long line of code: ASSERT_WITH_MESSAGE(!textEncodingNameMap->contains(alias), "Duplicate text encoding name %s for %s (previously registered as %s)", alias, atomicName, textEncodingNameMap->get(alias)); We needed a function before only because the code was not a simple one-liner. 1370409 6 mjs 2017-11-10 10:40:49 -0800 (In reply to Darin Adler from comment #5) > > Another way to do it is to get rid of this function and at the single call > site put this one long line of code: > > ASSERT_WITH_MESSAGE(!textEncodingNameMap->contains(alias), "Duplicate > text encoding name %s for %s (previously registered as %s)", alias, > atomicName, textEncodingNameMap->get(alias)); > > We needed a function before only because the code was not a simple one-liner. I like that suggestion, I'll do it that way. 1370414 7 326605 mjs 2017-11-10 10:55:01 -0800 Created attachment 326605 Patch for landing 1370429 8 326605 commit-queue 2017-11-10 11:26:28 -0800 Comment on attachment 326605 Patch for landing Clearing flags on attachment: 326605 Committed r224700: <https://trac.webkit.org/changeset/224700> 1370430 9 commit-queue 2017-11-10 11:26:30 -0800 All reviewed patches have been landed. Closing bug. 1370442 10 ryanhaddad 2017-11-10 12:11:16 -0800 This change broke the debug builds: /Volumes/Data/slave/highsierra-debug/build/Source/WebCore/platform/text/TextEncodingRegistry.cpp:140:150: error: format specifies type 'char *' but the argument has type 'bool' [-Werror,-Wformat] https://build.webkit.org/builders/Apple%20High%20Sierra%20Debug%20%28Build%29/builds/1292 1370443 11 achristensen 2017-11-10 12:11:28 -0800 http://trac.webkit.org/r224701 1370633 12 mjs 2017-11-10 18:46:30 -0800 (In reply to Alex Christensen from comment #11) > http://trac.webkit.org/r224701 Thanks for fixing it for me. I probably should have let the final path run through EWS. 1371933 13 webkit-bug-importer 2017-11-15 09:38:45 -0800 <rdar://problem/35562144> 326548 2017-11-09 21:13:36 -0800 2017-11-10 10:54:57 -0800 Patch bug-179460-20171109211335.patch text/plain 9463 mjs SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDIyNDY2MSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIwIEBACisyMDE3LTExLTA5ICBNYWNpZWog U3RhY2hvd2lhayAgPG1qc0BhcHBsZS5jb20+CisKKyAgICAgICAgUmVtb3ZlIFRFQyBkZWNvZGVy cyB0aGF0IGR1cGxpY2F0ZSBJQ1UgZGVjb2RlcnMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTE3OTQ2MAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIFRlc3Q6IGZhc3QvZW5jb2RpbmcvZHVwbGljYXRlLXRlYy1l bmNvZGluZ3MuaHRtbAorCisgICAgICAgICogcGxhdGZvcm0vdGV4dC9UZXh0RW5jb2RpbmdSZWdp c3RyeS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpjaGVja0V4aXN0aW5nTmFtZSk6IE1ha2UgdGhp cyBBU1NFUlQgYW5kIHJlbW92ZSB0aGUgZXhjZXB0aW9uLCBzaW5jZQorICAgICAgICB3ZSBzaG91 bGQgbm93IG5ldmVyIGhhdmUgZHVwbGljYXRlIGVuY29kaW5nIHJlZ2lzdHJhdGlvbnMuCisgICAg ICAgICogcGxhdGZvcm0vdGV4dC9tYWMvbWFjLWVuY29kaW5ncy50eHQ6IFJlbW92ZSBlbmNvZGlu Z3MgdGhhdCBkdXBsaWNhdGUgb25lcyB3ZQorICAgICAgICBpbXBsZW1lbnQgd2l0aCBJQ1UuCisg ICAgICAgICogcGxhdGZvcm0vdGV4dC9UZXh0Q29kZWNJQ1UuY3BwOiBBZGQgc29tZSBleHRyYSBl bmNvZGluZyBhbGlhc2VzIHRoYXQgb25seSBURUMgCisgICAgICAgIGtub3dzIGFib3V0LgorCiAy MDE3LTExLTA5ICBKb2huIFdpbGFuZGVyICA8d2lsYW5kZXJAYXBwbGUuY29tPgogCiAgICAgICAg IElnbm9yZSBIU1RTIGZvciBwYXJ0aXRpb25lZCwgY3Jvc3Mtb3JpZ2luIHN1YnJlc291cmNlIHJl cXVlc3RzCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS90ZXh0L1RleHRDb2RlY0lDVS5j cHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vdGV4dC9UZXh0Q29kZWNJ Q1UuY3BwCShyZXZpc2lvbiAyMjQ2NDcpCisrKyBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS90ZXh0 L1RleHRDb2RlY0lDVS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTYzLDcgKzYzLDcgQEAgc3RkOjp1 bmlxdWVfcHRyPFRleHRDb2RlYz4gVGV4dENvZGVjSUNVOgogI2RlZmluZSBERUNMQVJFX0FMSUFT RVMoZW5jb2RpbmcsIC4uLikgXAogICAgIHN0YXRpYyBjb25zdCBjaGFyKiBjb25zdCBlbmNvZGlu ZyMjX2FsaWFzZXNbXSB7IF9fVkFfQVJHU19fIH0KIAotLy8gRnJvbSBodHRwczovL2VuY29kaW5n LnNwZWMud2hhdHdnLm9yZy4KKy8vIEZyb20gaHR0cHM6Ly9lbmNvZGluZy5zcGVjLndoYXR3Zy5v cmcuIFBsdXMgYSBmZXcgZXh0cmEgYWxpYXNlcyB0aGF0IG1hY09TIGhhZCBoaXN0b3JpY2FsbHkg ZnJvbSBURUMuCiBERUNMQVJFX0FMSUFTRVMoSUJNODY2LCAiODY2IiwgImNwODY2IiwgImNzaWJt ODY2Iik7CiBERUNMQVJFX0FMSUFTRVMoSVNPXzg4NTlfMiwgImNzaXNvbGF0aW4yIiwgImlzby1p ci0xMDEiLCAiaXNvODg1OS0yIiwgImlzbzg4NTkyIiwgImlzb184ODU5LTIiLCAiaXNvXzg4NTkt MjoxOTg3IiwgImwyIiwgImxhdGluMiIpOwogREVDTEFSRV9BTElBU0VTKElTT184ODU5XzMsICJj c2lzb2xhdGluMyIsICJpc28taXItMTA5IiwgImlzbzg4NTktMyIsICJpc284ODU5MyIsICJpc29f ODg1OS0zIiwgImlzb184ODU5LTM6MTk4OCIsICJsMyIsICJsYXRpbjMiKTsKQEAgLTczLDEwICs3 MywxMSBAQCBERUNMQVJFX0FMSUFTRVMoSVNPXzg4NTlfNiwgImFyYWJpYyIsICJhCiBERUNMQVJF X0FMSUFTRVMoSVNPXzg4NTlfNywgImNzaXNvbGF0aW5ncmVlayIsICJlY21hLTExOCIsICJlbG90 XzkyOCIsICJncmVlayIsICJncmVlazgiLCAiaXNvLWlyLTEyNiIsICJpc284ODU5LTciLCAiaXNv ODg1OTciLCAiaXNvXzg4NTktNyIsICJpc29fODg1OS03OjE5ODciLCAic3VuX2V1X2dyZWVrIik7 CiBERUNMQVJFX0FMSUFTRVMoSVNPXzg4NTlfOCwgImNzaXNvODg1OThlIiwgImNzaXNvbGF0aW5o ZWJyZXciLCAiaGVicmV3IiwgImlzby04ODU5LTgtZSIsICJpc28taXItMTM4IiwgImlzbzg4NTkt OCIsICJpc284ODU5OCIsICJpc29fODg1OS04IiwgImlzb184ODU5LTg6MTk4OCIsICJ2aXN1YWwi KTsKIERFQ0xBUkVfQUxJQVNFUyhJU09fODg1OV84X0ksICJjc2lzbzg4NTk4aSIsICJsb2dpY2Fs Iik7Ci1ERUNMQVJFX0FMSUFTRVMoSVNPXzg4NTlfMTAsICJjc2lzb2xhdGluNiIsICJpc28taXIt MTU3IiwgImlzbzg4NTktMTAiLCAiaXNvODg1OTEwIiwgImw2IiwgImxhdGluNiIpOworREVDTEFS RV9BTElBU0VTKElTT184ODU5XzEwLCAiY3Npc29sYXRpbjYiLCAiaXNvLWlyLTE1NyIsICJpc284 ODU5LTEwIiwgImlzbzg4NTkxMCIsICJsNiIsICJsYXRpbjYiLCAiaXNvODg1OTEwMTk5MiIsICJp c29pcjE1NyIpOwogREVDTEFSRV9BTElBU0VTKElTT184ODU5XzEzLCAiaXNvODg1OS0xMyIsICJp c284ODU5MTMiKTsKLURFQ0xBUkVfQUxJQVNFUyhJU09fODg1OV8xNCwgImlzbzg4NTktMTQiLCAi aXNvODg1OTE0Iik7CitERUNMQVJFX0FMSUFTRVMoSVNPXzg4NTlfMTQsICJpc284ODU5LTE0Iiwg Imlzbzg4NTkxNCIsICJpc29jZWx0aWMiLCAiaXNvODg1OTE0MTk5OCIsICJpc29pcjE5OSIsICJs YXRpbjgiLCAibDgiKTsKIERFQ0xBUkVfQUxJQVNFUyhJU09fODg1OV8xNSwgImNzaXNvbGF0aW45 IiwgImlzbzg4NTktMTUiLCAiaXNvODg1OTE1IiwgImlzb184ODU5LTE1IiwgImw5Iik7CitERUNM QVJFX0FMSUFTRVMoSVNPXzg4NTlfMTYsICJpc29pcjIyNiIsICJpc284ODU5MTYyMDAxIiwgImwx MCIsICJsYXRpbjEwIik7CiBERUNMQVJFX0FMSUFTRVMoS09JOF9SLCAiY3Nrb2k4ciIsICJrb2ki LCAia29pOCIsICJrb2k4X3IiKTsKIERFQ0xBUkVfQUxJQVNFUyhLT0k4X1UsICJrb2k4LXJ1Iik7 CiBERUNMQVJFX0FMSUFTRVMobWFjaW50b3NoLCAiY3NtYWNpbnRvc2giLCAibWFjIiwgIngtbWFj LXJvbWFuIiwgIm1hY3JvbWFuIiwgIngtbWFjcm9tYW4iKTsKQEAgLTEzMCw3ICsxMzEsNyBAQCBz dGF0aWMgY29uc3Qgc3RydWN0IEVuY29kaW5nTmFtZSB7CiAgICAgREVDTEFSRV9FTkNPRElOR19O QU1FKCJJU08tODg1OS0xMyIsIElTT184ODU5XzEzKSwKICAgICBERUNMQVJFX0VOQ09ESU5HX05B TUUoIklTTy04ODU5LTE0IiwgSVNPXzg4NTlfMTQpLAogICAgIERFQ0xBUkVfRU5DT0RJTkdfTkFN RSgiSVNPLTg4NTktMTUiLCBJU09fODg1OV8xNSksCi0gICAgREVDTEFSRV9FTkNPRElOR19OQU1F X05PX0FMSUFTRVMoIklTTy04ODU5LTE2IiksCisgICAgREVDTEFSRV9FTkNPRElOR19OQU1FKCJJ U08tODg1OS0xNiIsIElTT184ODU5XzE2KSwKICAgICBERUNMQVJFX0VOQ09ESU5HX05BTUUoIktP STgtUiIsIEtPSThfUiksCiAgICAgREVDTEFSRV9FTkNPRElOR19OQU1FKCJLT0k4LVUiLCBLT0k4 X1UpLAogICAgIERFQ0xBUkVfRU5DT0RJTkdfTkFNRSgibWFjaW50b3NoIiwgbWFjaW50b3NoKSwK SW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL3RleHQvVGV4dEVuY29kaW5nUmVnaXN0cnku Y3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL3RleHQvVGV4dEVuY29k aW5nUmVnaXN0cnkuY3BwCShyZXZpc2lvbiAyMjQ2NDcpCisrKyBTb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS90ZXh0L1RleHRFbmNvZGluZ1JlZ2lzdHJ5LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTIy LDE2ICsxMjIsNyBAQCBzdGF0aWMgaW5saW5lIHZvaWQgY2hlY2tFeGlzdGluZ05hbWUoY29uCiBz dGF0aWMgdm9pZCBjaGVja0V4aXN0aW5nTmFtZShjb25zdCBjaGFyKiBhbGlhcywgY29uc3QgY2hh ciogYXRvbWljTmFtZSkKIHsKICAgICBjb25zdCBjaGFyKiBvbGRBdG9taWNOYW1lID0gdGV4dEVu Y29kaW5nTmFtZU1hcC0+Z2V0KGFsaWFzKTsKLSAgICBpZiAoIW9sZEF0b21pY05hbWUpCi0gICAg ICAgIHJldHVybjsKLSAgICBpZiAob2xkQXRvbWljTmFtZSA9PSBhdG9taWNOYW1lKQotICAgICAg ICByZXR1cm47Ci0gICAgLy8gS2VlcCB0aGUgd2FybmluZyBzaWxlbnQgYWJvdXQgb25lIGNhc2Ug d2hlcmUgd2Uga25vdyB0aGlzIHdpbGwgaGFwcGVuLgotICAgIGlmIChzdHJjbXAoYWxpYXMsICJJ U08tODg1OS04LUkiKSA9PSAwCi0gICAgICAgICAgICAmJiBzdHJjbXAob2xkQXRvbWljTmFtZSwg IklTTy04ODU5LTgtSSIpID09IDAKLSAgICAgICAgICAgICYmIHN0cmNhc2VjbXAoYXRvbWljTmFt ZSwgImlzby04ODU5LTgiKSA9PSAwKQotICAgICAgICByZXR1cm47Ci0gICAgTE9HX0VSUk9SKCJh bGlhcyAlcyBtYXBzIHRvICVzIGFscmVhZHksIGJ1dCBzb21lb25lIGlzIHRyeWluZyB0byBtYWtl IGl0IG1hcCB0byAlcyIsIGFsaWFzLCBvbGRBdG9taWNOYW1lLCBhdG9taWNOYW1lKTsKKyAgICBB U1NFUlRfV0lUSF9NRVNTQUdFKCFvbGRBdG9taWNOYW1lLCAiRHVwbGljYXRlIHRleHQgZW5jb2Rp bmcgbmFtZSAlcyBmb3IgJXMgKHByZXZpb3VzbHkgcmVnaXN0ZXJlZCBhcyAlcykiLCBhbGlhcywg YXRvbWljTmFtZSwgb2xkQXRvbWljTmFtZSk7CiB9CiAKICNlbmRpZgpJbmRleDogU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vdGV4dC9tYWMvbWFjLWVuY29kaW5ncy50eHQKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vdGV4dC9tYWMvbWFjLWVuY29kaW5ncy50eHQJKHJldmlz aW9uIDIyNDY0NykKKysrIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL3RleHQvbWFjL21hYy1lbmNv ZGluZ3MudHh0CSh3b3JraW5nIGNvcHkpCkBAIC0xMSwxNiArMTEsMTEgQEAKIERPU0NoaW5lc2VU cmFkOiBjcDk1MAogRE9TR3JlZWs6IGNwNzM3LCBpYm03MzcKIEVVQ19UVzogRVVDLVRXCi1JU09M YXRpbjEwOiBJU08tODg1OS0xNgotSVNPTGF0aW42OiBJU08tODg1OS0xMAotSVNPTGF0aW44OiBJ U08tODg1OS0xNAotSVNPTGF0aW5UaGFpOiBJU08tODg1OS0xMQogSVNPXzIwMjJfSlBfMzogSVNP LTIwMjItSlAtMwogSklTX0M2MjI2Xzc4OiBKSVNfQzYyMjYtMTk3OAogSklTX1gwMjA4XzgzOiBK SVNfWDAyMDgtMTk4MwogSklTX1gwMjA4XzkwOiBKSVNfWDAyMDgtMTk5MAogSklTX1gwMjEyXzkw OiBKSVNfWDAyMTItMTk5MAotS09JOF9VOiBLT0k4LVUKIE1hY0FyYWJpYzogeC1tYWMtYXJhYmlj CiBNYWNDaGluZXNlU2ltcDogeC1tYWMtY2hpbmVzZXNpbXAsIHhtYWNzaW1wY2hpbmVzZQogTWFj Q2hpbmVzZVRyYWQ6IHgtbWFjLWNoaW5lc2V0cmFkLCB4bWFjdHJhZGNoaW5lc2UKSW5kZXg6IExh eW91dFRlc3RzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9DaGFuZ2VMb2cJ KHJldmlzaW9uIDIyNDY0NykKKysrIExheW91dFRlc3RzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5 KQpAQCAtMSwzICsxLDEzIEBACisyMDE3LTExLTA5ICBNYWNpZWogU3RhY2hvd2lhayAgPG1qc0Bh cHBsZS5jb20+CisKKyAgICAgICAgUmVtb3ZlIFRFQyBkZWNvZGVycyB0aGF0IGR1cGxpY2F0ZSBJ Q1UgZGVjb2RlcnMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTE3OTQ2MAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg ICAgICogZmFzdC9lbmNvZGluZy9kdXBsaWNhdGUtdGVjLWVuY29kaW5ncy1leHBlY3RlZC50eHQ6 IEFkZGVkLgorICAgICAgICAqIGZhc3QvZW5jb2RpbmcvZHVwbGljYXRlLXRlYy1lbmNvZGluZ3Mu aHRtbDogQWRkZWQuCisKIDIwMTctMTEtMDkgIE1hY2llaiBTdGFjaG93aWFrICA8bWpzQGFwcGxl LmNvbT4KIAogICAgICAgICBSZW1vdmUgc3VwcG9ydCBmb3IgaU9TLW9ubHkgc29mdGJhbmstc2pp cyBlbmNvZGluZyBpZiBwb3NzaWJsZQpJbmRleDogTGF5b3V0VGVzdHMvZmFzdC9lbmNvZGluZy9k dXBsaWNhdGUtdGVjLWVuY29kaW5ncy1leHBlY3RlZC50eHQKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gTGF5b3V0 VGVzdHMvZmFzdC9lbmNvZGluZy9kdXBsaWNhdGUtdGVjLWVuY29kaW5ncy1leHBlY3RlZC50eHQJ KG5vbmV4aXN0ZW50KQorKysgTGF5b3V0VGVzdHMvZmFzdC9lbmNvZGluZy9kdXBsaWNhdGUtdGVj LWVuY29kaW5ncy1leHBlY3RlZC50eHQJKHdvcmtpbmcgY29weSkKQEAgLTAsMCArMSwyOSBAQAor VGhpcyB0ZXN0IHZlcmlmaWVzIHRoYXQgZW5jb2RpbmdzIHRoYXQgdXNlZCB0byBiZSBzdXBwb3J0 ZWQgYnkgVEVDIG9uIG1hY09TIGFyZSBzdGlsbCBzdXBwb3J0ZWQuCisKK09uIHN1Y2Nlc3MsIHlv dSB3aWxsIHNlZSBhIHNlcmllcyBvZiAiUEFTUyIgbWVzc2FnZXMsIGZvbGxvd2VkIGJ5ICJURVNU IENPTVBMRVRFIi4KKworCitUaGUgZm9sbG93aW5nIGVuY29kaW5nIG5hbWVzIGFyZSBzdXBwb3J0 ZWQgYnkgV2ViS2l0IGNyb3NzLXBsYXRmb3JtLCBidXQgc29tZSBtYXkgYmUgcmVtb3ZlZCBhdCBh IGxhdGVyIHRpbWUuCitQQVNTIG5ldyBUZXh0RGVjb2RlcigiaXNvLTg4NTktMTAiKS5lbmNvZGlu ZyBpcyAiaXNvLTg4NTktMTAiCitQQVNTIG5ldyBUZXh0RGVjb2RlcigiaXNvODg1OTEwMTk5MiIp LmVuY29kaW5nIGlzICJpc28tODg1OS0xMCIKK1BBU1MgbmV3IFRleHREZWNvZGVyKCJpc29pcjE1 NyIpLmVuY29kaW5nIGlzICJpc28tODg1OS0xMCIKK1BBU1MgbmV3IFRleHREZWNvZGVyKCJjc2lz b2xhdGluNiIpLmVuY29kaW5nIGlzICJpc28tODg1OS0xMCIKK1BBU1MgbmV3IFRleHREZWNvZGVy KCJsYXRpbjYiKS5lbmNvZGluZyBpcyAiaXNvLTg4NTktMTAiCitQQVNTIG5ldyBUZXh0RGVjb2Rl cigibDYiKS5lbmNvZGluZyBpcyAiaXNvLTg4NTktMTAiCitQQVNTIG5ldyBUZXh0RGVjb2Rlcigi aXNvLTg4NTktMTEiKS5lbmNvZGluZyBpcyAid2luZG93cy04NzQiCitQQVNTIG5ldyBUZXh0RGVj b2RlcigiaXNvLTg4NTktMTQiKS5lbmNvZGluZyBpcyAiaXNvLTg4NTktMTQiCitQQVNTIG5ldyBU ZXh0RGVjb2RlcigiaXNvY2VsdGljIikuZW5jb2RpbmcgaXMgImlzby04ODU5LTE0IgorUEFTUyBu ZXcgVGV4dERlY29kZXIoImlzbzg4NTkxNDE5OTgiKS5lbmNvZGluZyBpcyAiaXNvLTg4NTktMTQi CitQQVNTIG5ldyBUZXh0RGVjb2RlcigiaXNvaXIxOTkiKS5lbmNvZGluZyBpcyAiaXNvLTg4NTkt MTQiCitQQVNTIG5ldyBUZXh0RGVjb2RlcigibGF0aW44IikuZW5jb2RpbmcgaXMgImlzby04ODU5 LTE0IgorUEFTUyBuZXcgVGV4dERlY29kZXIoImw4IikuZW5jb2RpbmcgaXMgImlzby04ODU5LTE0 IgorUEFTUyBuZXcgVGV4dERlY29kZXIoImlzby04ODU5LTE2IikuZW5jb2RpbmcgaXMgImlzby04 ODU5LTE2IgorUEFTUyBuZXcgVGV4dERlY29kZXIoImlzb2lyMjI2IikuZW5jb2RpbmcgaXMgImlz by04ODU5LTE2IgorUEFTUyBuZXcgVGV4dERlY29kZXIoImlzbzg4NTkxNjIwMDEiKS5lbmNvZGlu ZyBpcyAiaXNvLTg4NTktMTYiCitQQVNTIG5ldyBUZXh0RGVjb2RlcigibDEwIikuZW5jb2Rpbmcg aXMgImlzby04ODU5LTE2IgorUEFTUyBuZXcgVGV4dERlY29kZXIoImxhdGluMTAiKS5lbmNvZGlu ZyBpcyAiaXNvLTg4NTktMTYiCitQQVNTIG5ldyBUZXh0RGVjb2Rlcigia29pOC11IikuZW5jb2Rp bmcgaXMgImtvaTgtdSIKK1BBU1Mgc3VjY2Vzc2Z1bGx5UGFyc2VkIGlzIHRydWUKKworVEVTVCBD T01QTEVURQorCkluZGV4OiBMYXlvdXRUZXN0cy9mYXN0L2VuY29kaW5nL2R1cGxpY2F0ZS10ZWMt ZW5jb2RpbmdzLmh0bWwKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gTGF5b3V0VGVzdHMvZmFzdC9lbmNvZGluZy9k dXBsaWNhdGUtdGVjLWVuY29kaW5ncy5odG1sCShub25leGlzdGVudCkKKysrIExheW91dFRlc3Rz L2Zhc3QvZW5jb2RpbmcvZHVwbGljYXRlLXRlYy1lbmNvZGluZ3MuaHRtbAkod29ya2luZyBjb3B5 KQpAQCAtMCwwICsxLDMwIEBACis8IURPQ1RZUEUgaHRtbD4KKzxodG1sPgorPGhlYWQ+Cis8bWV0 YSBjaGFyc2V0PSJ1dGYtOCI+Cis8c2NyaXB0IHNyYz0iLi4vLi4vcmVzb3VyY2VzL2pzLXRlc3Qu anMiPjwvc2NyaXB0PgorPC9oZWFkPgorPGJvZHk+Cis8c2NyaXB0PgorZGVzY3JpcHRpb24oIlRo aXMgdGVzdCB2ZXJpZmllcyB0aGF0IGVuY29kaW5ncyB0aGF0IHVzZWQgdG8gYmUgc3VwcG9ydGVk IGJ5IFRFQyBvbiBtYWNPUyAgYXJlIHN0aWxsICBzdXBwb3J0ZWQuIik7CisKKworZGVidWcoIlRo ZSBmb2xsb3dpbmcgZW5jb2RpbmcgbmFtZXMgYXJlIHN1cHBvcnRlZCBieSBXZWJLaXQgY3Jvc3Mt cGxhdGZvcm0sIGJ1dCBzb21lIG1heSBiZSByZW1vdmVkIGF0IGEgbGF0ZXIgdGltZS4iKTsKK2xl dCB2YWxpZEZvck5vdyA9IFsKKyAgICB7ZW5jb2Rpbmc6ICdpc28tODg1OS0xMCcsIGFsaWFzZXM6 IFsnaXNvLTg4NTktMTAnLCAnaXNvODg1OTEwMTk5MicsICdpc29pcjE1NycsICdjc2lzb2xhdGlu NicsICdsYXRpbjYnLCAnbDYnXX0sCisgICAge2VuY29kaW5nOiAnd2luZG93cy04NzQnLCBhbGlh c2VzOiBbJ2lzby04ODU5LTExJ119LAorICAgIHtlbmNvZGluZzogJ2lzby04ODU5LTE0JywgYWxp YXNlczogWydpc28tODg1OS0xNCcsICdpc29jZWx0aWMnLCAnaXNvODg1OTE0MTk5OCcsICdpc29p cjE5OScsICdsYXRpbjgnLCAnbDgnXX0sCisgICAge2VuY29kaW5nOiAnaXNvLTg4NTktMTYnLCBh bGlhc2VzOiBbJ2lzby04ODU5LTE2JywgJ2lzb2lyMjI2JywgJ2lzbzg4NTkxNjIwMDEnLCAnbDEw JywgJ2xhdGluMTAnXX0sCisgICAge2VuY29kaW5nOiAna29pOC11JywgYWxpYXNlczogWydrb2k4 LXUnXX0KK107CisKK2ZvciAobGV0IGVuY29kaW5nIG9mIHZhbGlkRm9yTm93KSB7CisgICAgZm9y IChsZXQgYWxpYXMgb2YgZW5jb2RpbmcuYWxpYXNlcykgeworICAgICAgICAgbGV0IGNhbm9uaWNh bF9uYW1lX2V4cHIgPSAnbmV3IFRleHREZWNvZGVyKCInICsgYWxpYXMgKyAnIikuZW5jb2Rpbmcn OworICAgICAgICAgc2hvdWxkQmUoY2Fub25pY2FsX25hbWVfZXhwciwgJyInICsgZW5jb2Rpbmcu ZW5jb2RpbmcgKyAnIicpOworICAgIH0KK30KKworPC9zY3JpcHQ+Cis8L2JvZHk+Cis8L2h0bWw+ Cg== 326605 2017-11-10 10:55:01 -0800 2017-11-10 11:26:28 -0800 Patch for landing bug-179460-20171110105500.patch text/plain 10230 mjs SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDIyNDY5NikKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIxIEBACisyMDE3LTExLTA5ICBNYWNpZWog U3RhY2hvd2lhayAgPG1qc0BhcHBsZS5jb20+CisKKyAgICAgICAgUmVtb3ZlIFRFQyBkZWNvZGVy cyB0aGF0IGR1cGxpY2F0ZSBJQ1UgZGVjb2RlcnMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTE3OTQ2MAorCisgICAgICAgIFJldmlld2VkIGJ5IERhcmlu IEFkbGVyLgorCisgICAgICAgIFRlc3Q6IGZhc3QvZW5jb2RpbmcvZHVwbGljYXRlLXRlYy1lbmNv ZGluZ3MuaHRtbAorCisgICAgICAgICogcGxhdGZvcm0vdGV4dC9UZXh0RW5jb2RpbmdSZWdpc3Ry eS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpjaGVja0V4aXN0aW5nTmFtZSk6IERlbGV0ZWQuCisg ICAgICAgIChXZWJDb3JlOjphZGRUb1RleHRFbmNvZGluZ05hbWVNYXApOiBNb3ZlIHRoZSBjaGVj ayBmcm9tIGNoZWNrRXhpc3RpbmdOYW1lIGhlcmUsCisgICAgICAgIGFuZCBtYWtlIGl0IGFuIEFT U0VSVCwgc2luY2Ugd2Ugc2hvdWxkIG5vdyBiZSBndWFyYW50ZWVkIG5vIGR1cGxpY2F0ZSBlbmNv ZGluZ3MuCisgICAgICAgICogcGxhdGZvcm0vdGV4dC9tYWMvbWFjLWVuY29kaW5ncy50eHQ6IFJl bW92ZSBlbmNvZGluZ3MgdGhhdCBkdXBsaWNhdGUgb25lcyB3ZQorICAgICAgICBpbXBsZW1lbnQg d2l0aCBJQ1UuCisgICAgICAgICogcGxhdGZvcm0vdGV4dC9UZXh0Q29kZWNJQ1UuY3BwOiBBZGQg c29tZSBleHRyYSBlbmNvZGluZyBhbGlhc2VzIHRoYXQgb25seSBURUMgCisgICAgICAgIGtuZXcg YWJvdXQuCisKIDIwMTctMTEtMTAgIEFsZXggQ2hyaXN0ZW5zZW4gIDxhY2hyaXN0ZW5zZW5Ad2Vi a2l0Lm9yZz4KIAogICAgICAgICBSRUdSRVNTSU9OKHIyMjQyNjcpOiBXZWJWaWV3cyBzY2hlZHVs ZWQgd2l0aCBjdXN0b20gcnVuIGxvb3AgbW9kZXMgZG9uJ3QgbG9hZApJbmRleDogU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vdGV4dC9UZXh0Q29kZWNJQ1UuY3BwCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL3RleHQvVGV4dENvZGVjSUNVLmNwcAkocmV2aXNpb24gMjI0NjQ3 KQorKysgU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vdGV4dC9UZXh0Q29kZWNJQ1UuY3BwCSh3b3Jr aW5nIGNvcHkpCkBAIC02Myw3ICs2Myw3IEBAIHN0ZDo6dW5pcXVlX3B0cjxUZXh0Q29kZWM+IFRl eHRDb2RlY0lDVToKICNkZWZpbmUgREVDTEFSRV9BTElBU0VTKGVuY29kaW5nLCAuLi4pIFwKICAg ICBzdGF0aWMgY29uc3QgY2hhciogY29uc3QgZW5jb2RpbmcjI19hbGlhc2VzW10geyBfX1ZBX0FS R1NfXyB9CiAKLS8vIEZyb20gaHR0cHM6Ly9lbmNvZGluZy5zcGVjLndoYXR3Zy5vcmcuCisvLyBG cm9tIGh0dHBzOi8vZW5jb2Rpbmcuc3BlYy53aGF0d2cub3JnLiBQbHVzIGEgZmV3IGV4dHJhIGFs aWFzZXMgdGhhdCBtYWNPUyBoYWQgaGlzdG9yaWNhbGx5IGZyb20gVEVDLgogREVDTEFSRV9BTElB U0VTKElCTTg2NiwgIjg2NiIsICJjcDg2NiIsICJjc2libTg2NiIpOwogREVDTEFSRV9BTElBU0VT KElTT184ODU5XzIsICJjc2lzb2xhdGluMiIsICJpc28taXItMTAxIiwgImlzbzg4NTktMiIsICJp c284ODU5MiIsICJpc29fODg1OS0yIiwgImlzb184ODU5LTI6MTk4NyIsICJsMiIsICJsYXRpbjIi KTsKIERFQ0xBUkVfQUxJQVNFUyhJU09fODg1OV8zLCAiY3Npc29sYXRpbjMiLCAiaXNvLWlyLTEw OSIsICJpc284ODU5LTMiLCAiaXNvODg1OTMiLCAiaXNvXzg4NTktMyIsICJpc29fODg1OS0zOjE5 ODgiLCAibDMiLCAibGF0aW4zIik7CkBAIC03MywxMCArNzMsMTEgQEAgREVDTEFSRV9BTElBU0VT KElTT184ODU5XzYsICJhcmFiaWMiLCAiYQogREVDTEFSRV9BTElBU0VTKElTT184ODU5XzcsICJj c2lzb2xhdGluZ3JlZWsiLCAiZWNtYS0xMTgiLCAiZWxvdF85MjgiLCAiZ3JlZWsiLCAiZ3JlZWs4 IiwgImlzby1pci0xMjYiLCAiaXNvODg1OS03IiwgImlzbzg4NTk3IiwgImlzb184ODU5LTciLCAi aXNvXzg4NTktNzoxOTg3IiwgInN1bl9ldV9ncmVlayIpOwogREVDTEFSRV9BTElBU0VTKElTT184 ODU5XzgsICJjc2lzbzg4NTk4ZSIsICJjc2lzb2xhdGluaGVicmV3IiwgImhlYnJldyIsICJpc28t ODg1OS04LWUiLCAiaXNvLWlyLTEzOCIsICJpc284ODU5LTgiLCAiaXNvODg1OTgiLCAiaXNvXzg4 NTktOCIsICJpc29fODg1OS04OjE5ODgiLCAidmlzdWFsIik7CiBERUNMQVJFX0FMSUFTRVMoSVNP Xzg4NTlfOF9JLCAiY3Npc284ODU5OGkiLCAibG9naWNhbCIpOwotREVDTEFSRV9BTElBU0VTKElT T184ODU5XzEwLCAiY3Npc29sYXRpbjYiLCAiaXNvLWlyLTE1NyIsICJpc284ODU5LTEwIiwgImlz bzg4NTkxMCIsICJsNiIsICJsYXRpbjYiKTsKK0RFQ0xBUkVfQUxJQVNFUyhJU09fODg1OV8xMCwg ImNzaXNvbGF0aW42IiwgImlzby1pci0xNTciLCAiaXNvODg1OS0xMCIsICJpc284ODU5MTAiLCAi bDYiLCAibGF0aW42IiwgImlzbzg4NTkxMDE5OTIiLCAiaXNvaXIxNTciKTsKIERFQ0xBUkVfQUxJ QVNFUyhJU09fODg1OV8xMywgImlzbzg4NTktMTMiLCAiaXNvODg1OTEzIik7Ci1ERUNMQVJFX0FM SUFTRVMoSVNPXzg4NTlfMTQsICJpc284ODU5LTE0IiwgImlzbzg4NTkxNCIpOworREVDTEFSRV9B TElBU0VTKElTT184ODU5XzE0LCAiaXNvODg1OS0xNCIsICJpc284ODU5MTQiLCAiaXNvY2VsdGlj IiwgImlzbzg4NTkxNDE5OTgiLCAiaXNvaXIxOTkiLCAibGF0aW44IiwgImw4Iik7CiBERUNMQVJF X0FMSUFTRVMoSVNPXzg4NTlfMTUsICJjc2lzb2xhdGluOSIsICJpc284ODU5LTE1IiwgImlzbzg4 NTkxNSIsICJpc29fODg1OS0xNSIsICJsOSIpOworREVDTEFSRV9BTElBU0VTKElTT184ODU5XzE2 LCAiaXNvaXIyMjYiLCAiaXNvODg1OTE2MjAwMSIsICJsMTAiLCAibGF0aW4xMCIpOwogREVDTEFS RV9BTElBU0VTKEtPSThfUiwgImNza29pOHIiLCAia29pIiwgImtvaTgiLCAia29pOF9yIik7CiBE RUNMQVJFX0FMSUFTRVMoS09JOF9VLCAia29pOC1ydSIpOwogREVDTEFSRV9BTElBU0VTKG1hY2lu dG9zaCwgImNzbWFjaW50b3NoIiwgIm1hYyIsICJ4LW1hYy1yb21hbiIsICJtYWNyb21hbiIsICJ4 LW1hY3JvbWFuIik7CkBAIC0xMzAsNyArMTMxLDcgQEAgc3RhdGljIGNvbnN0IHN0cnVjdCBFbmNv ZGluZ05hbWUgewogICAgIERFQ0xBUkVfRU5DT0RJTkdfTkFNRSgiSVNPLTg4NTktMTMiLCBJU09f ODg1OV8xMyksCiAgICAgREVDTEFSRV9FTkNPRElOR19OQU1FKCJJU08tODg1OS0xNCIsIElTT184 ODU5XzE0KSwKICAgICBERUNMQVJFX0VOQ09ESU5HX05BTUUoIklTTy04ODU5LTE1IiwgSVNPXzg4 NTlfMTUpLAotICAgIERFQ0xBUkVfRU5DT0RJTkdfTkFNRV9OT19BTElBU0VTKCJJU08tODg1OS0x NiIpLAorICAgIERFQ0xBUkVfRU5DT0RJTkdfTkFNRSgiSVNPLTg4NTktMTYiLCBJU09fODg1OV8x NiksCiAgICAgREVDTEFSRV9FTkNPRElOR19OQU1FKCJLT0k4LVIiLCBLT0k4X1IpLAogICAgIERF Q0xBUkVfRU5DT0RJTkdfTkFNRSgiS09JOC1VIiwgS09JOF9VKSwKICAgICBERUNMQVJFX0VOQ09E SU5HX05BTUUoIm1hY2ludG9zaCIsIG1hY2ludG9zaCksCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS90ZXh0L1RleHRFbmNvZGluZ1JlZ2lzdHJ5LmNwcAo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS90ZXh0L1RleHRFbmNvZGluZ1JlZ2lzdHJ5LmNwcAkocmV2aXNp b24gMjI0NjQ3KQorKysgU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vdGV4dC9UZXh0RW5jb2RpbmdS ZWdpc3RyeS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTExMywyOSArMTEzLDYgQEAgc3RhdGljIEhh c2hTZXQ8Y29uc3QgY2hhcio+KiBub25CYWNrc2xhcwogCiBzdGF0aWMgY29uc3QgY2hhciogY29u c3QgdGV4dEVuY29kaW5nTmFtZUJsYWNrbGlzdFtdID0geyAiVVRGLTciLCAiQk9DVS0xIiwgIlND U1UiIH07CiAKLSNpZiBFUlJPUl9ESVNBQkxFRAotCi1zdGF0aWMgaW5saW5lIHZvaWQgY2hlY2tF eGlzdGluZ05hbWUoY29uc3QgY2hhciosIGNvbnN0IGNoYXIqKSB7IH0KLQotI2Vsc2UKLQotc3Rh dGljIHZvaWQgY2hlY2tFeGlzdGluZ05hbWUoY29uc3QgY2hhciogYWxpYXMsIGNvbnN0IGNoYXIq IGF0b21pY05hbWUpCi17Ci0gICAgY29uc3QgY2hhciogb2xkQXRvbWljTmFtZSA9IHRleHRFbmNv ZGluZ05hbWVNYXAtPmdldChhbGlhcyk7Ci0gICAgaWYgKCFvbGRBdG9taWNOYW1lKQotICAgICAg ICByZXR1cm47Ci0gICAgaWYgKG9sZEF0b21pY05hbWUgPT0gYXRvbWljTmFtZSkKLSAgICAgICAg cmV0dXJuOwotICAgIC8vIEtlZXAgdGhlIHdhcm5pbmcgc2lsZW50IGFib3V0IG9uZSBjYXNlIHdo ZXJlIHdlIGtub3cgdGhpcyB3aWxsIGhhcHBlbi4KLSAgICBpZiAoc3RyY21wKGFsaWFzLCAiSVNP LTg4NTktOC1JIikgPT0gMAotICAgICAgICAgICAgJiYgc3RyY21wKG9sZEF0b21pY05hbWUsICJJ U08tODg1OS04LUkiKSA9PSAwCi0gICAgICAgICAgICAmJiBzdHJjYXNlY21wKGF0b21pY05hbWUs ICJpc28tODg1OS04IikgPT0gMCkKLSAgICAgICAgcmV0dXJuOwotICAgIExPR19FUlJPUigiYWxp YXMgJXMgbWFwcyB0byAlcyBhbHJlYWR5LCBidXQgc29tZW9uZSBpcyB0cnlpbmcgdG8gbWFrZSBp dCBtYXAgdG8gJXMiLCBhbGlhcywgb2xkQXRvbWljTmFtZSwgYXRvbWljTmFtZSk7Ci19Ci0KLSNl bmRpZgotCiBzdGF0aWMgYm9vbCBpc1VuZGVzaXJlZEFsaWFzKGNvbnN0IGNoYXIqIGFsaWFzKQog ewogICAgIC8vIFJlamVjdCBhbGlhc2VzIHdpdGggdmVyc2lvbiBudW1iZXJzIHRoYXQgYXJlIHN1 cHBvcnRlZCBieSBzb21lIGJhY2stZW5kcyAoc3VjaCBhcyAiSVNPXzIwMjIsbG9jYWxlPWphLHZl cnNpb249MCIgaW4gSUNVKS4KQEAgLTE1OSw3ICsxMzYsOSBAQCBzdGF0aWMgdm9pZCBhZGRUb1Rl eHRFbmNvZGluZ05hbWVNYXAoY29uCiAgICAgQVNTRVJUKHN0cmNtcChhbGlhcywgbmFtZSkgPT0g MCB8fCBhdG9taWNOYW1lKTsKICAgICBpZiAoIWF0b21pY05hbWUpCiAgICAgICAgIGF0b21pY05h bWUgPSBuYW1lOwotICAgIGNoZWNrRXhpc3RpbmdOYW1lKGFsaWFzLCBhdG9taWNOYW1lKTsKKwor ICAgIEFTU0VSVF9XSVRIX01FU1NBR0UoIXRleHRFbmNvZGluZ05hbWVNYXAtPmdldChhbGlhcyks ICJEdXBsaWNhdGUgdGV4dCBlbmNvZGluZyBuYW1lICVzIGZvciAlcyAocHJldmlvdXNseSByZWdp c3RlcmVkIGFzICVzKSIsIGFsaWFzLCBhdG9taWNOYW1lLCAhdGV4dEVuY29kaW5nTmFtZU1hcC0+ Z2V0KGFsaWFzKSk7CisKICAgICB0ZXh0RW5jb2RpbmdOYW1lTWFwLT5hZGQoYWxpYXMsIGF0b21p Y05hbWUpOwogfQogCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS90ZXh0L21hYy9tYWMt ZW5jb2RpbmdzLnR4dAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS90ZXh0 L21hYy9tYWMtZW5jb2RpbmdzLnR4dAkocmV2aXNpb24gMjI0NjQ3KQorKysgU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vdGV4dC9tYWMvbWFjLWVuY29kaW5ncy50eHQJKHdvcmtpbmcgY29weSkKQEAg LTExLDE2ICsxMSwxMSBAQAogRE9TQ2hpbmVzZVRyYWQ6IGNwOTUwCiBET1NHcmVlazogY3A3Mzcs IGlibTczNwogRVVDX1RXOiBFVUMtVFcKLUlTT0xhdGluMTA6IElTTy04ODU5LTE2Ci1JU09MYXRp bjY6IElTTy04ODU5LTEwCi1JU09MYXRpbjg6IElTTy04ODU5LTE0Ci1JU09MYXRpblRoYWk6IElT Ty04ODU5LTExCiBJU09fMjAyMl9KUF8zOiBJU08tMjAyMi1KUC0zCiBKSVNfQzYyMjZfNzg6IEpJ U19DNjIyNi0xOTc4CiBKSVNfWDAyMDhfODM6IEpJU19YMDIwOC0xOTgzCiBKSVNfWDAyMDhfOTA6 IEpJU19YMDIwOC0xOTkwCiBKSVNfWDAyMTJfOTA6IEpJU19YMDIxMi0xOTkwCi1LT0k4X1U6IEtP STgtVQogTWFjQXJhYmljOiB4LW1hYy1hcmFiaWMKIE1hY0NoaW5lc2VTaW1wOiB4LW1hYy1jaGlu ZXNlc2ltcCwgeG1hY3NpbXBjaGluZXNlCiBNYWNDaGluZXNlVHJhZDogeC1tYWMtY2hpbmVzZXRy YWQsIHhtYWN0cmFkY2hpbmVzZQpJbmRleDogTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIExheW91dFRlc3RzL0NoYW5nZUxvZwkocmV2aXNpb24gMjI0NjQ3KQorKysgTGF5b3V0 VGVzdHMvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTMgQEAKKzIwMTctMTEt MDkgIE1hY2llaiBTdGFjaG93aWFrICA8bWpzQGFwcGxlLmNvbT4KKworICAgICAgICBSZW1vdmUg VEVDIGRlY29kZXJzIHRoYXQgZHVwbGljYXRlIElDVSBkZWNvZGVycworICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTc5NDYwCisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgRGFyaW4gQWRsZXIuCisKKyAgICAgICAgKiBmYXN0L2VuY29kaW5nL2R1cGxpY2F0ZS10 ZWMtZW5jb2RpbmdzLWV4cGVjdGVkLnR4dDogQWRkZWQuCisgICAgICAgICogZmFzdC9lbmNvZGlu Zy9kdXBsaWNhdGUtdGVjLWVuY29kaW5ncy5odG1sOiBBZGRlZC4KKwogMjAxNy0xMS0wOSAgTWFj aWVqIFN0YWNob3dpYWsgIDxtanNAYXBwbGUuY29tPgogCiAgICAgICAgIFJlbW92ZSBzdXBwb3J0 IGZvciBpT1Mtb25seSBzb2Z0YmFuay1zamlzIGVuY29kaW5nIGlmIHBvc3NpYmxlCkluZGV4OiBM YXlvdXRUZXN0cy9mYXN0L2VuY29kaW5nL2R1cGxpY2F0ZS10ZWMtZW5jb2RpbmdzLWV4cGVjdGVk LnR4dAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9mYXN0L2VuY29kaW5nL2R1cGxpY2F0ZS10 ZWMtZW5jb2RpbmdzLWV4cGVjdGVkLnR4dAkobm9uZXhpc3RlbnQpCisrKyBMYXlvdXRUZXN0cy9m YXN0L2VuY29kaW5nL2R1cGxpY2F0ZS10ZWMtZW5jb2RpbmdzLWV4cGVjdGVkLnR4dAkod29ya2lu ZyBjb3B5KQpAQCAtMCwwICsxLDI5IEBACitUaGlzIHRlc3QgdmVyaWZpZXMgdGhhdCBlbmNvZGlu Z3MgdGhhdCB1c2VkIHRvIGJlIHN1cHBvcnRlZCBieSBURUMgb24gbWFjT1MgYXJlIHN0aWxsIHN1 cHBvcnRlZC4KKworT24gc3VjY2VzcywgeW91IHdpbGwgc2VlIGEgc2VyaWVzIG9mICJQQVNTIiBt ZXNzYWdlcywgZm9sbG93ZWQgYnkgIlRFU1QgQ09NUExFVEUiLgorCisKK1RoZSBmb2xsb3dpbmcg ZW5jb2RpbmcgbmFtZXMgYXJlIHN1cHBvcnRlZCBieSBXZWJLaXQgY3Jvc3MtcGxhdGZvcm0sIGJ1 dCBzb21lIG1heSBiZSByZW1vdmVkIGF0IGEgbGF0ZXIgdGltZS4KK1BBU1MgbmV3IFRleHREZWNv ZGVyKCJpc28tODg1OS0xMCIpLmVuY29kaW5nIGlzICJpc28tODg1OS0xMCIKK1BBU1MgbmV3IFRl eHREZWNvZGVyKCJpc284ODU5MTAxOTkyIikuZW5jb2RpbmcgaXMgImlzby04ODU5LTEwIgorUEFT UyBuZXcgVGV4dERlY29kZXIoImlzb2lyMTU3IikuZW5jb2RpbmcgaXMgImlzby04ODU5LTEwIgor UEFTUyBuZXcgVGV4dERlY29kZXIoImNzaXNvbGF0aW42IikuZW5jb2RpbmcgaXMgImlzby04ODU5 LTEwIgorUEFTUyBuZXcgVGV4dERlY29kZXIoImxhdGluNiIpLmVuY29kaW5nIGlzICJpc28tODg1 OS0xMCIKK1BBU1MgbmV3IFRleHREZWNvZGVyKCJsNiIpLmVuY29kaW5nIGlzICJpc28tODg1OS0x MCIKK1BBU1MgbmV3IFRleHREZWNvZGVyKCJpc28tODg1OS0xMSIpLmVuY29kaW5nIGlzICJ3aW5k b3dzLTg3NCIKK1BBU1MgbmV3IFRleHREZWNvZGVyKCJpc28tODg1OS0xNCIpLmVuY29kaW5nIGlz ICJpc28tODg1OS0xNCIKK1BBU1MgbmV3IFRleHREZWNvZGVyKCJpc29jZWx0aWMiKS5lbmNvZGlu ZyBpcyAiaXNvLTg4NTktMTQiCitQQVNTIG5ldyBUZXh0RGVjb2RlcigiaXNvODg1OTE0MTk5OCIp LmVuY29kaW5nIGlzICJpc28tODg1OS0xNCIKK1BBU1MgbmV3IFRleHREZWNvZGVyKCJpc29pcjE5 OSIpLmVuY29kaW5nIGlzICJpc28tODg1OS0xNCIKK1BBU1MgbmV3IFRleHREZWNvZGVyKCJsYXRp bjgiKS5lbmNvZGluZyBpcyAiaXNvLTg4NTktMTQiCitQQVNTIG5ldyBUZXh0RGVjb2RlcigibDgi KS5lbmNvZGluZyBpcyAiaXNvLTg4NTktMTQiCitQQVNTIG5ldyBUZXh0RGVjb2RlcigiaXNvLTg4 NTktMTYiKS5lbmNvZGluZyBpcyAiaXNvLTg4NTktMTYiCitQQVNTIG5ldyBUZXh0RGVjb2Rlcigi aXNvaXIyMjYiKS5lbmNvZGluZyBpcyAiaXNvLTg4NTktMTYiCitQQVNTIG5ldyBUZXh0RGVjb2Rl cigiaXNvODg1OTE2MjAwMSIpLmVuY29kaW5nIGlzICJpc28tODg1OS0xNiIKK1BBU1MgbmV3IFRl eHREZWNvZGVyKCJsMTAiKS5lbmNvZGluZyBpcyAiaXNvLTg4NTktMTYiCitQQVNTIG5ldyBUZXh0 RGVjb2RlcigibGF0aW4xMCIpLmVuY29kaW5nIGlzICJpc28tODg1OS0xNiIKK1BBU1MgbmV3IFRl eHREZWNvZGVyKCJrb2k4LXUiKS5lbmNvZGluZyBpcyAia29pOC11IgorUEFTUyBzdWNjZXNzZnVs bHlQYXJzZWQgaXMgdHJ1ZQorCitURVNUIENPTVBMRVRFCisKSW5kZXg6IExheW91dFRlc3RzL2Zh c3QvZW5jb2RpbmcvZHVwbGljYXRlLXRlYy1lbmNvZGluZ3MuaHRtbAo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBM YXlvdXRUZXN0cy9mYXN0L2VuY29kaW5nL2R1cGxpY2F0ZS10ZWMtZW5jb2RpbmdzLmh0bWwJKG5v bmV4aXN0ZW50KQorKysgTGF5b3V0VGVzdHMvZmFzdC9lbmNvZGluZy9kdXBsaWNhdGUtdGVjLWVu Y29kaW5ncy5odG1sCSh3b3JraW5nIGNvcHkpCkBAIC0wLDAgKzEsMzAgQEAKKzwhRE9DVFlQRSBo dG1sPgorPGh0bWw+Cis8aGVhZD4KKzxtZXRhIGNoYXJzZXQ9InV0Zi04Ij4KKzxzY3JpcHQgc3Jj PSIuLi8uLi9yZXNvdXJjZXMvanMtdGVzdC5qcyI+PC9zY3JpcHQ+Cis8L2hlYWQ+Cis8Ym9keT4K KzxzY3JpcHQ+CitkZXNjcmlwdGlvbigiVGhpcyB0ZXN0IHZlcmlmaWVzIHRoYXQgZW5jb2Rpbmdz IHRoYXQgdXNlZCB0byBiZSBzdXBwb3J0ZWQgYnkgVEVDIG9uIG1hY09TICBhcmUgc3RpbGwgIHN1 cHBvcnRlZC4iKTsKKworCitkZWJ1ZygiVGhlIGZvbGxvd2luZyBlbmNvZGluZyBuYW1lcyBhcmUg c3VwcG9ydGVkIGJ5IFdlYktpdCBjcm9zcy1wbGF0Zm9ybSwgYnV0IHNvbWUgbWF5IGJlIHJlbW92 ZWQgYXQgYSBsYXRlciB0aW1lLiIpOworbGV0IHZhbGlkRm9yTm93ID0gWworICAgIHtlbmNvZGlu ZzogJ2lzby04ODU5LTEwJywgYWxpYXNlczogWydpc28tODg1OS0xMCcsICdpc284ODU5MTAxOTky JywgJ2lzb2lyMTU3JywgJ2NzaXNvbGF0aW42JywgJ2xhdGluNicsICdsNiddfSwKKyAgICB7ZW5j b2Rpbmc6ICd3aW5kb3dzLTg3NCcsIGFsaWFzZXM6IFsnaXNvLTg4NTktMTEnXX0sCisgICAge2Vu Y29kaW5nOiAnaXNvLTg4NTktMTQnLCBhbGlhc2VzOiBbJ2lzby04ODU5LTE0JywgJ2lzb2NlbHRp YycsICdpc284ODU5MTQxOTk4JywgJ2lzb2lyMTk5JywgJ2xhdGluOCcsICdsOCddfSwKKyAgICB7 ZW5jb2Rpbmc6ICdpc28tODg1OS0xNicsIGFsaWFzZXM6IFsnaXNvLTg4NTktMTYnLCAnaXNvaXIy MjYnLCAnaXNvODg1OTE2MjAwMScsICdsMTAnLCAnbGF0aW4xMCddfSwKKyAgICB7ZW5jb2Rpbmc6 ICdrb2k4LXUnLCBhbGlhc2VzOiBbJ2tvaTgtdSddfQorXTsKKworZm9yIChsZXQgZW5jb2Rpbmcg b2YgdmFsaWRGb3JOb3cpIHsKKyAgICBmb3IgKGxldCBhbGlhcyBvZiBlbmNvZGluZy5hbGlhc2Vz KSB7CisgICAgICAgICBsZXQgY2Fub25pY2FsX25hbWVfZXhwciA9ICduZXcgVGV4dERlY29kZXIo IicgKyBhbGlhcyArICciKS5lbmNvZGluZyc7CisgICAgICAgICBzaG91bGRCZShjYW5vbmljYWxf bmFtZV9leHByLCAnIicgKyBlbmNvZGluZy5lbmNvZGluZyArICciJyk7CisgICAgfQorfQorCis8 L3NjcmlwdD4KKzwvYm9keT4KKzwvaHRtbD4K