198787 2019-06-12 07:16:43 -0700 [GTK] GTK_STOCK_* types have been deprecated since GTK 3.10 2019-06-12 13:43:43 -0700 1 1 1 Unclassified WebKit WebKitGTK WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 ludovico.denittis webkit-unassigned bugs-noreply commit-queue mcatanzaro oldest_to_newest 1544065 0 ludovico.denittis 2019-06-12 07:16:43 -0700 All the GTK_STOCK_* types are deprecated since GTK 3.10 I'm going to attach a patch. 1544068 1 371950 ludovico.denittis 2019-06-12 07:21:06 -0700 Created attachment 371950 Patch 1544071 2 371950 mcatanzaro 2019-06-12 07:23:53 -0700 Comment on attachment 371950 Patch Well the GTK_CHECK_VERSIONs aren't really needed here, are they? Can't we do this unconditionally? (Nobody is going to be using GTK 3.6 anymore anyway; it's long past time to bump our requirement.) 1544075 3 ludovico.denittis 2019-06-12 07:26:11 -0700 (In reply to Michael Catanzaro from comment #2) > Comment on attachment 371950 [details] > Patch > > Well the GTK_CHECK_VERSIONs aren't really needed here, are they? Can't we do > this unconditionally? > > (Nobody is going to be using GTK 3.6 anymore anyway; it's long past time to > bump our requirement.) Sure, the code will be even easier to follow. I added the check because I saw here that GTK 3.6 was still listed https://trac.webkit.org/wiki/WebKitGTK/Dependencies 1544076 4 371953 ludovico.denittis 2019-06-12 07:28:48 -0700 Created attachment 371953 Patch 1544089 5 371953 mcatanzaro 2019-06-12 07:56:07 -0700 Comment on attachment 371953 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=371953&action=review Yeah but hardcoding the icon names should work just fine with older versions of GTK, so I think this newer version is fine. Now, the function should no longer be called gtkStockIDFromContextMenuAction, since that's clearly no longer what the function does. But... the GtkAction API actually does work with stock IDs. It's not documented to accept icon names. So I really don't think this is right. I think the only correct way to get rid of the stock items here would be to just remove this function entirely and always pass nullptr for the stock ID instead, at the cost of no longer having icons in the context menu in whatever weird non-default environments still allow those. Or we could leave them as-is. The GtkAction we are creating is deprecated anyway, but we can't get rid of that because it's part of the API. So getting rid of deprecated stock items when creating a deprecated GtkAction doesn't seem as clear a win as your other patches, where you were able to fully replace use of deprecated APIs with non-deprecated ones. Either way is OK with me. > Source/WebKit/Shared/glib/WebContextMenuItemGlib.cpp:75 > case ContextMenuItemTagSpellingGuess: > - return nullptr; > case ContextMenuItemTagIgnoreSpelling: > - return GTK_STOCK_NO; > case ContextMenuItemTagLearnSpelling: > - return GTK_STOCK_OK; > + return nullptr; I would move these down to the bottom of the list, with the others that return nullptr. 1544091 6 mcatanzaro 2019-06-12 07:57:36 -0700 (In reply to Michael Catanzaro from comment #5) > Yeah but hardcoding the icon names should work just fine with older versions > of GTK, so I think this newer version is fine. Oops, this should generally be true, but I wrote this before I realized the problem that the GtkAction API really wants stock IDs and not icon names. 1544108 7 371962 ludovico.denittis 2019-06-12 08:42:08 -0700 Created attachment 371962 Patch 1544110 8 ludovico.denittis 2019-06-12 08:43:48 -0700 (In reply to Michael Catanzaro from comment #5) > Comment on attachment 371953 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=371953&action=review > > Yeah but hardcoding the icon names should work just fine with older versions > of GTK, so I think this newer version is fine. > > Now, the function should no longer be called > gtkStockIDFromContextMenuAction, since that's clearly no longer what the > function does. > > But... the GtkAction API actually does work with stock IDs. It's not > documented to accept icon names. So I really don't think this is right. I > think the only correct way to get rid of the stock items here would be to > just remove this function entirely and always pass nullptr for the stock ID > instead, at the cost of no longer having icons in the context menu in > whatever weird non-default environments still allow those. > > Or we could leave them as-is. The GtkAction we are creating is deprecated > anyway, but we can't get rid of that because it's part of the API. So > getting rid of deprecated stock items when creating a deprecated GtkAction > doesn't seem as clear a win as your other patches, where you were able to > fully replace use of deprecated APIs with non-deprecated ones. > > Either way is OK with me. > > > Source/WebKit/Shared/glib/WebContextMenuItemGlib.cpp:75 > > case ContextMenuItemTagSpellingGuess: > > - return nullptr; > > case ContextMenuItemTagIgnoreSpelling: > > - return GTK_STOCK_NO; > > case ContextMenuItemTagLearnSpelling: > > - return GTK_STOCK_OK; > > + return nullptr; > > I would move these down to the bottom of the list, with the others that > return nullptr. Thank you for the review. I've uploaded a new patch where I removed the function entirely. 1544218 9 371962 commit-queue 2019-06-12 13:43:42 -0700 Comment on attachment 371962 Patch Clearing flags on attachment: 371962 Committed r246374: <https://trac.webkit.org/changeset/246374> 1544219 10 commit-queue 2019-06-12 13:43:43 -0700 All reviewed patches have been landed. Closing bug. 371950 2019-06-12 07:21:06 -0700 2019-06-12 07:28:43 -0700 Patch bug-198787-20190612162104.patch text/plain 6970 ludovico.denittis U3VidmVyc2lvbiBSZXZpc2lvbjogMjQ2MzQ5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNGEyNzVkMDVhMzAxM2Vl N2Q5N2E4OTU3YTdiOTA3Y2ExMTZjN2QzZi4uM2UwNjM1YThmZDYwNTM1MGIyMWRhNzM1ZDdjZjI1 YzJmMzU4NjRmYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDE5LTA2LTEyICBMdWRv dmljbyBkZSBOaXR0aXMgIDxsdWRvdmljby5kZW5pdHRpc0Bjb2xsYWJvcmEuY29tPgorCisgICAg ICAgIFtHVEtdIEdUS19TVE9DS18qIHR5cGVzIGhhdmUgYmVlbiBkZXByZWNhdGVkIHNpbmNlIEdU SyAzLjEwCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0x OTg3ODcKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBO byBiZWhhdmlvdXIgY2hhbmdlcy4KKworICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2d0ay9J Y29uR3RrLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Omxvb2t1cEljb25OYW1lKToKKyAgICAgICAg KiBwbGF0Zm9ybS9ncmFwaGljcy9ndGsvSW1hZ2VHdGsuY3BwOgorICAgICAgICAoV2ViQ29yZTo6 bG9hZE1pc3NpbmdJbWFnZUljb25Gcm9tVGhlbWUpOgorCiAyMDE5LTA2LTExICBXZW5zb24gSHNp ZWggIDx3ZW5zb25faHNpZWhAYXBwbGUuY29tPgogCiAgICAgICAgIFtpT1NdIElkZW1wb3RlbnQg dGV4dCBhdXRvc2l6aW5nIG5lZWRzIHRvIHJlYWN0IHByb3Blcmx5IHRvIHZpZXdwb3J0IGNoYW5n ZXMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9D aGFuZ2VMb2cKaW5kZXggODk4ZGEzMjRhMTMxNTEwODg0YmMwMGI1YWJjODQ3ZDE3ZTRkNzgzOC4u MmQ1NTgyYWI1MzUzNjJjYWU5NjlmNjU3MTllZjAwNmYyMTkyOTVmOCAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYktpdC9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKQEAgLTEs MyArMSwxMyBAQAorMjAxOS0wNi0xMiAgTHVkb3ZpY28gZGUgTml0dGlzICA8bHVkb3ZpY28uZGVu aXR0aXNAY29sbGFib3JhLmNvbT4KKworICAgICAgICBbR1RLXSBHVEtfU1RPQ0tfKiB0eXBlcyBo YXZlIGJlZW4gZGVwcmVjYXRlZCBzaW5jZSBHVEsgMy4xMAorICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTk4Nzg3CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBTaGFyZWQvZ2xpYi9XZWJDb250ZXh0TWVudUl0 ZW1HbGliLmNwcDoKKyAgICAgICAgKFdlYktpdDo6Z3RrU3RvY2tJREZyb21Db250ZXh0TWVudUFj dGlvbik6CisKIDIwMTktMDYtMTEgIFdlbnNvbiBIc2llaCAgPHdlbnNvbl9oc2llaEBhcHBsZS5j b20+CiAKICAgICAgICAgW2lPU10gSWRlbXBvdGVudCB0ZXh0IGF1dG9zaXppbmcgbmVlZHMgdG8g cmVhY3QgcHJvcGVybHkgdG8gdmlld3BvcnQgY2hhbmdlcwpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3RrL0ljb25HdGsuY3BwIGIvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vZ3JhcGhpY3MvZ3RrL0ljb25HdGsuY3BwCmluZGV4IGFmMTg1YTU0Y2RkNDlkMjA0 Njg2NWU2OTNjNWE3M2M5NGM1OGIwNGIuLjVkYTdiNmVkZTk5MTYxZDRjOTVlNGVlMTNmMTA3YzBk ODZjNjllMTUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2d0 ay9JY29uR3RrLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9ndGsv SWNvbkd0ay5jcHAKQEAgLTg2LDcgKzg2LDExIEBAIHN0YXRpYyBTdHJpbmcgbG9va3VwSWNvbk5h bWUoU3RyaW5nIE1JTUVUeXBlKQogICAgICAgICBpZihndGtfaWNvbl90aGVtZV9oYXNfaWNvbihp Y29uVGhlbWUsIGljb25OYW1lLnV0ZjgoKS5kYXRhKCkpKQogICAgICAgICAgICAgcmV0dXJuIGlj b25OYW1lOwogICAgIH0KKyNpZiBHVEtfQ0hFQ0tfVkVSU0lPTigzLCAxMCwgMCkKKyAgICByZXR1 cm4gInRleHQteC1nZW5lcmljIjsKKyNlbHNlCiAgICAgcmV0dXJuIEdUS19TVE9DS19GSUxFOwor I2VuZGlmCiB9CiAKIC8vIEZJWE1FOiBNb3ZlIHRoZSBjb2RlIHRvIENocm9tZUNsaWVudDo6aWNv bkZvckZpbGVzKCkuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGlj cy9ndGsvSW1hZ2VHdGsuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3Rr L0ltYWdlR3RrLmNwcAppbmRleCA1NzViM2E1ZWY1NDVlNGI2YWFiYzAxZGIyZmM4YjA0MjM0NGE0 NDgxLi42MWM3Y2Q2ZmY4NzIwOGEyMzhlYzIwZDdmNDU0M2NhNmIwNTIxZGEzIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9ndGsvSW1hZ2VHdGsuY3BwCisrKyBi L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2d0ay9JbWFnZUd0ay5jcHAKQEAgLTY0 LDcgKzY0LDExIEBAIHN0YXRpYyBSZWY8SW1hZ2U+IGxvYWRNaXNzaW5nSW1hZ2VJY29uRnJvbVRo ZW1lKGNvbnN0IGNoYXIqIG5hbWUpCiB7CiAgICAgaW50IGljb25TaXplID0gZ19zdHJfaGFzX3N1 ZmZpeChuYW1lLCAiQDJ4IikgPyAzMiA6IDE2OwogICAgIGF1dG8gaWNvbiA9IEJpdG1hcEltYWdl OjpjcmVhdGUoKTsKKyNpZiBHVEtfQ0hFQ0tfVkVSU0lPTigzLCAxMCwgMCkKKyAgICBHVW5pcXVl UHRyPEd0a0ljb25JbmZvPiBpY29uSW5mbyhndGtfaWNvbl90aGVtZV9sb29rdXBfaWNvbihndGtf aWNvbl90aGVtZV9nZXRfZGVmYXVsdCgpLCAiaW1hZ2UtbWlzc2luZyIsIGljb25TaXplLCBHVEtf SUNPTl9MT09LVVBfTk9fU1ZHKSk7CisjZWxzZQogICAgIEdVbmlxdWVQdHI8R3RrSWNvbkluZm8+ IGljb25JbmZvKGd0a19pY29uX3RoZW1lX2xvb2t1cF9pY29uKGd0a19pY29uX3RoZW1lX2dldF9k ZWZhdWx0KCksIEdUS19TVE9DS19NSVNTSU5HX0lNQUdFLCBpY29uU2l6ZSwgR1RLX0lDT05fTE9P S1VQX05PX1NWRykpOworI2VuZGlmCiAgICAgaWYgKGljb25JbmZvKSB7CiAgICAgICAgIGF1dG8g YnVmZmVyID0gbG9hZFJlc291cmNlU2hhcmVkQnVmZmVyKGd0a19pY29uX2luZm9fZ2V0X2ZpbGVu YW1lKGljb25JbmZvLmdldCgpKSk7CiAgICAgICAgIGljb24tPnNldERhdGEoV1RGTW92ZShidWZm ZXIpLCB0cnVlKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvU2hhcmVkL2dsaWIvV2ViQ29u dGV4dE1lbnVJdGVtR2xpYi5jcHAgYi9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9nbGliL1dlYkNvbnRl eHRNZW51SXRlbUdsaWIuY3BwCmluZGV4IGQwMDEyMGNmMDIyZjFkZWM4NDE4NjJiYWM3MjUzMzNm Yzk3MmI5NTQuLjUwYTg0Mzk4NjQwYjUwZTNjMGNjOGJlOTdhZWFhNzI1NTQ2ZmZhMjggMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJLaXQvU2hhcmVkL2dsaWIvV2ViQ29udGV4dE1lbnVJdGVtR2xpYi5j cHAKKysrIGIvU291cmNlL1dlYktpdC9TaGFyZWQvZ2xpYi9XZWJDb250ZXh0TWVudUl0ZW1HbGli LmNwcApAQCAtNDAsNiArNDAsODMgQEAgdXNpbmcgbmFtZXNwYWNlIFdlYkNvcmU7CiBzdGF0aWMg Y29uc3QgY2hhciogZ3RrU3RvY2tJREZyb21Db250ZXh0TWVudUFjdGlvbihDb250ZXh0TWVudUFj dGlvbiBhY3Rpb24pCiB7CiAgICAgc3dpdGNoIChhY3Rpb24pIHsKKyNpZiBHVEtfQ0hFQ0tfVkVS U0lPTigzLCAxMCwgMCkKKyAgICBjYXNlIENvbnRleHRNZW51SXRlbVRhZ0NvcHlMaW5rVG9DbGlw Ym9hcmQ6CisgICAgY2FzZSBDb250ZXh0TWVudUl0ZW1UYWdDb3B5SW1hZ2VUb0NsaXBib2FyZDoK KyAgICBjYXNlIENvbnRleHRNZW51SXRlbVRhZ0NvcHlNZWRpYUxpbmtUb0NsaXBib2FyZDoKKyAg ICBjYXNlIENvbnRleHRNZW51SXRlbVRhZ0NvcHk6CisgICAgICAgIHJldHVybiAiZWRpdC1jb3B5 IjsKKyAgICBjYXNlIENvbnRleHRNZW51SXRlbVRhZ09wZW5MaW5rSW5OZXdXaW5kb3c6CisgICAg Y2FzZSBDb250ZXh0TWVudUl0ZW1UYWdPcGVuSW1hZ2VJbk5ld1dpbmRvdzoKKyAgICBjYXNlIENv bnRleHRNZW51SXRlbVRhZ09wZW5GcmFtZUluTmV3V2luZG93OgorICAgIGNhc2UgQ29udGV4dE1l bnVJdGVtVGFnT3Blbk1lZGlhSW5OZXdXaW5kb3c6CisgICAgICAgIHJldHVybiAiZG9jdW1lbnQt b3BlbiI7CisgICAgY2FzZSBDb250ZXh0TWVudUl0ZW1UYWdEb3dubG9hZExpbmtUb0Rpc2s6Cisg ICAgY2FzZSBDb250ZXh0TWVudUl0ZW1UYWdEb3dubG9hZEltYWdlVG9EaXNrOgorICAgICAgICBy ZXR1cm4gImRvY3VtZW50LXNhdmUiOworICAgIGNhc2UgQ29udGV4dE1lbnVJdGVtVGFnR29CYWNr OgorICAgICAgICByZXR1cm4gImdvLXByZXZpb3VzIjsKKyAgICBjYXNlIENvbnRleHRNZW51SXRl bVRhZ0dvRm9yd2FyZDoKKyAgICAgICAgcmV0dXJuICJnby1uZXh0IjsKKyAgICBjYXNlIENvbnRl eHRNZW51SXRlbVRhZ1N0b3A6CisgICAgICAgIHJldHVybiAicHJvY2Vzcy1zdG9wIjsKKyAgICBj YXNlIENvbnRleHRNZW51SXRlbVRhZ1JlbG9hZDoKKyAgICAgICAgcmV0dXJuICJ2aWV3LXJlZnJl c2giOworICAgIGNhc2UgQ29udGV4dE1lbnVJdGVtVGFnQ3V0OgorICAgICAgICByZXR1cm4gImVk aXQtY3V0IjsKKyAgICBjYXNlIENvbnRleHRNZW51SXRlbVRhZ1Bhc3RlOgorICAgICAgICByZXR1 cm4gImVkaXQtcGFzdGUiOworICAgIGNhc2UgQ29udGV4dE1lbnVJdGVtVGFnRGVsZXRlOgorICAg ICAgICByZXR1cm4gImVkaXQtZGVsZXRlIjsKKyAgICBjYXNlIENvbnRleHRNZW51SXRlbVRhZ1Nl bGVjdEFsbDoKKyAgICAgICAgcmV0dXJuICJlZGl0LXNlbGVjdC1hbGwiOworICAgIGNhc2UgQ29u dGV4dE1lbnVJdGVtVGFnU3BlbGxpbmdHdWVzczoKKyAgICBjYXNlIENvbnRleHRNZW51SXRlbVRh Z0lnbm9yZVNwZWxsaW5nOgorICAgIGNhc2UgQ29udGV4dE1lbnVJdGVtVGFnTGVhcm5TcGVsbGlu ZzoKKyAgICAgICAgcmV0dXJuIG51bGxwdHI7CisgICAgY2FzZSBDb250ZXh0TWVudUl0ZW1UYWdP dGhlcjoKKyAgICAgICAgcmV0dXJuICJpbWFnZS1taXNzaW5nIjsKKyAgICBjYXNlIENvbnRleHRN ZW51SXRlbVRhZ1NlYXJjaEluU3BvdGxpZ2h0OgorICAgICAgICByZXR1cm4gImVkaXQtZmluZCI7 CisgICAgY2FzZSBDb250ZXh0TWVudUl0ZW1UYWdTZWFyY2hXZWI6CisgICAgICAgIHJldHVybiAi ZWRpdC1maW5kIjsKKyAgICBjYXNlIENvbnRleHRNZW51SXRlbVRhZ09wZW5XaXRoRGVmYXVsdEFw cGxpY2F0aW9uOgorICAgICAgICByZXR1cm4gImRvY3VtZW50LW9wZW4iOworICAgIGNhc2UgQ29u dGV4dE1lbnVJdGVtUERGWm9vbUluOgorICAgICAgICByZXR1cm4gInpvb20taW4iOworICAgIGNh c2UgQ29udGV4dE1lbnVJdGVtUERGWm9vbU91dDoKKyAgICAgICAgcmV0dXJuICJ6b29tLW91dCI7 CisgICAgY2FzZSBDb250ZXh0TWVudUl0ZW1QREZBdXRvU2l6ZToKKyAgICAgICAgcmV0dXJuICJ6 b29tLWZpdC1iZXN0IjsKKyAgICBjYXNlIENvbnRleHRNZW51SXRlbVBERk5leHRQYWdlOgorICAg ICAgICByZXR1cm4gImdvLW5leHQiOworICAgIGNhc2UgQ29udGV4dE1lbnVJdGVtUERGUHJldmlv dXNQYWdlOgorICAgICAgICByZXR1cm4gImdvLXByZXZpb3VzIjsKKyAgICAvLyBOZXcgdGFncywg bm90IHBhcnQgb2YgQVBJCisgICAgY2FzZSBDb250ZXh0TWVudUl0ZW1UYWdPcGVuTGluazoKKyAg ICAgICAgcmV0dXJuICJkb2N1bWVudC1vcGVuIjsKKyAgICBjYXNlIENvbnRleHRNZW51SXRlbVRh Z0NoZWNrU3BlbGxpbmc6CisgICAgICAgIHJldHVybiAidG9vbHMtY2hlY2stc3BlbGxpbmciOwor ICAgIGNhc2UgQ29udGV4dE1lbnVJdGVtVGFnRm9udE1lbnU6CisgICAgY2FzZSBDb250ZXh0TWVu dUl0ZW1UYWdTaG93Rm9udHM6CisgICAgICAgIHJldHVybiBudWxscHRyOworICAgIGNhc2UgQ29u dGV4dE1lbnVJdGVtVGFnQm9sZDoKKyAgICAgICAgcmV0dXJuICJmb3JtYXQtdGV4dC1ib2xkIjsK KyAgICBjYXNlIENvbnRleHRNZW51SXRlbVRhZ0l0YWxpYzoKKyAgICAgICAgcmV0dXJuICJmb3Jt YXQtdGV4dC1pdGFsaWMiOworICAgIGNhc2UgQ29udGV4dE1lbnVJdGVtVGFnVW5kZXJsaW5lOgor ICAgICAgICByZXR1cm4gImZvcm1hdC10ZXh0LXVuZGVybGluZSI7CisgICAgY2FzZSBDb250ZXh0 TWVudUl0ZW1UYWdTaG93Q29sb3JzOgorICAgIGNhc2UgQ29udGV4dE1lbnVJdGVtVGFnVG9nZ2xl TWVkaWFDb250cm9sczoKKyAgICBjYXNlIENvbnRleHRNZW51SXRlbVRhZ1RvZ2dsZU1lZGlhTG9v cDoKKyAgICBjYXNlIENvbnRleHRNZW51SXRlbVRhZ0NvcHlJbWFnZVVybFRvQ2xpcGJvYXJkOgor ICAgICAgICAvLyBObyBpY29uIGZvciB0aGlzLgorICAgICAgICByZXR1cm4gbnVsbHB0cjsKKyAg ICBjYXNlIENvbnRleHRNZW51SXRlbVRhZ0VudGVyVmlkZW9GdWxsc2NyZWVuOgorICAgICAgICBy ZXR1cm4gInZpZXctZnVsbHNjcmVlbiI7CisgICAgZGVmYXVsdDoKKyAgICAgICAgcmV0dXJuIG51 bGxwdHI7CisjZWxzZQogICAgIGNhc2UgQ29udGV4dE1lbnVJdGVtVGFnQ29weUxpbmtUb0NsaXBi b2FyZDoKICAgICBjYXNlIENvbnRleHRNZW51SXRlbVRhZ0NvcHlJbWFnZVRvQ2xpcGJvYXJkOgog ICAgIGNhc2UgQ29udGV4dE1lbnVJdGVtVGFnQ29weU1lZGlhTGlua1RvQ2xpcGJvYXJkOgpAQCAt MTE5LDYgKzE5Niw3IEBAIHN0YXRpYyBjb25zdCBjaGFyKiBndGtTdG9ja0lERnJvbUNvbnRleHRN ZW51QWN0aW9uKENvbnRleHRNZW51QWN0aW9uIGFjdGlvbikKICAgICAgICAgcmV0dXJuIEdUS19T VE9DS19GVUxMU0NSRUVOOwogICAgIGRlZmF1bHQ6CiAgICAgICAgIHJldHVybiBudWxscHRyOwor I2VuZGlmIC8vIEdUS19DSEVDS19WRVJTSU9OKDMsIDEwLCAwKQogICAgIH0KIH0KICNlbmRpZiAv LyBQTEFURk9STShHVEspCg== 371953 2019-06-12 07:28:48 -0700 2019-06-12 08:42:03 -0700 Patch bug-198787-20190612162847.patch text/plain 7442 ludovico.denittis U3VidmVyc2lvbiBSZXZpc2lvbjogMjQ2MzQ5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNGEyNzVkMDVhMzAxM2Vl N2Q5N2E4OTU3YTdiOTA3Y2ExMTZjN2QzZi4uM2UwNjM1YThmZDYwNTM1MGIyMWRhNzM1ZDdjZjI1 YzJmMzU4NjRmYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDE5LTA2LTEyICBMdWRv dmljbyBkZSBOaXR0aXMgIDxsdWRvdmljby5kZW5pdHRpc0Bjb2xsYWJvcmEuY29tPgorCisgICAg ICAgIFtHVEtdIEdUS19TVE9DS18qIHR5cGVzIGhhdmUgYmVlbiBkZXByZWNhdGVkIHNpbmNlIEdU SyAzLjEwCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0x OTg3ODcKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBO byBiZWhhdmlvdXIgY2hhbmdlcy4KKworICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2d0ay9J Y29uR3RrLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Omxvb2t1cEljb25OYW1lKToKKyAgICAgICAg KiBwbGF0Zm9ybS9ncmFwaGljcy9ndGsvSW1hZ2VHdGsuY3BwOgorICAgICAgICAoV2ViQ29yZTo6 bG9hZE1pc3NpbmdJbWFnZUljb25Gcm9tVGhlbWUpOgorCiAyMDE5LTA2LTExICBXZW5zb24gSHNp ZWggIDx3ZW5zb25faHNpZWhAYXBwbGUuY29tPgogCiAgICAgICAgIFtpT1NdIElkZW1wb3RlbnQg dGV4dCBhdXRvc2l6aW5nIG5lZWRzIHRvIHJlYWN0IHByb3Blcmx5IHRvIHZpZXdwb3J0IGNoYW5n ZXMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9D aGFuZ2VMb2cKaW5kZXggODk4ZGEzMjRhMTMxNTEwODg0YmMwMGI1YWJjODQ3ZDE3ZTRkNzgzOC4u MmQ1NTgyYWI1MzUzNjJjYWU5NjlmNjU3MTllZjAwNmYyMTkyOTVmOCAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYktpdC9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKQEAgLTEs MyArMSwxMyBAQAorMjAxOS0wNi0xMiAgTHVkb3ZpY28gZGUgTml0dGlzICA8bHVkb3ZpY28uZGVu aXR0aXNAY29sbGFib3JhLmNvbT4KKworICAgICAgICBbR1RLXSBHVEtfU1RPQ0tfKiB0eXBlcyBo YXZlIGJlZW4gZGVwcmVjYXRlZCBzaW5jZSBHVEsgMy4xMAorICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTk4Nzg3CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBTaGFyZWQvZ2xpYi9XZWJDb250ZXh0TWVudUl0 ZW1HbGliLmNwcDoKKyAgICAgICAgKFdlYktpdDo6Z3RrU3RvY2tJREZyb21Db250ZXh0TWVudUFj dGlvbik6CisKIDIwMTktMDYtMTEgIFdlbnNvbiBIc2llaCAgPHdlbnNvbl9oc2llaEBhcHBsZS5j b20+CiAKICAgICAgICAgW2lPU10gSWRlbXBvdGVudCB0ZXh0IGF1dG9zaXppbmcgbmVlZHMgdG8g cmVhY3QgcHJvcGVybHkgdG8gdmlld3BvcnQgY2hhbmdlcwpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3RrL0ljb25HdGsuY3BwIGIvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vZ3JhcGhpY3MvZ3RrL0ljb25HdGsuY3BwCmluZGV4IGFmMTg1YTU0Y2RkNDlkMjA0 Njg2NWU2OTNjNWE3M2M5NGM1OGIwNGIuLmYwMzliYTY2M2ViMmFlNTEwMThjMzU2MTdjMWVhNjU0 ZGYwZTNjOGUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2d0 ay9JY29uR3RrLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9ndGsv SWNvbkd0ay5jcHAKQEAgLTg2LDcgKzg2LDcgQEAgc3RhdGljIFN0cmluZyBsb29rdXBJY29uTmFt ZShTdHJpbmcgTUlNRVR5cGUpCiAgICAgICAgIGlmKGd0a19pY29uX3RoZW1lX2hhc19pY29uKGlj b25UaGVtZSwgaWNvbk5hbWUudXRmOCgpLmRhdGEoKSkpCiAgICAgICAgICAgICByZXR1cm4gaWNv bk5hbWU7CiAgICAgfQotICAgIHJldHVybiBHVEtfU1RPQ0tfRklMRTsKKyAgICByZXR1cm4gInRl eHQteC1nZW5lcmljIjsKIH0KIAogLy8gRklYTUU6IE1vdmUgdGhlIGNvZGUgdG8gQ2hyb21lQ2xp ZW50OjppY29uRm9yRmlsZXMoKS4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L2dyYXBoaWNzL2d0ay9JbWFnZUd0ay5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFw aGljcy9ndGsvSW1hZ2VHdGsuY3BwCmluZGV4IDU3NWIzYTVlZjU0NWU0YjZhYWJjMDFkYjJmYzhi MDQyMzQ0YTQ0ODEuLjgzMDE4NTgxMGUxZTg0NGU1NDgzZjVjMmU2ZGY0ZmI2MTZkODI1NDcgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2d0ay9JbWFnZUd0ay5j cHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3RrL0ltYWdlR3RrLmNw cApAQCAtNjQsNyArNjQsNyBAQCBzdGF0aWMgUmVmPEltYWdlPiBsb2FkTWlzc2luZ0ltYWdlSWNv bkZyb21UaGVtZShjb25zdCBjaGFyKiBuYW1lKQogewogICAgIGludCBpY29uU2l6ZSA9IGdfc3Ry X2hhc19zdWZmaXgobmFtZSwgIkAyeCIpID8gMzIgOiAxNjsKICAgICBhdXRvIGljb24gPSBCaXRt YXBJbWFnZTo6Y3JlYXRlKCk7Ci0gICAgR1VuaXF1ZVB0cjxHdGtJY29uSW5mbz4gaWNvbkluZm8o Z3RrX2ljb25fdGhlbWVfbG9va3VwX2ljb24oZ3RrX2ljb25fdGhlbWVfZ2V0X2RlZmF1bHQoKSwg R1RLX1NUT0NLX01JU1NJTkdfSU1BR0UsIGljb25TaXplLCBHVEtfSUNPTl9MT09LVVBfTk9fU1ZH KSk7CisgICAgR1VuaXF1ZVB0cjxHdGtJY29uSW5mbz4gaWNvbkluZm8oZ3RrX2ljb25fdGhlbWVf bG9va3VwX2ljb24oZ3RrX2ljb25fdGhlbWVfZ2V0X2RlZmF1bHQoKSwgImltYWdlLW1pc3Npbmci LCBpY29uU2l6ZSwgR1RLX0lDT05fTE9PS1VQX05PX1NWRykpOwogICAgIGlmIChpY29uSW5mbykg ewogICAgICAgICBhdXRvIGJ1ZmZlciA9IGxvYWRSZXNvdXJjZVNoYXJlZEJ1ZmZlcihndGtfaWNv bl9pbmZvX2dldF9maWxlbmFtZShpY29uSW5mby5nZXQoKSkpOwogICAgICAgICBpY29uLT5zZXRE YXRhKFdURk1vdmUoYnVmZmVyKSwgdHJ1ZSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1No YXJlZC9nbGliL1dlYkNvbnRleHRNZW51SXRlbUdsaWIuY3BwIGIvU291cmNlL1dlYktpdC9TaGFy ZWQvZ2xpYi9XZWJDb250ZXh0TWVudUl0ZW1HbGliLmNwcAppbmRleCBkMDAxMjBjZjAyMmYxZGVj ODQxODYyYmFjNzI1MzMzZmM5NzJiOTU0Li41NTYyNzFkOTM0YzNlYWRiMjE4MDQ0NDc3MDA4Njk2 NjA1YzE5Y2E5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9nbGliL1dlYkNvbnRl eHRNZW51SXRlbUdsaWIuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvU2hhcmVkL2dsaWIvV2ViQ29u dGV4dE1lbnVJdGVtR2xpYi5jcHAKQEAgLTQ0LDc5ICs0NCw3NSBAQCBzdGF0aWMgY29uc3QgY2hh ciogZ3RrU3RvY2tJREZyb21Db250ZXh0TWVudUFjdGlvbihDb250ZXh0TWVudUFjdGlvbiBhY3Rp b24pCiAgICAgY2FzZSBDb250ZXh0TWVudUl0ZW1UYWdDb3B5SW1hZ2VUb0NsaXBib2FyZDoKICAg ICBjYXNlIENvbnRleHRNZW51SXRlbVRhZ0NvcHlNZWRpYUxpbmtUb0NsaXBib2FyZDoKICAgICBj YXNlIENvbnRleHRNZW51SXRlbVRhZ0NvcHk6Ci0gICAgICAgIHJldHVybiBHVEtfU1RPQ0tfQ09Q WTsKKyAgICAgICAgcmV0dXJuICJlZGl0LWNvcHkiOwogICAgIGNhc2UgQ29udGV4dE1lbnVJdGVt VGFnT3BlbkxpbmtJbk5ld1dpbmRvdzoKICAgICBjYXNlIENvbnRleHRNZW51SXRlbVRhZ09wZW5J bWFnZUluTmV3V2luZG93OgogICAgIGNhc2UgQ29udGV4dE1lbnVJdGVtVGFnT3BlbkZyYW1lSW5O ZXdXaW5kb3c6CiAgICAgY2FzZSBDb250ZXh0TWVudUl0ZW1UYWdPcGVuTWVkaWFJbk5ld1dpbmRv dzoKLSAgICAgICAgcmV0dXJuIEdUS19TVE9DS19PUEVOOworICAgICAgICByZXR1cm4gImRvY3Vt ZW50LW9wZW4iOwogICAgIGNhc2UgQ29udGV4dE1lbnVJdGVtVGFnRG93bmxvYWRMaW5rVG9EaXNr OgogICAgIGNhc2UgQ29udGV4dE1lbnVJdGVtVGFnRG93bmxvYWRJbWFnZVRvRGlzazoKLSAgICAg ICAgcmV0dXJuIEdUS19TVE9DS19TQVZFOworICAgICAgICByZXR1cm4gImRvY3VtZW50LXNhdmUi OwogICAgIGNhc2UgQ29udGV4dE1lbnVJdGVtVGFnR29CYWNrOgotICAgICAgICByZXR1cm4gR1RL X1NUT0NLX0dPX0JBQ0s7CisgICAgICAgIHJldHVybiAiZ28tcHJldmlvdXMiOwogICAgIGNhc2Ug Q29udGV4dE1lbnVJdGVtVGFnR29Gb3J3YXJkOgotICAgICAgICByZXR1cm4gR1RLX1NUT0NLX0dP X0ZPUldBUkQ7CisgICAgICAgIHJldHVybiAiZ28tbmV4dCI7CiAgICAgY2FzZSBDb250ZXh0TWVu dUl0ZW1UYWdTdG9wOgotICAgICAgICByZXR1cm4gR1RLX1NUT0NLX1NUT1A7CisgICAgICAgIHJl dHVybiAicHJvY2Vzcy1zdG9wIjsKICAgICBjYXNlIENvbnRleHRNZW51SXRlbVRhZ1JlbG9hZDoK LSAgICAgICAgcmV0dXJuIEdUS19TVE9DS19SRUZSRVNIOworICAgICAgICByZXR1cm4gInZpZXct cmVmcmVzaCI7CiAgICAgY2FzZSBDb250ZXh0TWVudUl0ZW1UYWdDdXQ6Ci0gICAgICAgIHJldHVy biBHVEtfU1RPQ0tfQ1VUOworICAgICAgICByZXR1cm4gImVkaXQtY3V0IjsKICAgICBjYXNlIENv bnRleHRNZW51SXRlbVRhZ1Bhc3RlOgotICAgICAgICByZXR1cm4gR1RLX1NUT0NLX1BBU1RFOwor ICAgICAgICByZXR1cm4gImVkaXQtcGFzdGUiOwogICAgIGNhc2UgQ29udGV4dE1lbnVJdGVtVGFn RGVsZXRlOgotICAgICAgICByZXR1cm4gR1RLX1NUT0NLX0RFTEVURTsKKyAgICAgICAgcmV0dXJu ICJlZGl0LWRlbGV0ZSI7CiAgICAgY2FzZSBDb250ZXh0TWVudUl0ZW1UYWdTZWxlY3RBbGw6Ci0g ICAgICAgIHJldHVybiBHVEtfU1RPQ0tfU0VMRUNUX0FMTDsKKyAgICAgICAgcmV0dXJuICJlZGl0 LXNlbGVjdC1hbGwiOwogICAgIGNhc2UgQ29udGV4dE1lbnVJdGVtVGFnU3BlbGxpbmdHdWVzczoK LSAgICAgICAgcmV0dXJuIG51bGxwdHI7CiAgICAgY2FzZSBDb250ZXh0TWVudUl0ZW1UYWdJZ25v cmVTcGVsbGluZzoKLSAgICAgICAgcmV0dXJuIEdUS19TVE9DS19OTzsKICAgICBjYXNlIENvbnRl eHRNZW51SXRlbVRhZ0xlYXJuU3BlbGxpbmc6Ci0gICAgICAgIHJldHVybiBHVEtfU1RPQ0tfT0s7 CisgICAgICAgIHJldHVybiBudWxscHRyOwogICAgIGNhc2UgQ29udGV4dE1lbnVJdGVtVGFnT3Ro ZXI6Ci0gICAgICAgIHJldHVybiBHVEtfU1RPQ0tfTUlTU0lOR19JTUFHRTsKKyAgICAgICAgcmV0 dXJuICJpbWFnZS1taXNzaW5nIjsKICAgICBjYXNlIENvbnRleHRNZW51SXRlbVRhZ1NlYXJjaElu U3BvdGxpZ2h0OgotICAgICAgICByZXR1cm4gR1RLX1NUT0NLX0ZJTkQ7CisgICAgICAgIHJldHVy biAiZWRpdC1maW5kIjsKICAgICBjYXNlIENvbnRleHRNZW51SXRlbVRhZ1NlYXJjaFdlYjoKLSAg ICAgICAgcmV0dXJuIEdUS19TVE9DS19GSU5EOworICAgICAgICByZXR1cm4gImVkaXQtZmluZCI7 CiAgICAgY2FzZSBDb250ZXh0TWVudUl0ZW1UYWdPcGVuV2l0aERlZmF1bHRBcHBsaWNhdGlvbjoK LSAgICAgICAgcmV0dXJuIEdUS19TVE9DS19PUEVOOworICAgICAgICByZXR1cm4gImRvY3VtZW50 LW9wZW4iOwogICAgIGNhc2UgQ29udGV4dE1lbnVJdGVtUERGWm9vbUluOgotICAgICAgICByZXR1 cm4gR1RLX1NUT0NLX1pPT01fSU47CisgICAgICAgIHJldHVybiAiem9vbS1pbiI7CiAgICAgY2Fz ZSBDb250ZXh0TWVudUl0ZW1QREZab29tT3V0OgotICAgICAgICByZXR1cm4gR1RLX1NUT0NLX1pP T01fT1VUOworICAgICAgICByZXR1cm4gInpvb20tb3V0IjsKICAgICBjYXNlIENvbnRleHRNZW51 SXRlbVBERkF1dG9TaXplOgotICAgICAgICByZXR1cm4gR1RLX1NUT0NLX1pPT01fRklUOworICAg ICAgICByZXR1cm4gInpvb20tZml0LWJlc3QiOwogICAgIGNhc2UgQ29udGV4dE1lbnVJdGVtUERG TmV4dFBhZ2U6Ci0gICAgICAgIHJldHVybiBHVEtfU1RPQ0tfR09fRk9SV0FSRDsKKyAgICAgICAg cmV0dXJuICJnby1uZXh0IjsKICAgICBjYXNlIENvbnRleHRNZW51SXRlbVBERlByZXZpb3VzUGFn ZToKLSAgICAgICAgcmV0dXJuIEdUS19TVE9DS19HT19CQUNLOworICAgICAgICByZXR1cm4gImdv LXByZXZpb3VzIjsKICAgICAvLyBOZXcgdGFncywgbm90IHBhcnQgb2YgQVBJCiAgICAgY2FzZSBD b250ZXh0TWVudUl0ZW1UYWdPcGVuTGluazoKLSAgICAgICAgcmV0dXJuIEdUS19TVE9DS19PUEVO OworICAgICAgICByZXR1cm4gImRvY3VtZW50LW9wZW4iOwogICAgIGNhc2UgQ29udGV4dE1lbnVJ dGVtVGFnQ2hlY2tTcGVsbGluZzoKLSAgICAgICAgcmV0dXJuIEdUS19TVE9DS19TUEVMTF9DSEVD SzsKKyAgICAgICAgcmV0dXJuICJ0b29scy1jaGVjay1zcGVsbGluZyI7CiAgICAgY2FzZSBDb250 ZXh0TWVudUl0ZW1UYWdGb250TWVudToKLSAgICAgICAgcmV0dXJuIEdUS19TVE9DS19TRUxFQ1Rf Rk9OVDsKICAgICBjYXNlIENvbnRleHRNZW51SXRlbVRhZ1Nob3dGb250czoKLSAgICAgICAgcmV0 dXJuIEdUS19TVE9DS19TRUxFQ1RfRk9OVDsKKyAgICAgICAgcmV0dXJuIG51bGxwdHI7CiAgICAg Y2FzZSBDb250ZXh0TWVudUl0ZW1UYWdCb2xkOgotICAgICAgICByZXR1cm4gR1RLX1NUT0NLX0JP TEQ7CisgICAgICAgIHJldHVybiAiZm9ybWF0LXRleHQtYm9sZCI7CiAgICAgY2FzZSBDb250ZXh0 TWVudUl0ZW1UYWdJdGFsaWM6Ci0gICAgICAgIHJldHVybiBHVEtfU1RPQ0tfSVRBTElDOworICAg ICAgICByZXR1cm4gImZvcm1hdC10ZXh0LWl0YWxpYyI7CiAgICAgY2FzZSBDb250ZXh0TWVudUl0 ZW1UYWdVbmRlcmxpbmU6Ci0gICAgICAgIHJldHVybiBHVEtfU1RPQ0tfVU5ERVJMSU5FOworICAg ICAgICByZXR1cm4gImZvcm1hdC10ZXh0LXVuZGVybGluZSI7CiAgICAgY2FzZSBDb250ZXh0TWVu dUl0ZW1UYWdTaG93Q29sb3JzOgotICAgICAgICByZXR1cm4gR1RLX1NUT0NLX1NFTEVDVF9DT0xP UjsKICAgICBjYXNlIENvbnRleHRNZW51SXRlbVRhZ1RvZ2dsZU1lZGlhQ29udHJvbHM6CiAgICAg Y2FzZSBDb250ZXh0TWVudUl0ZW1UYWdUb2dnbGVNZWRpYUxvb3A6CiAgICAgY2FzZSBDb250ZXh0 TWVudUl0ZW1UYWdDb3B5SW1hZ2VVcmxUb0NsaXBib2FyZDoKICAgICAgICAgLy8gTm8gaWNvbiBm b3IgdGhpcy4KICAgICAgICAgcmV0dXJuIG51bGxwdHI7CiAgICAgY2FzZSBDb250ZXh0TWVudUl0 ZW1UYWdFbnRlclZpZGVvRnVsbHNjcmVlbjoKLSAgICAgICAgcmV0dXJuIEdUS19TVE9DS19GVUxM U0NSRUVOOworICAgICAgICByZXR1cm4gInZpZXctZnVsbHNjcmVlbiI7CiAgICAgZGVmYXVsdDoK ICAgICAgICAgcmV0dXJuIG51bGxwdHI7CiAgICAgfQo= 371962 2019-06-12 08:42:08 -0700 2019-06-12 13:43:42 -0700 Patch bug-198787-20190612174207.patch text/plain 8243 ludovico.denittis U3VidmVyc2lvbiBSZXZpc2lvbjogMjQ2MzQ5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNGEyNzVkMDVhMzAxM2Vl N2Q5N2E4OTU3YTdiOTA3Y2ExMTZjN2QzZi4uM2UwNjM1YThmZDYwNTM1MGIyMWRhNzM1ZDdjZjI1 YzJmMzU4NjRmYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDE5LTA2LTEyICBMdWRv dmljbyBkZSBOaXR0aXMgIDxsdWRvdmljby5kZW5pdHRpc0Bjb2xsYWJvcmEuY29tPgorCisgICAg ICAgIFtHVEtdIEdUS19TVE9DS18qIHR5cGVzIGhhdmUgYmVlbiBkZXByZWNhdGVkIHNpbmNlIEdU SyAzLjEwCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0x OTg3ODcKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBO byBiZWhhdmlvdXIgY2hhbmdlcy4KKworICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2d0ay9J Y29uR3RrLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Omxvb2t1cEljb25OYW1lKToKKyAgICAgICAg KiBwbGF0Zm9ybS9ncmFwaGljcy9ndGsvSW1hZ2VHdGsuY3BwOgorICAgICAgICAoV2ViQ29yZTo6 bG9hZE1pc3NpbmdJbWFnZUljb25Gcm9tVGhlbWUpOgorCiAyMDE5LTA2LTExICBXZW5zb24gSHNp ZWggIDx3ZW5zb25faHNpZWhAYXBwbGUuY29tPgogCiAgICAgICAgIFtpT1NdIElkZW1wb3RlbnQg dGV4dCBhdXRvc2l6aW5nIG5lZWRzIHRvIHJlYWN0IHByb3Blcmx5IHRvIHZpZXdwb3J0IGNoYW5n ZXMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9D aGFuZ2VMb2cKaW5kZXggODk4ZGEzMjRhMTMxNTEwODg0YmMwMGI1YWJjODQ3ZDE3ZTRkNzgzOC4u MzNlNmE0ZGRlZTE2MmVmMjQ1YzE4ZmEzMmE4ZjU1OTFjOGNhY2I4MCAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYktpdC9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKQEAgLTEs MyArMSwxNiBAQAorMjAxOS0wNi0xMiAgTHVkb3ZpY28gZGUgTml0dGlzICA8bHVkb3ZpY28uZGVu aXR0aXNAY29sbGFib3JhLmNvbT4KKworICAgICAgICBbR1RLXSBHVEtfU1RPQ0tfKiB0eXBlcyBo YXZlIGJlZW4gZGVwcmVjYXRlZCBzaW5jZSBHVEsgMy4xMAorICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTk4Nzg3CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgV2UgY29tcGxldGVseSByZW1vdmUgdGhlIGd0a1N0 b2NrSURGcm9tQ29udGV4dE1lbnVBY3Rpb24gZnVuY3Rpb24gaW4gb3JkZXIgdG8gZ2V0IHJpZCBv ZiB0aGUgc3RvY2sgaXRlbXMuCisgICAgICAgIFRoaXMgZnVuY3Rpb24gd2FzIHVzZWQgb25seSBp biAiY3JlYXRlQWN0aW9uSWZOZWVkZWQiIHdoZXJlIG5vdyB3ZSBwYXNzIGEgbnVsbHB0ciBhcyBh IHN0b2NrX2lkIHZhcmlhYmxlLgorCisgICAgICAgICogU2hhcmVkL2dsaWIvV2ViQ29udGV4dE1l bnVJdGVtR2xpYi5jcHA6CisgICAgICAgIChXZWJLaXQ6Omd0a1N0b2NrSURGcm9tQ29udGV4dE1l bnVBY3Rpb24pOgorCiAyMDE5LTA2LTExICBXZW5zb24gSHNpZWggIDx3ZW5zb25faHNpZWhAYXBw bGUuY29tPgogCiAgICAgICAgIFtpT1NdIElkZW1wb3RlbnQgdGV4dCBhdXRvc2l6aW5nIG5lZWRz IHRvIHJlYWN0IHByb3Blcmx5IHRvIHZpZXdwb3J0IGNoYW5nZXMKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2d0ay9JY29uR3RrLmNwcCBiL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL2dyYXBoaWNzL2d0ay9JY29uR3RrLmNwcAppbmRleCBhZjE4NWE1NGNkZDQ5 ZDIwNDY4NjVlNjkzYzVhNzNjOTRjNThiMDRiLi5mMDM5YmE2NjNlYjJhZTUxMDE4YzM1NjE3YzFl YTY1NGRmMGUzYzhlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGlj cy9ndGsvSWNvbkd0ay5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mv Z3RrL0ljb25HdGsuY3BwCkBAIC04Niw3ICs4Niw3IEBAIHN0YXRpYyBTdHJpbmcgbG9va3VwSWNv bk5hbWUoU3RyaW5nIE1JTUVUeXBlKQogICAgICAgICBpZihndGtfaWNvbl90aGVtZV9oYXNfaWNv bihpY29uVGhlbWUsIGljb25OYW1lLnV0ZjgoKS5kYXRhKCkpKQogICAgICAgICAgICAgcmV0dXJu IGljb25OYW1lOwogICAgIH0KLSAgICByZXR1cm4gR1RLX1NUT0NLX0ZJTEU7CisgICAgcmV0dXJu ICJ0ZXh0LXgtZ2VuZXJpYyI7CiB9CiAKIC8vIEZJWE1FOiBNb3ZlIHRoZSBjb2RlIHRvIENocm9t ZUNsaWVudDo6aWNvbkZvckZpbGVzKCkuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9ncmFwaGljcy9ndGsvSW1hZ2VHdGsuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v Z3JhcGhpY3MvZ3RrL0ltYWdlR3RrLmNwcAppbmRleCA1NzViM2E1ZWY1NDVlNGI2YWFiYzAxZGIy ZmM4YjA0MjM0NGE0NDgxLi44MzAxODU4MTBlMWU4NDRlNTQ4M2Y1YzJlNmRmNGZiNjE2ZDgyNTQ3 IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9ndGsvSW1hZ2VH dGsuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2d0ay9JbWFnZUd0 ay5jcHAKQEAgLTY0LDcgKzY0LDcgQEAgc3RhdGljIFJlZjxJbWFnZT4gbG9hZE1pc3NpbmdJbWFn ZUljb25Gcm9tVGhlbWUoY29uc3QgY2hhciogbmFtZSkKIHsKICAgICBpbnQgaWNvblNpemUgPSBn X3N0cl9oYXNfc3VmZml4KG5hbWUsICJAMngiKSA/IDMyIDogMTY7CiAgICAgYXV0byBpY29uID0g Qml0bWFwSW1hZ2U6OmNyZWF0ZSgpOwotICAgIEdVbmlxdWVQdHI8R3RrSWNvbkluZm8+IGljb25J bmZvKGd0a19pY29uX3RoZW1lX2xvb2t1cF9pY29uKGd0a19pY29uX3RoZW1lX2dldF9kZWZhdWx0 KCksIEdUS19TVE9DS19NSVNTSU5HX0lNQUdFLCBpY29uU2l6ZSwgR1RLX0lDT05fTE9PS1VQX05P X1NWRykpOworICAgIEdVbmlxdWVQdHI8R3RrSWNvbkluZm8+IGljb25JbmZvKGd0a19pY29uX3Ro ZW1lX2xvb2t1cF9pY29uKGd0a19pY29uX3RoZW1lX2dldF9kZWZhdWx0KCksICJpbWFnZS1taXNz aW5nIiwgaWNvblNpemUsIEdUS19JQ09OX0xPT0tVUF9OT19TVkcpKTsKICAgICBpZiAoaWNvbklu Zm8pIHsKICAgICAgICAgYXV0byBidWZmZXIgPSBsb2FkUmVzb3VyY2VTaGFyZWRCdWZmZXIoZ3Rr X2ljb25faW5mb19nZXRfZmlsZW5hbWUoaWNvbkluZm8uZ2V0KCkpKTsKICAgICAgICAgaWNvbi0+ c2V0RGF0YShXVEZNb3ZlKGJ1ZmZlciksIHRydWUpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktp dC9TaGFyZWQvZ2xpYi9XZWJDb250ZXh0TWVudUl0ZW1HbGliLmNwcCBiL1NvdXJjZS9XZWJLaXQv U2hhcmVkL2dsaWIvV2ViQ29udGV4dE1lbnVJdGVtR2xpYi5jcHAKaW5kZXggZDAwMTIwY2YwMjJm MWRlYzg0MTg2MmJhYzcyNTMzM2ZjOTcyYjk1NC4uN2Y3NWE2MDZjNzIyMmMzMDllZTUzZjU3ODdi MGI4OGZkYzE3ZDY4MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9TaGFyZWQvZ2xpYi9XZWJD b250ZXh0TWVudUl0ZW1HbGliLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9nbGliL1dl YkNvbnRleHRNZW51SXRlbUdsaWIuY3BwCkBAIC0zNiw5MyArMzYsNiBAQAogbmFtZXNwYWNlIFdl YktpdCB7CiB1c2luZyBuYW1lc3BhY2UgV2ViQ29yZTsKIAotI2lmIFBMQVRGT1JNKEdUSykKLXN0 YXRpYyBjb25zdCBjaGFyKiBndGtTdG9ja0lERnJvbUNvbnRleHRNZW51QWN0aW9uKENvbnRleHRN ZW51QWN0aW9uIGFjdGlvbikKLXsKLSAgICBzd2l0Y2ggKGFjdGlvbikgewotICAgIGNhc2UgQ29u dGV4dE1lbnVJdGVtVGFnQ29weUxpbmtUb0NsaXBib2FyZDoKLSAgICBjYXNlIENvbnRleHRNZW51 SXRlbVRhZ0NvcHlJbWFnZVRvQ2xpcGJvYXJkOgotICAgIGNhc2UgQ29udGV4dE1lbnVJdGVtVGFn Q29weU1lZGlhTGlua1RvQ2xpcGJvYXJkOgotICAgIGNhc2UgQ29udGV4dE1lbnVJdGVtVGFnQ29w eToKLSAgICAgICAgcmV0dXJuIEdUS19TVE9DS19DT1BZOwotICAgIGNhc2UgQ29udGV4dE1lbnVJ dGVtVGFnT3BlbkxpbmtJbk5ld1dpbmRvdzoKLSAgICBjYXNlIENvbnRleHRNZW51SXRlbVRhZ09w ZW5JbWFnZUluTmV3V2luZG93OgotICAgIGNhc2UgQ29udGV4dE1lbnVJdGVtVGFnT3BlbkZyYW1l SW5OZXdXaW5kb3c6Ci0gICAgY2FzZSBDb250ZXh0TWVudUl0ZW1UYWdPcGVuTWVkaWFJbk5ld1dp bmRvdzoKLSAgICAgICAgcmV0dXJuIEdUS19TVE9DS19PUEVOOwotICAgIGNhc2UgQ29udGV4dE1l bnVJdGVtVGFnRG93bmxvYWRMaW5rVG9EaXNrOgotICAgIGNhc2UgQ29udGV4dE1lbnVJdGVtVGFn RG93bmxvYWRJbWFnZVRvRGlzazoKLSAgICAgICAgcmV0dXJuIEdUS19TVE9DS19TQVZFOwotICAg IGNhc2UgQ29udGV4dE1lbnVJdGVtVGFnR29CYWNrOgotICAgICAgICByZXR1cm4gR1RLX1NUT0NL X0dPX0JBQ0s7Ci0gICAgY2FzZSBDb250ZXh0TWVudUl0ZW1UYWdHb0ZvcndhcmQ6Ci0gICAgICAg IHJldHVybiBHVEtfU1RPQ0tfR09fRk9SV0FSRDsKLSAgICBjYXNlIENvbnRleHRNZW51SXRlbVRh Z1N0b3A6Ci0gICAgICAgIHJldHVybiBHVEtfU1RPQ0tfU1RPUDsKLSAgICBjYXNlIENvbnRleHRN ZW51SXRlbVRhZ1JlbG9hZDoKLSAgICAgICAgcmV0dXJuIEdUS19TVE9DS19SRUZSRVNIOwotICAg IGNhc2UgQ29udGV4dE1lbnVJdGVtVGFnQ3V0OgotICAgICAgICByZXR1cm4gR1RLX1NUT0NLX0NV VDsKLSAgICBjYXNlIENvbnRleHRNZW51SXRlbVRhZ1Bhc3RlOgotICAgICAgICByZXR1cm4gR1RL X1NUT0NLX1BBU1RFOwotICAgIGNhc2UgQ29udGV4dE1lbnVJdGVtVGFnRGVsZXRlOgotICAgICAg ICByZXR1cm4gR1RLX1NUT0NLX0RFTEVURTsKLSAgICBjYXNlIENvbnRleHRNZW51SXRlbVRhZ1Nl bGVjdEFsbDoKLSAgICAgICAgcmV0dXJuIEdUS19TVE9DS19TRUxFQ1RfQUxMOwotICAgIGNhc2Ug Q29udGV4dE1lbnVJdGVtVGFnU3BlbGxpbmdHdWVzczoKLSAgICAgICAgcmV0dXJuIG51bGxwdHI7 Ci0gICAgY2FzZSBDb250ZXh0TWVudUl0ZW1UYWdJZ25vcmVTcGVsbGluZzoKLSAgICAgICAgcmV0 dXJuIEdUS19TVE9DS19OTzsKLSAgICBjYXNlIENvbnRleHRNZW51SXRlbVRhZ0xlYXJuU3BlbGxp bmc6Ci0gICAgICAgIHJldHVybiBHVEtfU1RPQ0tfT0s7Ci0gICAgY2FzZSBDb250ZXh0TWVudUl0 ZW1UYWdPdGhlcjoKLSAgICAgICAgcmV0dXJuIEdUS19TVE9DS19NSVNTSU5HX0lNQUdFOwotICAg IGNhc2UgQ29udGV4dE1lbnVJdGVtVGFnU2VhcmNoSW5TcG90bGlnaHQ6Ci0gICAgICAgIHJldHVy biBHVEtfU1RPQ0tfRklORDsKLSAgICBjYXNlIENvbnRleHRNZW51SXRlbVRhZ1NlYXJjaFdlYjoK LSAgICAgICAgcmV0dXJuIEdUS19TVE9DS19GSU5EOwotICAgIGNhc2UgQ29udGV4dE1lbnVJdGVt VGFnT3BlbldpdGhEZWZhdWx0QXBwbGljYXRpb246Ci0gICAgICAgIHJldHVybiBHVEtfU1RPQ0tf T1BFTjsKLSAgICBjYXNlIENvbnRleHRNZW51SXRlbVBERlpvb21JbjoKLSAgICAgICAgcmV0dXJu IEdUS19TVE9DS19aT09NX0lOOwotICAgIGNhc2UgQ29udGV4dE1lbnVJdGVtUERGWm9vbU91dDoK LSAgICAgICAgcmV0dXJuIEdUS19TVE9DS19aT09NX09VVDsKLSAgICBjYXNlIENvbnRleHRNZW51 SXRlbVBERkF1dG9TaXplOgotICAgICAgICByZXR1cm4gR1RLX1NUT0NLX1pPT01fRklUOwotICAg IGNhc2UgQ29udGV4dE1lbnVJdGVtUERGTmV4dFBhZ2U6Ci0gICAgICAgIHJldHVybiBHVEtfU1RP Q0tfR09fRk9SV0FSRDsKLSAgICBjYXNlIENvbnRleHRNZW51SXRlbVBERlByZXZpb3VzUGFnZToK LSAgICAgICAgcmV0dXJuIEdUS19TVE9DS19HT19CQUNLOwotICAgIC8vIE5ldyB0YWdzLCBub3Qg cGFydCBvZiBBUEkKLSAgICBjYXNlIENvbnRleHRNZW51SXRlbVRhZ09wZW5MaW5rOgotICAgICAg ICByZXR1cm4gR1RLX1NUT0NLX09QRU47Ci0gICAgY2FzZSBDb250ZXh0TWVudUl0ZW1UYWdDaGVj a1NwZWxsaW5nOgotICAgICAgICByZXR1cm4gR1RLX1NUT0NLX1NQRUxMX0NIRUNLOwotICAgIGNh c2UgQ29udGV4dE1lbnVJdGVtVGFnRm9udE1lbnU6Ci0gICAgICAgIHJldHVybiBHVEtfU1RPQ0tf U0VMRUNUX0ZPTlQ7Ci0gICAgY2FzZSBDb250ZXh0TWVudUl0ZW1UYWdTaG93Rm9udHM6Ci0gICAg ICAgIHJldHVybiBHVEtfU1RPQ0tfU0VMRUNUX0ZPTlQ7Ci0gICAgY2FzZSBDb250ZXh0TWVudUl0 ZW1UYWdCb2xkOgotICAgICAgICByZXR1cm4gR1RLX1NUT0NLX0JPTEQ7Ci0gICAgY2FzZSBDb250 ZXh0TWVudUl0ZW1UYWdJdGFsaWM6Ci0gICAgICAgIHJldHVybiBHVEtfU1RPQ0tfSVRBTElDOwot ICAgIGNhc2UgQ29udGV4dE1lbnVJdGVtVGFnVW5kZXJsaW5lOgotICAgICAgICByZXR1cm4gR1RL X1NUT0NLX1VOREVSTElORTsKLSAgICBjYXNlIENvbnRleHRNZW51SXRlbVRhZ1Nob3dDb2xvcnM6 Ci0gICAgICAgIHJldHVybiBHVEtfU1RPQ0tfU0VMRUNUX0NPTE9SOwotICAgIGNhc2UgQ29udGV4 dE1lbnVJdGVtVGFnVG9nZ2xlTWVkaWFDb250cm9sczoKLSAgICBjYXNlIENvbnRleHRNZW51SXRl bVRhZ1RvZ2dsZU1lZGlhTG9vcDoKLSAgICBjYXNlIENvbnRleHRNZW51SXRlbVRhZ0NvcHlJbWFn ZVVybFRvQ2xpcGJvYXJkOgotICAgICAgICAvLyBObyBpY29uIGZvciB0aGlzLgotICAgICAgICBy ZXR1cm4gbnVsbHB0cjsKLSAgICBjYXNlIENvbnRleHRNZW51SXRlbVRhZ0VudGVyVmlkZW9GdWxs c2NyZWVuOgotICAgICAgICByZXR1cm4gR1RLX1NUT0NLX0ZVTExTQ1JFRU47Ci0gICAgZGVmYXVs dDoKLSAgICAgICAgcmV0dXJuIG51bGxwdHI7Ci0gICAgfQotfQotI2VuZGlmIC8vIFBMQVRGT1JN KEdUSykKLQogV2ViQ29udGV4dE1lbnVJdGVtR2xpYjo6V2ViQ29udGV4dE1lbnVJdGVtR2xpYihD b250ZXh0TWVudUl0ZW1UeXBlIHR5cGUsIENvbnRleHRNZW51QWN0aW9uIGFjdGlvbiwgY29uc3Qg U3RyaW5nJiB0aXRsZSwgYm9vbCBlbmFibGVkLCBib29sIGNoZWNrZWQpCiAgICAgOiBXZWJDb250 ZXh0TWVudUl0ZW1EYXRhKHR5cGUsIGFjdGlvbiwgdGl0bGUsIGVuYWJsZWQsIGNoZWNrZWQpCiB7 CkBAIC0yMDcsMTAgKzEyMCwxMCBAQCB2b2lkIFdlYkNvbnRleHRNZW51SXRlbUdsaWI6OmNyZWF0 ZUFjdGlvbklmTmVlZGVkKCkKICAgICAvLyBDcmVhdGUgdGhlIEd0a0FjdGlvbiBmb3IgYmFja3dh cmRzIGNvbXBhdGliaWxpdHkgb25seS4KICAgICBpZiAoIW1fZ3RrQWN0aW9uKSB7CiAgICAgICAg IGlmICh0eXBlKCkgPT0gQ2hlY2thYmxlQWN0aW9uVHlwZSkgewotICAgICAgICAgICAgbV9ndGtB Y3Rpb24gPSBHVEtfQUNUSU9OKGd0a190b2dnbGVfYWN0aW9uX25ldyhnX2FjdGlvbl9nZXRfbmFt ZShtX2dBY3Rpb24uZ2V0KCkpLCB0aXRsZSgpLnV0ZjgoKS5kYXRhKCksIG51bGxwdHIsIGd0a1N0 b2NrSURGcm9tQ29udGV4dE1lbnVBY3Rpb24oYWN0aW9uKCkpKSk7CisgICAgICAgICAgICBtX2d0 a0FjdGlvbiA9IEdUS19BQ1RJT04oZ3RrX3RvZ2dsZV9hY3Rpb25fbmV3KGdfYWN0aW9uX2dldF9u YW1lKG1fZ0FjdGlvbi5nZXQoKSksIHRpdGxlKCkudXRmOCgpLmRhdGEoKSwgbnVsbHB0ciwgbnVs bHB0cikpOwogICAgICAgICAgICAgZ3RrX3RvZ2dsZV9hY3Rpb25fc2V0X2FjdGl2ZShHVEtfVE9H R0xFX0FDVElPTihtX2d0a0FjdGlvbiksIGNoZWNrZWQoKSk7CiAgICAgICAgIH0gZWxzZQotICAg ICAgICAgICAgbV9ndGtBY3Rpb24gPSBndGtfYWN0aW9uX25ldyhnX2FjdGlvbl9nZXRfbmFtZSht X2dBY3Rpb24uZ2V0KCkpLCB0aXRsZSgpLnV0ZjgoKS5kYXRhKCksIDAsIGd0a1N0b2NrSURGcm9t Q29udGV4dE1lbnVBY3Rpb24oYWN0aW9uKCkpKTsKKyAgICAgICAgICAgIG1fZ3RrQWN0aW9uID0g Z3RrX2FjdGlvbl9uZXcoZ19hY3Rpb25fZ2V0X25hbWUobV9nQWN0aW9uLmdldCgpKSwgdGl0bGUo KS51dGY4KCkuZGF0YSgpLCAwLCBudWxscHRyKTsKICAgICAgICAgZ3RrX2FjdGlvbl9zZXRfc2Vu c2l0aXZlKG1fZ3RrQWN0aW9uLCBlbmFibGVkKCkpOwogICAgICAgICBnX29iamVjdF9zZXRfZGF0 YV9mdWxsKEdfT0JKRUNUKG1fZ0FjdGlvbi5nZXQoKSksICJ3ZWJraXQtZ3RrLWFjdGlvbiIsIG1f Z3RrQWN0aW9uLCBnX29iamVjdF91bnJlZik7CiAgICAgfQo=