187194 2018-06-29 14:39:23 -0700 Enable copy paste on iOS apps for Mac 2018-07-02 14:52:25 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 megan_gardner megan_gardner commit-queue darin thorton wenson_hsieh oldest_to_newest 1437909 0 megan_gardner 2018-06-29 14:39:23 -0700 Enable copy paste on iOS apps for Mac 1437913 1 343947 megan_gardner 2018-06-29 14:49:40 -0700 Created attachment 343947 Patch 1437915 2 megan_gardner 2018-06-29 14:50:23 -0700 <rdar://problem/41451148> 1437929 3 343947 wenson_hsieh 2018-06-29 15:30:49 -0700 Comment on attachment 343947 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=343947&action=review > Source/WebCore/platform/ios/WebItemProviderPasteboard.h:30 > +#if ENABLE(MINIMAL_SIMULATOR) Since this is a private header, this should be TARGET_OS_IOSMAC instead. > Source/WebCore/platform/ios/WebItemProviderPasteboard.mm:29 > +#if ENABLE(DATA_INTERACTION) || ENABLE(MINIMAL_SIMULATOR) Nit - let's update the comment after the #endif as well! 1437992 4 343969 megan_gardner 2018-06-29 16:44:50 -0700 Created attachment 343969 Patch 1438052 5 343986 megan_gardner 2018-06-29 17:48:07 -0700 Created attachment 343986 Patch 1438062 6 343986 darin 2018-06-29 18:01:59 -0700 Comment on attachment 343986 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=343986&action=review > Source/WebCore/platform/ios/PlatformPasteboardIOS.mm:262 > + [pasteboard setItems:@[itemDictionary.get()]]; Code below uses a style with spaces between the @[ and the ], and it would be nice to be consistent. I’m also surprised that we want an array with a single item that is a dictionary here, but I’m willing to believe it! > Source/WebCore/platform/ios/PlatformPasteboardIOS.mm:366 > +#if !ENABLE(MINIMAL_SIMULATOR) > nsURL._title = pasteboardURL.title.isEmpty() ? userVisibleString(pasteboardURL.url) : (NSString *)pasteboardURL.title; > +#endif I think we need a comment about why we don’t do that on iOS running on Mac. It seems random and arbitrary without a comment, although arguably more terse and elegant. If the #if was something more along the rough lines of NSURL_SUPPORTS_TITLE, then it would be self explanatory; the comment would go where that is defined instead. I think that would be best. Following a pattern like PASTEBOARD_SUPPORTS_ITEM_PROVIDERS. > Source/WebCore/platform/ios/PlatformPasteboardIOS.mm:399 > +#if !ENABLE(MINIMAL_SIMULATOR) > if (!url.title.isEmpty()) > nsURL._title = url.title; > +#endif Ditto. > Source/WebCore/platform/ios/PlatformPasteboardIOS.mm:641 > +#if PASTEBOARD_SUPPORTS_ITEM_PROVIDERS && !ENABLE(MINIMAL_SIMULATOR) > title = [url _title]; Can we really do without the title? I understand that we can’t use the "_title" property. I am concerned because we may need the title for things like good quality rich links. > Source/WebCore/platform/ios/WebItemProviderPasteboard.h:35 > +#define UIItemProvider NSItemProvider > +#define UIItemProviderReading NSItemProviderReading > +#define UIItemProviderWriting NSItemProviderWriting > +#define UIItemProviderRepresentationOptionsVisibilityAll NSItemProviderRepresentationVisibilityAll Is this the kind of hack we want to do to share code across the platforms? I don’t see this sort of thing elsewhere, but maybe we decided on this the past? > Source/WebCore/platform/ios/WebItemProviderPasteboard.mm:29 > -#if ENABLE(DATA_INTERACTION) > +#if ENABLE(DATA_INTERACTION) || ENABLE(MINIMAL_SIMULATOR) This combination of feature conditional plus platform conditional seems particularly inelegant. Is there a way to do better? > Source/WebCore/platform/ios/WebItemProviderPasteboard.mm:289 > +#if !ENABLE(MINIMAL_SIMULATOR) > + [itemProvider setPreferredPresentationSize:self.preferredPresentationSize]; > [itemProvider setPreferredPresentationStyle:uiPreferredPresentationStyle(self.preferredPresentationStyle)]; > [itemProvider setTeamData:self.teamData]; > +#endif Why? Comment please. 1438063 7 darin 2018-06-29 18:05:44 -0700 You may be feeling that "a few things have to be off just for now, so I’ll just turn them off knowing I’m coming back here really soon”, but my past experience is that in practice there is lots of code like this many, many years later, so the comments may well be quite valuable. And if not, you can delete them. 1438604 8 343986 megan_gardner 2018-07-02 13:40:56 -0700 Comment on attachment 343986 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=343986&action=review > Source/WebCore/platform/ios/WebItemProviderPasteboard.h:36 > + This is temporary until we switch to NSItemProviders everywhere, which will hopefully be soon. 1438626 9 344134 megan_gardner 2018-07-02 14:13:30 -0700 Created attachment 344134 Patch for landing 1438647 10 344134 commit-queue 2018-07-02 14:52:24 -0700 Comment on attachment 344134 Patch for landing Clearing flags on attachment: 344134 Committed r233436: <https://trac.webkit.org/changeset/233436> 1438648 11 commit-queue 2018-07-02 14:52:25 -0700 All reviewed patches have been landed. Closing bug. 343947 2018-06-29 14:49:40 -0700 2018-06-29 16:44:49 -0700 Patch bug-187194-20180629144939.patch text/plain 7474 megan_gardner U3VidmVyc2lvbiBSZXZpc2lvbjogMjMzMzMxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggM2EzOTQ4MjNlM2RlNTg1 YjlhZDQ3MTg5OTQ0NDU4YmVlY2JiODUyZS4uN2JhNjJiZmEzOTdlNjM3MmJlOTJkZmRlYTEyMjI3 NWUzZjE4NjE4ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2IEBACisyMDE4LTA2LTI5ICBNZWdh biBHYXJkbmVyICA8bWVnYW5fZ2FyZG5lckBhcHBsZS5jb20+CisKKyAgICAgICAgRW5hYmxlIGNv cHkgcGFzdGUgb24gaU9TIGFwcHMgZm9yIE1hYworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTg3MTk0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgRGlmZmljdWx0IHRvIHRlc3QgdGhpcyBwbGF0Zm9ybS4KKwor ICAgICAgICBVSUtpdCBkb2Vzbid0IHN1cHBvcnQgaXRlbVByb3ZpZGVycyBmb3IgaU9TIGFwcHMg Zm9yIE1hYywgc28gd2UgbmVlZCB0byByZXZlcnQgdG8gdGhlCisgICAgICAgIG9sZGVyIHdheSBv ZiBzZXR0aW5nIGEgZGljdGlvbmFyeSBvZiBvYmplY3RzIGFuZCBrZXlzIGZvciBpdGVtcy4gTm90 IGV2ZXJ5dGhpbmcgaXMKKyAgICAgICAgYXZhaWxibGUgaW4gdGhpcyBmb3JtLCBhbmQgd2UgaGF2 ZW4ndCBjbGVhbmVkIHVwIG91ciBpdGVtUHJvdmlkZXIgY29kZSB5ZXQsIHNvIHdlIAorICAgICAg ICBuZWVkIHRvIGNhc2Ugc29tZSB0aGluZ3Mgb3V0IGZvciBub3cuIEhvcGVmdWxseSBpbiB0aGUg ZnV0dXJlLCB0aGlzIHdpbGwgYmUgaW1wbG1lbnRlZAorICAgICAgICBhbmQgY2FuIGp1c3Qgd29y ayBhcyBleHBlY3RlZCwgYnV0IGZvciBub3csIHRoaXMgaXMgdGhlIGJlc3Qgd29ya2Fyb3VuZC4K KworICAgICAgICAqIHBsYXRmb3JtL2lvcy9QbGF0Zm9ybVBhc3RlYm9hcmRJT1MubW06CisgICAg ICAgIChXZWJDb3JlOjpyZWdpc3Rlckl0ZW1Ub1Bhc3RlYm9hcmQpOgorICAgICAgICAoV2ViQ29y ZTo6UGxhdGZvcm1QYXN0ZWJvYXJkOjp3cml0ZSk6CisgICAgICAgIChXZWJDb3JlOjpQbGF0Zm9y bVBhc3RlYm9hcmQ6OnJlYWRVUkwpOgorICAgICAgICAqIHBsYXRmb3JtL2lvcy9XZWJJdGVtUHJv dmlkZXJQYXN0ZWJvYXJkLmg6CisgICAgICAgICogcGxhdGZvcm0vaW9zL1dlYkl0ZW1Qcm92aWRl clBhc3RlYm9hcmQubW06CisgICAgICAgICgtW1dlYkl0ZW1Qcm92aWRlclJlZ2lzdHJhdGlvbklu Zm9MaXN0IGl0ZW1Qcm92aWRlcl0pOgorCiAyMDE4LTA2LTI4ICBUaW1vdGh5IEhhdGNoZXIgIDx0 aW1vdGh5QGFwcGxlLmNvbT4KIAogICAgICAgICBGaW5kIG9uIHBhZ2Ugc2VsZWN0aW9uIGNvbG9y IGlzbid0IGFkYXB0ZWQgZm9yIGRhcmsgbW9kZS4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL2lvcy9QbGF0Zm9ybVBhc3RlYm9hcmRJT1MubW0gYi9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9pb3MvUGxhdGZvcm1QYXN0ZWJvYXJkSU9TLm1tCmluZGV4IDdlZTJhZDk4NTdiMmE1 OTQxYmZlMTdlOGIzMWZlYjkwNWNlZTJiZjIuLjE1Nzc5YjFiYTNhOThjZmZmYWZkMzE0ZjllYTgw M2ZhMWIwNzhiOTkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2lvcy9QbGF0 Zm9ybVBhc3RlYm9hcmRJT1MubW0KKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vaW9zL1Bs YXRmb3JtUGFzdGVib2FyZElPUy5tbQpAQCAtNDUsNyArNDUsNyBAQAogI2ltcG9ydCA8d3RmL1Nv ZnRMaW5raW5nLmg+CiAjaW1wb3J0IDx3dGYvdGV4dC9TdHJpbmdIYXNoLmg+CiAKLSNkZWZpbmUg UEFTVEVCT0FSRF9TVVBQT1JUU19JVEVNX1BST1ZJREVSUyAoUExBVEZPUk0oSU9TKSAmJiAhKFBM QVRGT1JNKFdBVENIT1MpIHx8IFBMQVRGT1JNKEFQUExFVFYpIHx8IEVOQUJMRShNSU5JTUFMX1NJ TVVMQVRPUikpKQorI2RlZmluZSBQQVNURUJPQVJEX1NVUFBPUlRTX0lURU1fUFJPVklERVJTIChQ TEFURk9STShJT1MpICYmICEoUExBVEZPUk0oV0FUQ0hPUykgfHwgUExBVEZPUk0oQVBQTEVUVikp KQogCiBTT0ZUX0xJTktfRlJBTUVXT1JLKFVJS2l0KQogU09GVF9MSU5LX0NMQVNTKFVJS2l0LCBV SUltYWdlKQpAQCAtMjUzLDYgKzI1MywxNCBAQCBzdGF0aWMgTlNTdHJpbmcgKndlYklPU1Bhc3Rl UGJvYXJkVHlwZSA9IEAiaU9TIHJpY2ggY29udGVudCBwYXN0ZSBwYXN0ZWJvYXJkIHR5cAogCiBz dGF0aWMgdm9pZCByZWdpc3Rlckl0ZW1Ub1Bhc3RlYm9hcmQoV2ViSXRlbVByb3ZpZGVyUmVnaXN0 cmF0aW9uSW5mb0xpc3QgKnJlcHJlc2VudGF0aW9uc1RvUmVnaXN0ZXIsIGlkIDxBYnN0cmFjdFBh c3RlYm9hcmQ+IHBhc3RlYm9hcmQpCiB7CisjaWYgRU5BQkxFKE1JTklNQUxfU0lNVUxBVE9SKQor ICAgIGF1dG8gaXRlbURpY3Rpb25hcnkgPSBhZG9wdE5TKFtbTlNNdXRhYmxlRGljdGlvbmFyeSBh bGxvY10gaW5pdF0pOworICAgIFtyZXByZXNlbnRhdGlvbnNUb1JlZ2lzdGVyIGVudW1lcmF0ZUl0 ZW1zOltpdGVtRGljdGlvbmFyeV0gKGlkIDxXZWJJdGVtUHJvdmlkZXJSZWdpc3RyYXI+IGl0ZW0s IE5TVUludGVnZXIpIHsKKyAgICAgICAgaWYgKFtpdGVtIHJlc3BvbmRzVG9TZWxlY3RvcjpAc2Vs ZWN0b3IodHlwZUlkZW50aWZpZXJGb3JDbGllbnQpXSAmJiBbaXRlbSByZXNwb25kc1RvU2VsZWN0 b3I6QHNlbGVjdG9yKGRhdGFGb3JDbGllbnQpXSkKKyAgICAgICAgICAgIFtpdGVtRGljdGlvbmFy eSBzZXRPYmplY3Q6aXRlbS5kYXRhRm9yQ2xpZW50IGZvcktleTppdGVtLnR5cGVJZGVudGlmaWVy Rm9yQ2xpZW50XTsKKyAgICB9XTsKKyAgICBbcGFzdGVib2FyZCBzZXRJdGVtczpAW2l0ZW1EaWN0 aW9uYXJ5LmdldCgpXV07CisjZWxzZQogICAgIGlmIChVSUl0ZW1Qcm92aWRlciAqaXRlbVByb3Zp ZGVyID0gcmVwcmVzZW50YXRpb25zVG9SZWdpc3Rlci5pdGVtUHJvdmlkZXIpCiAgICAgICAgIFtw YXN0ZWJvYXJkIHNldEl0ZW1Qcm92aWRlcnM6QFsgaXRlbVByb3ZpZGVyIF1dOwogICAgIGVsc2UK QEAgLTI2MCw2ICsyNjgsOCBAQCBzdGF0aWMgdm9pZCByZWdpc3Rlckl0ZW1Ub1Bhc3RlYm9hcmQo V2ViSXRlbVByb3ZpZGVyUmVnaXN0cmF0aW9uSW5mb0xpc3QgKnJlcHJlcwogCiAgICAgaWYgKFtw YXN0ZWJvYXJkIHJlc3BvbmRzVG9TZWxlY3RvcjpAc2VsZWN0b3Ioc3RhZ2VSZWdpc3RyYXRpb25M aXN0OildKQogICAgICAgICBbcGFzdGVib2FyZCBzdGFnZVJlZ2lzdHJhdGlvbkxpc3Q6cmVwcmVz ZW50YXRpb25zVG9SZWdpc3Rlcl07CisjZW5kaWYKKyAgICAKIH0KIAogc3RhdGljIHZvaWQgYWRk UmVwcmVzZW50YXRpb25zRm9yUGxhaW5UZXh0KFdlYkl0ZW1Qcm92aWRlclJlZ2lzdHJhdGlvbklu Zm9MaXN0ICppdGVtc1RvUmVnaXN0ZXIsIGNvbnN0IFN0cmluZyYgcGxhaW5UZXh0KQpAQCAtMzUx LDcgKzM2MSw5IEBAIHZvaWQgUGxhdGZvcm1QYXN0ZWJvYXJkOjp3cml0ZShjb25zdCBQYXN0ZWJv YXJkSW1hZ2UmIHBhc3RlYm9hcmRJbWFnZSkKICAgICAvLyB0aGUgVVJMIChpLmUuIHRoZSBhbmNo b3IncyBocmVmIGF0dHJpYnV0ZSkgdG8gYmUgYSBoaWdoZXIgZmlkZWxpdHkgcmVwcmVzZW50YXRp b24uCiAgICAgYXV0byYgcGFzdGVib2FyZFVSTCA9IHBhc3RlYm9hcmRJbWFnZS51cmw7CiAgICAg aWYgKE5TVVJMICpuc1VSTCA9IHBhc3RlYm9hcmRVUkwudXJsKSB7CisjaWYgIUVOQUJMRShNSU5J TUFMX1NJTVVMQVRPUikKICAgICAgICAgbnNVUkwuX3RpdGxlID0gcGFzdGVib2FyZFVSTC50aXRs ZS5pc0VtcHR5KCkgPyB1c2VyVmlzaWJsZVN0cmluZyhwYXN0ZWJvYXJkVVJMLnVybCkgOiAoTlNT dHJpbmcgKilwYXN0ZWJvYXJkVVJMLnRpdGxlOworI2VuZGlmCiAgICAgICAgIFtyZXByZXNlbnRh dGlvbnNUb1JlZ2lzdGVyIGFkZFJlcHJlc2VudGluZ09iamVjdDpuc1VSTF07CiAgICAgfQogCkBA IC0zODEsOCArMzkzLDEwIEBAIHZvaWQgUGxhdGZvcm1QYXN0ZWJvYXJkOjp3cml0ZShjb25zdCBQ YXN0ZWJvYXJkVVJMJiB1cmwpCiAgICAgW3JlcHJlc2VudGF0aW9uc1RvUmVnaXN0ZXIgc2V0UHJl ZmVycmVkUHJlc2VudGF0aW9uU3R5bGU6V2ViUHJlZmVycmVkUHJlc2VudGF0aW9uU3R5bGVJbmxp bmVdOwogCiAgICAgaWYgKE5TVVJMICpuc1VSTCA9IHVybC51cmwpIHsKKyNpZiAhRU5BQkxFKE1J TklNQUxfU0lNVUxBVE9SKQogICAgICAgICBpZiAoIXVybC50aXRsZS5pc0VtcHR5KCkpCiAgICAg ICAgICAgICBuc1VSTC5fdGl0bGUgPSB1cmwudGl0bGU7CisjZW5kaWYKICAgICAgICAgW3JlcHJl c2VudGF0aW9uc1RvUmVnaXN0ZXIgYWRkUmVwcmVzZW50aW5nT2JqZWN0Om5zVVJMXTsKICAgICAg ICAgW3JlcHJlc2VudGF0aW9uc1RvUmVnaXN0ZXIgYWRkUmVwcmVzZW50aW5nT2JqZWN0OihOU1N0 cmluZyAqKXVybC51cmwuc3RyaW5nKCldOwogICAgIH0KQEAgLTYyMyw3ICs2MzcsNyBAQCBVUkwg UGxhdGZvcm1QYXN0ZWJvYXJkOjpyZWFkVVJMKGludCBpbmRleCwgY29uc3QgU3RyaW5nJiB0eXBl LCBTdHJpbmcmIHRpdGxlKQogICAgIGlmICghYWxsb3dSZWFkaW5nVVJMQXRJbmRleCh1cmwsIGlu ZGV4KSkKICAgICAgICAgcmV0dXJuIHsgfTsKIAotI2lmIFBBU1RFQk9BUkRfU1VQUE9SVFNfSVRF TV9QUk9WSURFUlMKKyNpZiBQQVNURUJPQVJEX1NVUFBPUlRTX0lURU1fUFJPVklERVJTICYmICFF TkFCTEUoTUlOSU1BTF9TSU1VTEFUT1IpCiAgICAgdGl0bGUgPSBbdXJsIF90aXRsZV07CiAjZWxz ZQogICAgIFVOVVNFRF9QQVJBTSh0aXRsZSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9pb3MvV2ViSXRlbVByb3ZpZGVyUGFzdGVib2FyZC5oIGIvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vaW9zL1dlYkl0ZW1Qcm92aWRlclBhc3RlYm9hcmQuaAppbmRleCAxYTQ4ZGVkM2Jk YTE1OWIwMjJlYWMxMGZmZDY4MTIxM2YwNjNkZmI3Li5mNTM0MDk4MDYzYmY2MTM1OGU1ODE0NGNm YjM3N2JkMTMwNTY4ZTFjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9pb3Mv V2ViSXRlbVByb3ZpZGVyUGFzdGVib2FyZC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L2lvcy9XZWJJdGVtUHJvdmlkZXJQYXN0ZWJvYXJkLmgKQEAgLTI3LDYgKzI3LDE1IEBACiAKICNp ZiBUQVJHRVRfT1NfSVBIT05FICYmIF9fSVBIT05FX09TX1ZFUlNJT05fTUlOX1JFUVVJUkVEID49 IDExMDAwMAogCisjaWYgRU5BQkxFKE1JTklNQUxfU0lNVUxBVE9SKQorCisjZGVmaW5lIFVJSXRl bVByb3ZpZGVyIE5TSXRlbVByb3ZpZGVyCisjZGVmaW5lIFVJSXRlbVByb3ZpZGVyUmVhZGluZyBO U0l0ZW1Qcm92aWRlclJlYWRpbmcKKyNkZWZpbmUgVUlJdGVtUHJvdmlkZXJXcml0aW5nIE5TSXRl bVByb3ZpZGVyV3JpdGluZworI2RlZmluZSBVSUl0ZW1Qcm92aWRlclJlcHJlc2VudGF0aW9uT3B0 aW9uc1Zpc2liaWxpdHlBbGwgTlNJdGVtUHJvdmlkZXJSZXByZXNlbnRhdGlvblZpc2liaWxpdHlB bGwKKworI2VuZGlmCisKIEBjbGFzcyBVSUl0ZW1Qcm92aWRlcjsKIEBwcm90b2NvbCBVSUl0ZW1Q cm92aWRlcldyaXRpbmc7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2lv cy9XZWJJdGVtUHJvdmlkZXJQYXN0ZWJvYXJkLm1tIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v aW9zL1dlYkl0ZW1Qcm92aWRlclBhc3RlYm9hcmQubW0KaW5kZXggMzMyZGVhZDYyNGY1ZGJmNTZk MWZkMzcxODcxZmE5MDllZmRkNjhkZS4uOTIyNzAxZjY4OWE2N2NiZDVkNDNkM2I3OTk1OTM2NDdl NjczNzA1YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vaW9zL1dlYkl0ZW1Q cm92aWRlclBhc3RlYm9hcmQubW0KKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vaW9zL1dl Ykl0ZW1Qcm92aWRlclBhc3RlYm9hcmQubW0KQEAgLTI2LDcgKzI2LDcgQEAKICNpbmNsdWRlICJj b25maWcuaCIKICNpbXBvcnQgIldlYkl0ZW1Qcm92aWRlclBhc3RlYm9hcmQuaCIKIAotI2lmIEVO QUJMRShEQVRBX0lOVEVSQUNUSU9OKQorI2lmIEVOQUJMRShEQVRBX0lOVEVSQUNUSU9OKSB8fCBF TkFCTEUoTUlOSU1BTF9TSU1VTEFUT1IpCiAKICNpbXBvcnQgPEZvdW5kYXRpb24vTlNJdGVtUHJv dmlkZXIuaD4KICNpbXBvcnQgPEZvdW5kYXRpb24vTlNQcm9ncmVzcy5oPgpAQCAtMjU2LDYgKzI1 Niw3IEBAIHVzaW5nIFdlYkNvcmU6OlBhc3RlYm9hcmRDdXN0b21EYXRhOwogICAgICAgICBibG9j ayhbc2VsZiBpdGVtQXRJbmRleDppbmRleF0sIGluZGV4KTsKIH0KIAorI2lmICFFTkFCTEUoTUlO SU1BTF9TSU1VTEFUT1IpCiBzdGF0aWMgVUlQcmVmZXJyZWRQcmVzZW50YXRpb25TdHlsZSB1aVBy ZWZlcnJlZFByZXNlbnRhdGlvblN0eWxlKFdlYlByZWZlcnJlZFByZXNlbnRhdGlvblN0eWxlIHN0 eWxlKQogewogICAgIHN3aXRjaCAoc3R5bGUpIHsKQEAgLTI3MCw2ICsyNzEsNyBAQCBzdGF0aWMg VUlQcmVmZXJyZWRQcmVzZW50YXRpb25TdHlsZSB1aVByZWZlcnJlZFByZXNlbnRhdGlvblN0eWxl KFdlYlByZWZlcnJlZFByZQogICAgICAgICByZXR1cm4gVUlQcmVmZXJyZWRQcmVzZW50YXRpb25T dHlsZVVuc3BlY2lmaWVkOwogICAgIH0KIH0KKyNlbmRpZgogCiAtIChVSUl0ZW1Qcm92aWRlciAq KWl0ZW1Qcm92aWRlcgogewpAQCAtMjc5LDEwICsyODEsMTIgQEAgc3RhdGljIFVJUHJlZmVycmVk UHJlc2VudGF0aW9uU3R5bGUgdWlQcmVmZXJyZWRQcmVzZW50YXRpb25TdHlsZShXZWJQcmVmZXJy ZWRQcmUKICAgICBhdXRvIGl0ZW1Qcm92aWRlciA9IGFkb3B0TlMoW2FsbG9jVUlJdGVtUHJvdmlk ZXJJbnN0YW5jZSgpIGluaXRdKTsKICAgICBmb3IgKGlkIDxXZWJJdGVtUHJvdmlkZXJSZWdpc3Ry YXI+IHJlcHJlc2VudGF0aW9uIGluIF9yZXByZXNlbnRhdGlvbnMuZ2V0KCkpCiAgICAgICAgIFty ZXByZXNlbnRhdGlvbiByZWdpc3Rlckl0ZW1Qcm92aWRlcjppdGVtUHJvdmlkZXIuZ2V0KCldOwot ICAgIFtpdGVtUHJvdmlkZXIgc2V0UHJlZmVycmVkUHJlc2VudGF0aW9uU2l6ZTpzZWxmLnByZWZl cnJlZFByZXNlbnRhdGlvblNpemVdOwogICAgIFtpdGVtUHJvdmlkZXIgc2V0U3VnZ2VzdGVkTmFt ZTpzZWxmLnN1Z2dlc3RlZE5hbWVdOworI2lmICFFTkFCTEUoTUlOSU1BTF9TSU1VTEFUT1IpCisg ICAgW2l0ZW1Qcm92aWRlciBzZXRQcmVmZXJyZWRQcmVzZW50YXRpb25TaXplOnNlbGYucHJlZmVy cmVkUHJlc2VudGF0aW9uU2l6ZV07CiAgICAgW2l0ZW1Qcm92aWRlciBzZXRQcmVmZXJyZWRQcmVz ZW50YXRpb25TdHlsZTp1aVByZWZlcnJlZFByZXNlbnRhdGlvblN0eWxlKHNlbGYucHJlZmVycmVk UHJlc2VudGF0aW9uU3R5bGUpXTsKICAgICBbaXRlbVByb3ZpZGVyIHNldFRlYW1EYXRhOnNlbGYu dGVhbURhdGFdOworI2VuZGlmCiAgICAgcmV0dXJuIGl0ZW1Qcm92aWRlci5hdXRvcmVsZWFzZSgp OwogfQogCg== 343969 2018-06-29 16:44:50 -0700 2018-06-29 17:48:06 -0700 Patch bug-187194-20180629164449.patch text/plain 7712 megan_gardner U3VidmVyc2lvbiBSZXZpc2lvbjogMjMzMzMxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggM2EzOTQ4MjNlM2RlNTg1 YjlhZDQ3MTg5OTQ0NDU4YmVlY2JiODUyZS4uODFkY2IwNGM3NWEyOGYzN2JmZjljOTg2MzQ5Yjk4 Y2JhZDMzOTkzYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3IEBACisyMDE4LTA2LTI5ICBNZWdh biBHYXJkbmVyICA8bWVnYW5fZ2FyZG5lckBhcHBsZS5jb20+CisKKyAgICAgICAgRW5hYmxlIGNv cHkgcGFzdGUgb24gaU9TIGFwcHMgZm9yIE1hYworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTg3MTk0CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS80MTQ1 MTE0OD4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBE aWZmaWN1bHQgdG8gdGVzdCB0aGlzIHBsYXRmb3JtLgorCisgICAgICAgIFVJS2l0IGRvZXNuJ3Qg c3VwcG9ydCBpdGVtUHJvdmlkZXJzIGZvciBpT1MgYXBwcyBmb3IgTWFjLCBzbyB3ZSBuZWVkIHRv IHJldmVydCB0byB0aGUKKyAgICAgICAgb2xkZXIgd2F5IG9mIHNldHRpbmcgYSBkaWN0aW9uYXJ5 IG9mIG9iamVjdHMgYW5kIGtleXMgZm9yIGl0ZW1zLiBOb3QgZXZlcnl0aGluZyBpcworICAgICAg ICBhdmFpbGJsZSBpbiB0aGlzIGZvcm0sIGFuZCB3ZSBoYXZlbid0IGNsZWFuZWQgdXAgb3VyIGl0 ZW1Qcm92aWRlciBjb2RlIHlldCwgc28gd2UgCisgICAgICAgIG5lZWQgdG8gY2FzZSBzb21lIHRo aW5ncyBvdXQgZm9yIG5vdy4gSG9wZWZ1bGx5IGluIHRoZSBmdXR1cmUsIHRoaXMgd2lsbCBiZSBp bXBsbWVudGVkCisgICAgICAgIGFuZCBjYW4ganVzdCB3b3JrIGFzIGV4cGVjdGVkLCBidXQgZm9y IG5vdywgdGhpcyBpcyB0aGUgYmVzdCB3b3JrYXJvdW5kLgorCisgICAgICAgICogcGxhdGZvcm0v aW9zL1BsYXRmb3JtUGFzdGVib2FyZElPUy5tbToKKyAgICAgICAgKFdlYkNvcmU6OnJlZ2lzdGVy SXRlbVRvUGFzdGVib2FyZCk6CisgICAgICAgIChXZWJDb3JlOjpQbGF0Zm9ybVBhc3RlYm9hcmQ6 OndyaXRlKToKKyAgICAgICAgKFdlYkNvcmU6OlBsYXRmb3JtUGFzdGVib2FyZDo6cmVhZFVSTCk6 CisgICAgICAgICogcGxhdGZvcm0vaW9zL1dlYkl0ZW1Qcm92aWRlclBhc3RlYm9hcmQuaDoKKyAg ICAgICAgKiBwbGF0Zm9ybS9pb3MvV2ViSXRlbVByb3ZpZGVyUGFzdGVib2FyZC5tbToKKyAgICAg ICAgKC1bV2ViSXRlbVByb3ZpZGVyUmVnaXN0cmF0aW9uSW5mb0xpc3QgaXRlbVByb3ZpZGVyXSk6 CisKIDIwMTgtMDYtMjggIFRpbW90aHkgSGF0Y2hlciAgPHRpbW90aHlAYXBwbGUuY29tPgogCiAg ICAgICAgIEZpbmQgb24gcGFnZSBzZWxlY3Rpb24gY29sb3IgaXNuJ3QgYWRhcHRlZCBmb3IgZGFy ayBtb2RlLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vaW9zL1BsYXRmb3Jt UGFzdGVib2FyZElPUy5tbSBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2lvcy9QbGF0Zm9ybVBh c3RlYm9hcmRJT1MubW0KaW5kZXggN2VlMmFkOTg1N2IyYTU5NDFiZmUxN2U4YjMxZmViOTA1Y2Vl MmJmMi4uMTU3NzliMWJhM2E5OGNmZmZhZmQzMTRmOWVhODAzZmExYjA3OGI5OSAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vaW9zL1BsYXRmb3JtUGFzdGVib2FyZElPUy5tbQor KysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9pb3MvUGxhdGZvcm1QYXN0ZWJvYXJkSU9TLm1t CkBAIC00NSw3ICs0NSw3IEBACiAjaW1wb3J0IDx3dGYvU29mdExpbmtpbmcuaD4KICNpbXBvcnQg PHd0Zi90ZXh0L1N0cmluZ0hhc2guaD4KIAotI2RlZmluZSBQQVNURUJPQVJEX1NVUFBPUlRTX0lU RU1fUFJPVklERVJTIChQTEFURk9STShJT1MpICYmICEoUExBVEZPUk0oV0FUQ0hPUykgfHwgUExB VEZPUk0oQVBQTEVUVikgfHwgRU5BQkxFKE1JTklNQUxfU0lNVUxBVE9SKSkpCisjZGVmaW5lIFBB U1RFQk9BUkRfU1VQUE9SVFNfSVRFTV9QUk9WSURFUlMgKFBMQVRGT1JNKElPUykgJiYgIShQTEFU Rk9STShXQVRDSE9TKSB8fCBQTEFURk9STShBUFBMRVRWKSkpCiAKIFNPRlRfTElOS19GUkFNRVdP UksoVUlLaXQpCiBTT0ZUX0xJTktfQ0xBU1MoVUlLaXQsIFVJSW1hZ2UpCkBAIC0yNTMsNiArMjUz LDE0IEBAIHN0YXRpYyBOU1N0cmluZyAqd2ViSU9TUGFzdGVQYm9hcmRUeXBlID0gQCJpT1Mgcmlj aCBjb250ZW50IHBhc3RlIHBhc3RlYm9hcmQgdHlwCiAKIHN0YXRpYyB2b2lkIHJlZ2lzdGVySXRl bVRvUGFzdGVib2FyZChXZWJJdGVtUHJvdmlkZXJSZWdpc3RyYXRpb25JbmZvTGlzdCAqcmVwcmVz ZW50YXRpb25zVG9SZWdpc3RlciwgaWQgPEFic3RyYWN0UGFzdGVib2FyZD4gcGFzdGVib2FyZCkK IHsKKyNpZiBFTkFCTEUoTUlOSU1BTF9TSU1VTEFUT1IpCisgICAgYXV0byBpdGVtRGljdGlvbmFy eSA9IGFkb3B0TlMoW1tOU011dGFibGVEaWN0aW9uYXJ5IGFsbG9jXSBpbml0XSk7CisgICAgW3Jl cHJlc2VudGF0aW9uc1RvUmVnaXN0ZXIgZW51bWVyYXRlSXRlbXM6W2l0ZW1EaWN0aW9uYXJ5XSAo aWQgPFdlYkl0ZW1Qcm92aWRlclJlZ2lzdHJhcj4gaXRlbSwgTlNVSW50ZWdlcikgeworICAgICAg ICBpZiAoW2l0ZW0gcmVzcG9uZHNUb1NlbGVjdG9yOkBzZWxlY3Rvcih0eXBlSWRlbnRpZmllckZv ckNsaWVudCldICYmIFtpdGVtIHJlc3BvbmRzVG9TZWxlY3RvcjpAc2VsZWN0b3IoZGF0YUZvckNs aWVudCldKQorICAgICAgICAgICAgW2l0ZW1EaWN0aW9uYXJ5IHNldE9iamVjdDppdGVtLmRhdGFG b3JDbGllbnQgZm9yS2V5Oml0ZW0udHlwZUlkZW50aWZpZXJGb3JDbGllbnRdOworICAgIH1dOwor ICAgIFtwYXN0ZWJvYXJkIHNldEl0ZW1zOkBbaXRlbURpY3Rpb25hcnkuZ2V0KCldXTsKKyNlbHNl CiAgICAgaWYgKFVJSXRlbVByb3ZpZGVyICppdGVtUHJvdmlkZXIgPSByZXByZXNlbnRhdGlvbnNU b1JlZ2lzdGVyLml0ZW1Qcm92aWRlcikKICAgICAgICAgW3Bhc3RlYm9hcmQgc2V0SXRlbVByb3Zp ZGVyczpAWyBpdGVtUHJvdmlkZXIgXV07CiAgICAgZWxzZQpAQCAtMjYwLDYgKzI2OCw4IEBAIHN0 YXRpYyB2b2lkIHJlZ2lzdGVySXRlbVRvUGFzdGVib2FyZChXZWJJdGVtUHJvdmlkZXJSZWdpc3Ry YXRpb25JbmZvTGlzdCAqcmVwcmVzCiAKICAgICBpZiAoW3Bhc3RlYm9hcmQgcmVzcG9uZHNUb1Nl bGVjdG9yOkBzZWxlY3RvcihzdGFnZVJlZ2lzdHJhdGlvbkxpc3Q6KV0pCiAgICAgICAgIFtwYXN0 ZWJvYXJkIHN0YWdlUmVnaXN0cmF0aW9uTGlzdDpyZXByZXNlbnRhdGlvbnNUb1JlZ2lzdGVyXTsK KyNlbmRpZgorICAgIAogfQogCiBzdGF0aWMgdm9pZCBhZGRSZXByZXNlbnRhdGlvbnNGb3JQbGFp blRleHQoV2ViSXRlbVByb3ZpZGVyUmVnaXN0cmF0aW9uSW5mb0xpc3QgKml0ZW1zVG9SZWdpc3Rl ciwgY29uc3QgU3RyaW5nJiBwbGFpblRleHQpCkBAIC0zNTEsNyArMzYxLDkgQEAgdm9pZCBQbGF0 Zm9ybVBhc3RlYm9hcmQ6OndyaXRlKGNvbnN0IFBhc3RlYm9hcmRJbWFnZSYgcGFzdGVib2FyZElt YWdlKQogICAgIC8vIHRoZSBVUkwgKGkuZS4gdGhlIGFuY2hvcidzIGhyZWYgYXR0cmlidXRlKSB0 byBiZSBhIGhpZ2hlciBmaWRlbGl0eSByZXByZXNlbnRhdGlvbi4KICAgICBhdXRvJiBwYXN0ZWJv YXJkVVJMID0gcGFzdGVib2FyZEltYWdlLnVybDsKICAgICBpZiAoTlNVUkwgKm5zVVJMID0gcGFz dGVib2FyZFVSTC51cmwpIHsKKyNpZiAhRU5BQkxFKE1JTklNQUxfU0lNVUxBVE9SKQogICAgICAg ICBuc1VSTC5fdGl0bGUgPSBwYXN0ZWJvYXJkVVJMLnRpdGxlLmlzRW1wdHkoKSA/IHVzZXJWaXNp YmxlU3RyaW5nKHBhc3RlYm9hcmRVUkwudXJsKSA6IChOU1N0cmluZyAqKXBhc3RlYm9hcmRVUkwu dGl0bGU7CisjZW5kaWYKICAgICAgICAgW3JlcHJlc2VudGF0aW9uc1RvUmVnaXN0ZXIgYWRkUmVw cmVzZW50aW5nT2JqZWN0Om5zVVJMXTsKICAgICB9CiAKQEAgLTM4MSw4ICszOTMsMTAgQEAgdm9p ZCBQbGF0Zm9ybVBhc3RlYm9hcmQ6OndyaXRlKGNvbnN0IFBhc3RlYm9hcmRVUkwmIHVybCkKICAg ICBbcmVwcmVzZW50YXRpb25zVG9SZWdpc3RlciBzZXRQcmVmZXJyZWRQcmVzZW50YXRpb25TdHls ZTpXZWJQcmVmZXJyZWRQcmVzZW50YXRpb25TdHlsZUlubGluZV07CiAKICAgICBpZiAoTlNVUkwg Km5zVVJMID0gdXJsLnVybCkgeworI2lmICFFTkFCTEUoTUlOSU1BTF9TSU1VTEFUT1IpCiAgICAg ICAgIGlmICghdXJsLnRpdGxlLmlzRW1wdHkoKSkKICAgICAgICAgICAgIG5zVVJMLl90aXRsZSA9 IHVybC50aXRsZTsKKyNlbmRpZgogICAgICAgICBbcmVwcmVzZW50YXRpb25zVG9SZWdpc3RlciBh ZGRSZXByZXNlbnRpbmdPYmplY3Q6bnNVUkxdOwogICAgICAgICBbcmVwcmVzZW50YXRpb25zVG9S ZWdpc3RlciBhZGRSZXByZXNlbnRpbmdPYmplY3Q6KE5TU3RyaW5nICopdXJsLnVybC5zdHJpbmco KV07CiAgICAgfQpAQCAtNjIzLDcgKzYzNyw3IEBAIFVSTCBQbGF0Zm9ybVBhc3RlYm9hcmQ6OnJl YWRVUkwoaW50IGluZGV4LCBjb25zdCBTdHJpbmcmIHR5cGUsIFN0cmluZyYgdGl0bGUpCiAgICAg aWYgKCFhbGxvd1JlYWRpbmdVUkxBdEluZGV4KHVybCwgaW5kZXgpKQogICAgICAgICByZXR1cm4g eyB9OwogCi0jaWYgUEFTVEVCT0FSRF9TVVBQT1JUU19JVEVNX1BST1ZJREVSUworI2lmIFBBU1RF Qk9BUkRfU1VQUE9SVFNfSVRFTV9QUk9WSURFUlMgJiYgIUVOQUJMRShNSU5JTUFMX1NJTVVMQVRP UikKICAgICB0aXRsZSA9IFt1cmwgX3RpdGxlXTsKICNlbHNlCiAgICAgVU5VU0VEX1BBUkFNKHRp dGxlKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2lvcy9XZWJJdGVtUHJv dmlkZXJQYXN0ZWJvYXJkLmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9pb3MvV2ViSXRlbVBy b3ZpZGVyUGFzdGVib2FyZC5oCmluZGV4IDFhNDhkZWQzYmRhMTU5YjAyMmVhYzEwZmZkNjgxMjEz ZjA2M2RmYjcuLjRmN2ZjNmNkNGNkYzU1ZDUyOTVlYWZjM2IwM2NkNDdmZmJiMjc4MjggMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2lvcy9XZWJJdGVtUHJvdmlkZXJQYXN0ZWJv YXJkLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vaW9zL1dlYkl0ZW1Qcm92aWRlclBh c3RlYm9hcmQuaApAQCAtMjcsNiArMjcsMTUgQEAKIAogI2lmIFRBUkdFVF9PU19JUEhPTkUgJiYg X19JUEhPTkVfT1NfVkVSU0lPTl9NSU5fUkVRVUlSRUQgPj0gMTEwMDAwCiAKKyNpZiBUQVJHRVRf T1NfSU9TTUFDCisKKyNkZWZpbmUgVUlJdGVtUHJvdmlkZXIgTlNJdGVtUHJvdmlkZXIKKyNkZWZp bmUgVUlJdGVtUHJvdmlkZXJSZWFkaW5nIE5TSXRlbVByb3ZpZGVyUmVhZGluZworI2RlZmluZSBV SUl0ZW1Qcm92aWRlcldyaXRpbmcgTlNJdGVtUHJvdmlkZXJXcml0aW5nCisjZGVmaW5lIFVJSXRl bVByb3ZpZGVyUmVwcmVzZW50YXRpb25PcHRpb25zVmlzaWJpbGl0eUFsbCBOU0l0ZW1Qcm92aWRl clJlcHJlc2VudGF0aW9uVmlzaWJpbGl0eUFsbAorCisjZW5kaWYKKwogQGNsYXNzIFVJSXRlbVBy b3ZpZGVyOwogQHByb3RvY29sIFVJSXRlbVByb3ZpZGVyV3JpdGluZzsKIApkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vaW9zL1dlYkl0ZW1Qcm92aWRlclBhc3RlYm9hcmQubW0g Yi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9pb3MvV2ViSXRlbVByb3ZpZGVyUGFzdGVib2FyZC5t bQppbmRleCAzMzJkZWFkNjI0ZjVkYmY1NmQxZmQzNzE4NzFmYTkwOWVmZGQ2OGRlLi41ZWI0Y2Rk YjNmZTMyM2MwYjM4OThhNDFiM2Y4NzM4NTI5OWNhNTE5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9pb3MvV2ViSXRlbVByb3ZpZGVyUGFzdGVib2FyZC5tbQorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9pb3MvV2ViSXRlbVByb3ZpZGVyUGFzdGVib2FyZC5tbQpAQCAt MjYsNyArMjYsNyBAQAogI2luY2x1ZGUgImNvbmZpZy5oIgogI2ltcG9ydCAiV2ViSXRlbVByb3Zp ZGVyUGFzdGVib2FyZC5oIgogCi0jaWYgRU5BQkxFKERBVEFfSU5URVJBQ1RJT04pCisjaWYgRU5B QkxFKERBVEFfSU5URVJBQ1RJT04pIHx8IEVOQUJMRShNSU5JTUFMX1NJTVVMQVRPUikKIAogI2lt cG9ydCA8Rm91bmRhdGlvbi9OU0l0ZW1Qcm92aWRlci5oPgogI2ltcG9ydCA8Rm91bmRhdGlvbi9O U1Byb2dyZXNzLmg+CkBAIC0yNTYsNiArMjU2LDcgQEAgdXNpbmcgV2ViQ29yZTo6UGFzdGVib2Fy ZEN1c3RvbURhdGE7CiAgICAgICAgIGJsb2NrKFtzZWxmIGl0ZW1BdEluZGV4OmluZGV4XSwgaW5k ZXgpOwogfQogCisjaWYgIUVOQUJMRShNSU5JTUFMX1NJTVVMQVRPUikKIHN0YXRpYyBVSVByZWZl cnJlZFByZXNlbnRhdGlvblN0eWxlIHVpUHJlZmVycmVkUHJlc2VudGF0aW9uU3R5bGUoV2ViUHJl ZmVycmVkUHJlc2VudGF0aW9uU3R5bGUgc3R5bGUpCiB7CiAgICAgc3dpdGNoIChzdHlsZSkgewpA QCAtMjcwLDYgKzI3MSw3IEBAIHN0YXRpYyBVSVByZWZlcnJlZFByZXNlbnRhdGlvblN0eWxlIHVp UHJlZmVycmVkUHJlc2VudGF0aW9uU3R5bGUoV2ViUHJlZmVycmVkUHJlCiAgICAgICAgIHJldHVy biBVSVByZWZlcnJlZFByZXNlbnRhdGlvblN0eWxlVW5zcGVjaWZpZWQ7CiAgICAgfQogfQorI2Vu ZGlmCiAKIC0gKFVJSXRlbVByb3ZpZGVyICopaXRlbVByb3ZpZGVyCiB7CkBAIC0yNzksMTAgKzI4 MSwxMiBAQCBzdGF0aWMgVUlQcmVmZXJyZWRQcmVzZW50YXRpb25TdHlsZSB1aVByZWZlcnJlZFBy ZXNlbnRhdGlvblN0eWxlKFdlYlByZWZlcnJlZFByZQogICAgIGF1dG8gaXRlbVByb3ZpZGVyID0g YWRvcHROUyhbYWxsb2NVSUl0ZW1Qcm92aWRlckluc3RhbmNlKCkgaW5pdF0pOwogICAgIGZvciAo aWQgPFdlYkl0ZW1Qcm92aWRlclJlZ2lzdHJhcj4gcmVwcmVzZW50YXRpb24gaW4gX3JlcHJlc2Vu dGF0aW9ucy5nZXQoKSkKICAgICAgICAgW3JlcHJlc2VudGF0aW9uIHJlZ2lzdGVySXRlbVByb3Zp ZGVyOml0ZW1Qcm92aWRlci5nZXQoKV07Ci0gICAgW2l0ZW1Qcm92aWRlciBzZXRQcmVmZXJyZWRQ cmVzZW50YXRpb25TaXplOnNlbGYucHJlZmVycmVkUHJlc2VudGF0aW9uU2l6ZV07CiAgICAgW2l0 ZW1Qcm92aWRlciBzZXRTdWdnZXN0ZWROYW1lOnNlbGYuc3VnZ2VzdGVkTmFtZV07CisjaWYgIUVO QUJMRShNSU5JTUFMX1NJTVVMQVRPUikKKyAgICBbaXRlbVByb3ZpZGVyIHNldFByZWZlcnJlZFBy ZXNlbnRhdGlvblNpemU6c2VsZi5wcmVmZXJyZWRQcmVzZW50YXRpb25TaXplXTsKICAgICBbaXRl bVByb3ZpZGVyIHNldFByZWZlcnJlZFByZXNlbnRhdGlvblN0eWxlOnVpUHJlZmVycmVkUHJlc2Vu dGF0aW9uU3R5bGUoc2VsZi5wcmVmZXJyZWRQcmVzZW50YXRpb25TdHlsZSldOwogICAgIFtpdGVt UHJvdmlkZXIgc2V0VGVhbURhdGE6c2VsZi50ZWFtRGF0YV07CisjZW5kaWYKICAgICByZXR1cm4g aXRlbVByb3ZpZGVyLmF1dG9yZWxlYXNlKCk7CiB9CiAKQEAgLTgzMiw0ICs4MzYsNCBAQCBzdGF0 aWMgTlNVUkwgKmxpbmtUZW1wb3JhcnlJdGVtUHJvdmlkZXJGaWxlc1RvRHJvcFN0YWdpbmdEaXJl Y3RvcnkoTlNVUkwgKnVybCwgTgogCiBAZW5kCiAKLSNlbmRpZiAvLyBFTkFCTEUoREFUQV9JTlRF UkFDVElPTikKKyNlbmRpZiAvLyBFTkFCTEUoREFUQV9JTlRFUkFDVElPTikgfHwgRU5BQkxFKE1J TklNQUxfU0lNVUxBVE9SKQo= 343986 2018-06-29 17:48:07 -0700 2018-07-02 14:13:28 -0700 Patch bug-187194-20180629174806.patch text/plain 7741 megan_gardner U3VidmVyc2lvbiBSZXZpc2lvbjogMjMzMzMxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggM2EzOTQ4MjNlM2RlNTg1 YjlhZDQ3MTg5OTQ0NDU4YmVlY2JiODUyZS4uODFkY2IwNGM3NWEyOGYzN2JmZjljOTg2MzQ5Yjk4 Y2JhZDMzOTkzYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3IEBACisyMDE4LTA2LTI5ICBNZWdh biBHYXJkbmVyICA8bWVnYW5fZ2FyZG5lckBhcHBsZS5jb20+CisKKyAgICAgICAgRW5hYmxlIGNv cHkgcGFzdGUgb24gaU9TIGFwcHMgZm9yIE1hYworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTg3MTk0CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS80MTQ1 MTE0OD4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBE aWZmaWN1bHQgdG8gdGVzdCB0aGlzIHBsYXRmb3JtLgorCisgICAgICAgIFVJS2l0IGRvZXNuJ3Qg c3VwcG9ydCBpdGVtUHJvdmlkZXJzIGZvciBpT1MgYXBwcyBmb3IgTWFjLCBzbyB3ZSBuZWVkIHRv IHJldmVydCB0byB0aGUKKyAgICAgICAgb2xkZXIgd2F5IG9mIHNldHRpbmcgYSBkaWN0aW9uYXJ5 IG9mIG9iamVjdHMgYW5kIGtleXMgZm9yIGl0ZW1zLiBOb3QgZXZlcnl0aGluZyBpcworICAgICAg ICBhdmFpbGJsZSBpbiB0aGlzIGZvcm0sIGFuZCB3ZSBoYXZlbid0IGNsZWFuZWQgdXAgb3VyIGl0 ZW1Qcm92aWRlciBjb2RlIHlldCwgc28gd2UgCisgICAgICAgIG5lZWQgdG8gY2FzZSBzb21lIHRo aW5ncyBvdXQgZm9yIG5vdy4gSG9wZWZ1bGx5IGluIHRoZSBmdXR1cmUsIHRoaXMgd2lsbCBiZSBp bXBsbWVudGVkCisgICAgICAgIGFuZCBjYW4ganVzdCB3b3JrIGFzIGV4cGVjdGVkLCBidXQgZm9y IG5vdywgdGhpcyBpcyB0aGUgYmVzdCB3b3JrYXJvdW5kLgorCisgICAgICAgICogcGxhdGZvcm0v aW9zL1BsYXRmb3JtUGFzdGVib2FyZElPUy5tbToKKyAgICAgICAgKFdlYkNvcmU6OnJlZ2lzdGVy SXRlbVRvUGFzdGVib2FyZCk6CisgICAgICAgIChXZWJDb3JlOjpQbGF0Zm9ybVBhc3RlYm9hcmQ6 OndyaXRlKToKKyAgICAgICAgKFdlYkNvcmU6OlBsYXRmb3JtUGFzdGVib2FyZDo6cmVhZFVSTCk6 CisgICAgICAgICogcGxhdGZvcm0vaW9zL1dlYkl0ZW1Qcm92aWRlclBhc3RlYm9hcmQuaDoKKyAg ICAgICAgKiBwbGF0Zm9ybS9pb3MvV2ViSXRlbVByb3ZpZGVyUGFzdGVib2FyZC5tbToKKyAgICAg ICAgKC1bV2ViSXRlbVByb3ZpZGVyUmVnaXN0cmF0aW9uSW5mb0xpc3QgaXRlbVByb3ZpZGVyXSk6 CisKIDIwMTgtMDYtMjggIFRpbW90aHkgSGF0Y2hlciAgPHRpbW90aHlAYXBwbGUuY29tPgogCiAg ICAgICAgIEZpbmQgb24gcGFnZSBzZWxlY3Rpb24gY29sb3IgaXNuJ3QgYWRhcHRlZCBmb3IgZGFy ayBtb2RlLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vaW9zL1BsYXRmb3Jt UGFzdGVib2FyZElPUy5tbSBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2lvcy9QbGF0Zm9ybVBh c3RlYm9hcmRJT1MubW0KaW5kZXggN2VlMmFkOTg1N2IyYTU5NDFiZmUxN2U4YjMxZmViOTA1Y2Vl MmJmMi4uMTU3NzliMWJhM2E5OGNmZmZhZmQzMTRmOWVhODAzZmExYjA3OGI5OSAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vaW9zL1BsYXRmb3JtUGFzdGVib2FyZElPUy5tbQor KysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9pb3MvUGxhdGZvcm1QYXN0ZWJvYXJkSU9TLm1t CkBAIC00NSw3ICs0NSw3IEBACiAjaW1wb3J0IDx3dGYvU29mdExpbmtpbmcuaD4KICNpbXBvcnQg PHd0Zi90ZXh0L1N0cmluZ0hhc2guaD4KIAotI2RlZmluZSBQQVNURUJPQVJEX1NVUFBPUlRTX0lU RU1fUFJPVklERVJTIChQTEFURk9STShJT1MpICYmICEoUExBVEZPUk0oV0FUQ0hPUykgfHwgUExB VEZPUk0oQVBQTEVUVikgfHwgRU5BQkxFKE1JTklNQUxfU0lNVUxBVE9SKSkpCisjZGVmaW5lIFBB U1RFQk9BUkRfU1VQUE9SVFNfSVRFTV9QUk9WSURFUlMgKFBMQVRGT1JNKElPUykgJiYgIShQTEFU Rk9STShXQVRDSE9TKSB8fCBQTEFURk9STShBUFBMRVRWKSkpCiAKIFNPRlRfTElOS19GUkFNRVdP UksoVUlLaXQpCiBTT0ZUX0xJTktfQ0xBU1MoVUlLaXQsIFVJSW1hZ2UpCkBAIC0yNTMsNiArMjUz LDE0IEBAIHN0YXRpYyBOU1N0cmluZyAqd2ViSU9TUGFzdGVQYm9hcmRUeXBlID0gQCJpT1Mgcmlj aCBjb250ZW50IHBhc3RlIHBhc3RlYm9hcmQgdHlwCiAKIHN0YXRpYyB2b2lkIHJlZ2lzdGVySXRl bVRvUGFzdGVib2FyZChXZWJJdGVtUHJvdmlkZXJSZWdpc3RyYXRpb25JbmZvTGlzdCAqcmVwcmVz ZW50YXRpb25zVG9SZWdpc3RlciwgaWQgPEFic3RyYWN0UGFzdGVib2FyZD4gcGFzdGVib2FyZCkK IHsKKyNpZiBFTkFCTEUoTUlOSU1BTF9TSU1VTEFUT1IpCisgICAgYXV0byBpdGVtRGljdGlvbmFy eSA9IGFkb3B0TlMoW1tOU011dGFibGVEaWN0aW9uYXJ5IGFsbG9jXSBpbml0XSk7CisgICAgW3Jl cHJlc2VudGF0aW9uc1RvUmVnaXN0ZXIgZW51bWVyYXRlSXRlbXM6W2l0ZW1EaWN0aW9uYXJ5XSAo aWQgPFdlYkl0ZW1Qcm92aWRlclJlZ2lzdHJhcj4gaXRlbSwgTlNVSW50ZWdlcikgeworICAgICAg ICBpZiAoW2l0ZW0gcmVzcG9uZHNUb1NlbGVjdG9yOkBzZWxlY3Rvcih0eXBlSWRlbnRpZmllckZv ckNsaWVudCldICYmIFtpdGVtIHJlc3BvbmRzVG9TZWxlY3RvcjpAc2VsZWN0b3IoZGF0YUZvckNs aWVudCldKQorICAgICAgICAgICAgW2l0ZW1EaWN0aW9uYXJ5IHNldE9iamVjdDppdGVtLmRhdGFG b3JDbGllbnQgZm9yS2V5Oml0ZW0udHlwZUlkZW50aWZpZXJGb3JDbGllbnRdOworICAgIH1dOwor ICAgIFtwYXN0ZWJvYXJkIHNldEl0ZW1zOkBbaXRlbURpY3Rpb25hcnkuZ2V0KCldXTsKKyNlbHNl CiAgICAgaWYgKFVJSXRlbVByb3ZpZGVyICppdGVtUHJvdmlkZXIgPSByZXByZXNlbnRhdGlvbnNU b1JlZ2lzdGVyLml0ZW1Qcm92aWRlcikKICAgICAgICAgW3Bhc3RlYm9hcmQgc2V0SXRlbVByb3Zp ZGVyczpAWyBpdGVtUHJvdmlkZXIgXV07CiAgICAgZWxzZQpAQCAtMjYwLDYgKzI2OCw4IEBAIHN0 YXRpYyB2b2lkIHJlZ2lzdGVySXRlbVRvUGFzdGVib2FyZChXZWJJdGVtUHJvdmlkZXJSZWdpc3Ry YXRpb25JbmZvTGlzdCAqcmVwcmVzCiAKICAgICBpZiAoW3Bhc3RlYm9hcmQgcmVzcG9uZHNUb1Nl bGVjdG9yOkBzZWxlY3RvcihzdGFnZVJlZ2lzdHJhdGlvbkxpc3Q6KV0pCiAgICAgICAgIFtwYXN0 ZWJvYXJkIHN0YWdlUmVnaXN0cmF0aW9uTGlzdDpyZXByZXNlbnRhdGlvbnNUb1JlZ2lzdGVyXTsK KyNlbmRpZgorICAgIAogfQogCiBzdGF0aWMgdm9pZCBhZGRSZXByZXNlbnRhdGlvbnNGb3JQbGFp blRleHQoV2ViSXRlbVByb3ZpZGVyUmVnaXN0cmF0aW9uSW5mb0xpc3QgKml0ZW1zVG9SZWdpc3Rl ciwgY29uc3QgU3RyaW5nJiBwbGFpblRleHQpCkBAIC0zNTEsNyArMzYxLDkgQEAgdm9pZCBQbGF0 Zm9ybVBhc3RlYm9hcmQ6OndyaXRlKGNvbnN0IFBhc3RlYm9hcmRJbWFnZSYgcGFzdGVib2FyZElt YWdlKQogICAgIC8vIHRoZSBVUkwgKGkuZS4gdGhlIGFuY2hvcidzIGhyZWYgYXR0cmlidXRlKSB0 byBiZSBhIGhpZ2hlciBmaWRlbGl0eSByZXByZXNlbnRhdGlvbi4KICAgICBhdXRvJiBwYXN0ZWJv YXJkVVJMID0gcGFzdGVib2FyZEltYWdlLnVybDsKICAgICBpZiAoTlNVUkwgKm5zVVJMID0gcGFz dGVib2FyZFVSTC51cmwpIHsKKyNpZiAhRU5BQkxFKE1JTklNQUxfU0lNVUxBVE9SKQogICAgICAg ICBuc1VSTC5fdGl0bGUgPSBwYXN0ZWJvYXJkVVJMLnRpdGxlLmlzRW1wdHkoKSA/IHVzZXJWaXNp YmxlU3RyaW5nKHBhc3RlYm9hcmRVUkwudXJsKSA6IChOU1N0cmluZyAqKXBhc3RlYm9hcmRVUkwu dGl0bGU7CisjZW5kaWYKICAgICAgICAgW3JlcHJlc2VudGF0aW9uc1RvUmVnaXN0ZXIgYWRkUmVw cmVzZW50aW5nT2JqZWN0Om5zVVJMXTsKICAgICB9CiAKQEAgLTM4MSw4ICszOTMsMTAgQEAgdm9p ZCBQbGF0Zm9ybVBhc3RlYm9hcmQ6OndyaXRlKGNvbnN0IFBhc3RlYm9hcmRVUkwmIHVybCkKICAg ICBbcmVwcmVzZW50YXRpb25zVG9SZWdpc3RlciBzZXRQcmVmZXJyZWRQcmVzZW50YXRpb25TdHls ZTpXZWJQcmVmZXJyZWRQcmVzZW50YXRpb25TdHlsZUlubGluZV07CiAKICAgICBpZiAoTlNVUkwg Km5zVVJMID0gdXJsLnVybCkgeworI2lmICFFTkFCTEUoTUlOSU1BTF9TSU1VTEFUT1IpCiAgICAg ICAgIGlmICghdXJsLnRpdGxlLmlzRW1wdHkoKSkKICAgICAgICAgICAgIG5zVVJMLl90aXRsZSA9 IHVybC50aXRsZTsKKyNlbmRpZgogICAgICAgICBbcmVwcmVzZW50YXRpb25zVG9SZWdpc3RlciBh ZGRSZXByZXNlbnRpbmdPYmplY3Q6bnNVUkxdOwogICAgICAgICBbcmVwcmVzZW50YXRpb25zVG9S ZWdpc3RlciBhZGRSZXByZXNlbnRpbmdPYmplY3Q6KE5TU3RyaW5nICopdXJsLnVybC5zdHJpbmco KV07CiAgICAgfQpAQCAtNjIzLDcgKzYzNyw3IEBAIFVSTCBQbGF0Zm9ybVBhc3RlYm9hcmQ6OnJl YWRVUkwoaW50IGluZGV4LCBjb25zdCBTdHJpbmcmIHR5cGUsIFN0cmluZyYgdGl0bGUpCiAgICAg aWYgKCFhbGxvd1JlYWRpbmdVUkxBdEluZGV4KHVybCwgaW5kZXgpKQogICAgICAgICByZXR1cm4g eyB9OwogCi0jaWYgUEFTVEVCT0FSRF9TVVBQT1JUU19JVEVNX1BST1ZJREVSUworI2lmIFBBU1RF Qk9BUkRfU1VQUE9SVFNfSVRFTV9QUk9WSURFUlMgJiYgIUVOQUJMRShNSU5JTUFMX1NJTVVMQVRP UikKICAgICB0aXRsZSA9IFt1cmwgX3RpdGxlXTsKICNlbHNlCiAgICAgVU5VU0VEX1BBUkFNKHRp dGxlKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2lvcy9XZWJJdGVtUHJv dmlkZXJQYXN0ZWJvYXJkLmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9pb3MvV2ViSXRlbVBy b3ZpZGVyUGFzdGVib2FyZC5oCmluZGV4IDFhNDhkZWQzYmRhMTU5YjAyMmVhYzEwZmZkNjgxMjEz ZjA2M2RmYjcuLjg5NWVhNDk0Zjc2ZmY2MzZjN2ZkM2YxNTRiN2RmMzNhODliMGRmYjUgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2lvcy9XZWJJdGVtUHJvdmlkZXJQYXN0ZWJv YXJkLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vaW9zL1dlYkl0ZW1Qcm92aWRlclBh c3RlYm9hcmQuaApAQCAtMjcsNiArMjcsMTUgQEAKIAogI2lmIFRBUkdFVF9PU19JUEhPTkUgJiYg X19JUEhPTkVfT1NfVkVSU0lPTl9NSU5fUkVRVUlSRUQgPj0gMTEwMDAwCiAKKyNpZiBkZWZpbmVk KFRBUkdFVF9PU19JT1NNQUMpICYmIFRBUkdFVF9PU19JT1NNQUMKKworI2RlZmluZSBVSUl0ZW1Q cm92aWRlciBOU0l0ZW1Qcm92aWRlcgorI2RlZmluZSBVSUl0ZW1Qcm92aWRlclJlYWRpbmcgTlNJ dGVtUHJvdmlkZXJSZWFkaW5nCisjZGVmaW5lIFVJSXRlbVByb3ZpZGVyV3JpdGluZyBOU0l0ZW1Q cm92aWRlcldyaXRpbmcKKyNkZWZpbmUgVUlJdGVtUHJvdmlkZXJSZXByZXNlbnRhdGlvbk9wdGlv bnNWaXNpYmlsaXR5QWxsIE5TSXRlbVByb3ZpZGVyUmVwcmVzZW50YXRpb25WaXNpYmlsaXR5QWxs CisKKyNlbmRpZgorCiBAY2xhc3MgVUlJdGVtUHJvdmlkZXI7CiBAcHJvdG9jb2wgVUlJdGVtUHJv dmlkZXJXcml0aW5nOwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9pb3Mv V2ViSXRlbVByb3ZpZGVyUGFzdGVib2FyZC5tbSBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2lv cy9XZWJJdGVtUHJvdmlkZXJQYXN0ZWJvYXJkLm1tCmluZGV4IDMzMmRlYWQ2MjRmNWRiZjU2ZDFm ZDM3MTg3MWZhOTA5ZWZkZDY4ZGUuLjVlYjRjZGRiM2ZlMzIzYzBiMzg5OGE0MWIzZjg3Mzg1Mjk5 Y2E1MTkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2lvcy9XZWJJdGVtUHJv dmlkZXJQYXN0ZWJvYXJkLm1tCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2lvcy9XZWJJ dGVtUHJvdmlkZXJQYXN0ZWJvYXJkLm1tCkBAIC0yNiw3ICsyNiw3IEBACiAjaW5jbHVkZSAiY29u ZmlnLmgiCiAjaW1wb3J0ICJXZWJJdGVtUHJvdmlkZXJQYXN0ZWJvYXJkLmgiCiAKLSNpZiBFTkFC TEUoREFUQV9JTlRFUkFDVElPTikKKyNpZiBFTkFCTEUoREFUQV9JTlRFUkFDVElPTikgfHwgRU5B QkxFKE1JTklNQUxfU0lNVUxBVE9SKQogCiAjaW1wb3J0IDxGb3VuZGF0aW9uL05TSXRlbVByb3Zp ZGVyLmg+CiAjaW1wb3J0IDxGb3VuZGF0aW9uL05TUHJvZ3Jlc3MuaD4KQEAgLTI1Niw2ICsyNTYs NyBAQCB1c2luZyBXZWJDb3JlOjpQYXN0ZWJvYXJkQ3VzdG9tRGF0YTsKICAgICAgICAgYmxvY2so W3NlbGYgaXRlbUF0SW5kZXg6aW5kZXhdLCBpbmRleCk7CiB9CiAKKyNpZiAhRU5BQkxFKE1JTklN QUxfU0lNVUxBVE9SKQogc3RhdGljIFVJUHJlZmVycmVkUHJlc2VudGF0aW9uU3R5bGUgdWlQcmVm ZXJyZWRQcmVzZW50YXRpb25TdHlsZShXZWJQcmVmZXJyZWRQcmVzZW50YXRpb25TdHlsZSBzdHls ZSkKIHsKICAgICBzd2l0Y2ggKHN0eWxlKSB7CkBAIC0yNzAsNiArMjcxLDcgQEAgc3RhdGljIFVJ UHJlZmVycmVkUHJlc2VudGF0aW9uU3R5bGUgdWlQcmVmZXJyZWRQcmVzZW50YXRpb25TdHlsZShX ZWJQcmVmZXJyZWRQcmUKICAgICAgICAgcmV0dXJuIFVJUHJlZmVycmVkUHJlc2VudGF0aW9uU3R5 bGVVbnNwZWNpZmllZDsKICAgICB9CiB9CisjZW5kaWYKIAogLSAoVUlJdGVtUHJvdmlkZXIgKilp dGVtUHJvdmlkZXIKIHsKQEAgLTI3OSwxMCArMjgxLDEyIEBAIHN0YXRpYyBVSVByZWZlcnJlZFBy ZXNlbnRhdGlvblN0eWxlIHVpUHJlZmVycmVkUHJlc2VudGF0aW9uU3R5bGUoV2ViUHJlZmVycmVk UHJlCiAgICAgYXV0byBpdGVtUHJvdmlkZXIgPSBhZG9wdE5TKFthbGxvY1VJSXRlbVByb3ZpZGVy SW5zdGFuY2UoKSBpbml0XSk7CiAgICAgZm9yIChpZCA8V2ViSXRlbVByb3ZpZGVyUmVnaXN0cmFy PiByZXByZXNlbnRhdGlvbiBpbiBfcmVwcmVzZW50YXRpb25zLmdldCgpKQogICAgICAgICBbcmVw cmVzZW50YXRpb24gcmVnaXN0ZXJJdGVtUHJvdmlkZXI6aXRlbVByb3ZpZGVyLmdldCgpXTsKLSAg ICBbaXRlbVByb3ZpZGVyIHNldFByZWZlcnJlZFByZXNlbnRhdGlvblNpemU6c2VsZi5wcmVmZXJy ZWRQcmVzZW50YXRpb25TaXplXTsKICAgICBbaXRlbVByb3ZpZGVyIHNldFN1Z2dlc3RlZE5hbWU6 c2VsZi5zdWdnZXN0ZWROYW1lXTsKKyNpZiAhRU5BQkxFKE1JTklNQUxfU0lNVUxBVE9SKQorICAg IFtpdGVtUHJvdmlkZXIgc2V0UHJlZmVycmVkUHJlc2VudGF0aW9uU2l6ZTpzZWxmLnByZWZlcnJl ZFByZXNlbnRhdGlvblNpemVdOwogICAgIFtpdGVtUHJvdmlkZXIgc2V0UHJlZmVycmVkUHJlc2Vu dGF0aW9uU3R5bGU6dWlQcmVmZXJyZWRQcmVzZW50YXRpb25TdHlsZShzZWxmLnByZWZlcnJlZFBy ZXNlbnRhdGlvblN0eWxlKV07CiAgICAgW2l0ZW1Qcm92aWRlciBzZXRUZWFtRGF0YTpzZWxmLnRl YW1EYXRhXTsKKyNlbmRpZgogICAgIHJldHVybiBpdGVtUHJvdmlkZXIuYXV0b3JlbGVhc2UoKTsK IH0KIApAQCAtODMyLDQgKzgzNiw0IEBAIHN0YXRpYyBOU1VSTCAqbGlua1RlbXBvcmFyeUl0ZW1Q cm92aWRlckZpbGVzVG9Ecm9wU3RhZ2luZ0RpcmVjdG9yeShOU1VSTCAqdXJsLCBOCiAKIEBlbmQK IAotI2VuZGlmIC8vIEVOQUJMRShEQVRBX0lOVEVSQUNUSU9OKQorI2VuZGlmIC8vIEVOQUJMRShE QVRBX0lOVEVSQUNUSU9OKSB8fCBFTkFCTEUoTUlOSU1BTF9TSU1VTEFUT1IpCg== 344134 2018-07-02 14:13:30 -0700 2018-07-02 14:52:24 -0700 Patch for landing bug-187194-20180702141329.patch text/plain 8183 megan_gardner U3VidmVyc2lvbiBSZXZpc2lvbjogMjMzMzMxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggM2EzOTQ4MjNlM2RlNTg1 YjlhZDQ3MTg5OTQ0NDU4YmVlY2JiODUyZS4uOTQ0ZjMyMzNlYzM0Y2JhZWNhZDBmMmU2N2Y3ZWJm ZTc3YzEzN2MzMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3IEBACisyMDE4LTA2LTI5ICBNZWdh biBHYXJkbmVyICA8bWVnYW5fZ2FyZG5lckBhcHBsZS5jb20+CisKKyAgICAgICAgRW5hYmxlIGNv cHkgcGFzdGUgb24gaU9TIGFwcHMgZm9yIE1hYworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTg3MTk0CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS80MTQ1 MTE0OD4KKworICAgICAgICBSZXZpZXdlZCBieSBEYXJpbiBBZGxlci4KKworICAgICAgICBEaWZm aWN1bHQgdG8gdGVzdCB0aGlzIHBsYXRmb3JtLgorCisgICAgICAgIFVJS2l0IGRvZXNuJ3Qgc3Vw cG9ydCBpdGVtUHJvdmlkZXJzIGZvciBpT1MgYXBwcyBmb3IgTWFjLCBzbyB3ZSBuZWVkIHRvIHJl dmVydCB0byB0aGUKKyAgICAgICAgb2xkZXIgd2F5IG9mIHNldHRpbmcgYSBkaWN0aW9uYXJ5IG9m IG9iamVjdHMgYW5kIGtleXMgZm9yIGl0ZW1zLiBOb3QgZXZlcnl0aGluZyBpcworICAgICAgICBh dmFpbGJsZSBpbiB0aGlzIGZvcm0sIGFuZCB3ZSBoYXZlbid0IGNsZWFuZWQgdXAgb3VyIGl0ZW1Q cm92aWRlciBjb2RlIHlldCwgc28gd2UgCisgICAgICAgIG5lZWQgdG8gY2FzZSBzb21lIHRoaW5n cyBvdXQgZm9yIG5vdy4gSG9wZWZ1bGx5IGluIHRoZSBmdXR1cmUsIHRoaXMgd2lsbCBiZSBpbXBs bWVudGVkCisgICAgICAgIGFuZCBjYW4ganVzdCB3b3JrIGFzIGV4cGVjdGVkLCBidXQgZm9yIG5v dywgdGhpcyBpcyB0aGUgYmVzdCB3b3JrYXJvdW5kLgorCisgICAgICAgICogcGxhdGZvcm0vaW9z L1BsYXRmb3JtUGFzdGVib2FyZElPUy5tbToKKyAgICAgICAgKFdlYkNvcmU6OnJlZ2lzdGVySXRl bVRvUGFzdGVib2FyZCk6CisgICAgICAgIChXZWJDb3JlOjpQbGF0Zm9ybVBhc3RlYm9hcmQ6Ondy aXRlKToKKyAgICAgICAgKFdlYkNvcmU6OlBsYXRmb3JtUGFzdGVib2FyZDo6cmVhZFVSTCk6Cisg ICAgICAgICogcGxhdGZvcm0vaW9zL1dlYkl0ZW1Qcm92aWRlclBhc3RlYm9hcmQuaDoKKyAgICAg ICAgKiBwbGF0Zm9ybS9pb3MvV2ViSXRlbVByb3ZpZGVyUGFzdGVib2FyZC5tbToKKyAgICAgICAg KC1bV2ViSXRlbVByb3ZpZGVyUmVnaXN0cmF0aW9uSW5mb0xpc3QgaXRlbVByb3ZpZGVyXSk6CisK IDIwMTgtMDYtMjggIFRpbW90aHkgSGF0Y2hlciAgPHRpbW90aHlAYXBwbGUuY29tPgogCiAgICAg ICAgIEZpbmQgb24gcGFnZSBzZWxlY3Rpb24gY29sb3IgaXNuJ3QgYWRhcHRlZCBmb3IgZGFyayBt b2RlLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vaW9zL1BsYXRmb3JtUGFz dGVib2FyZElPUy5tbSBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2lvcy9QbGF0Zm9ybVBhc3Rl Ym9hcmRJT1MubW0KaW5kZXggN2VlMmFkOTg1N2IyYTU5NDFiZmUxN2U4YjMxZmViOTA1Y2VlMmJm Mi4uMzVkYjllNDUyNzg5YjdiMzQwNmI0NTYzNWM3OTM4MTg2ODY1ZDBiNiAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vaW9zL1BsYXRmb3JtUGFzdGVib2FyZElPUy5tbQorKysg Yi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9pb3MvUGxhdGZvcm1QYXN0ZWJvYXJkSU9TLm1tCkBA IC00NSw3ICs0NSw4IEBACiAjaW1wb3J0IDx3dGYvU29mdExpbmtpbmcuaD4KICNpbXBvcnQgPHd0 Zi90ZXh0L1N0cmluZ0hhc2guaD4KIAotI2RlZmluZSBQQVNURUJPQVJEX1NVUFBPUlRTX0lURU1f UFJPVklERVJTIChQTEFURk9STShJT1MpICYmICEoUExBVEZPUk0oV0FUQ0hPUykgfHwgUExBVEZP Uk0oQVBQTEVUVikgfHwgRU5BQkxFKE1JTklNQUxfU0lNVUxBVE9SKSkpCisjZGVmaW5lIFBBU1RF Qk9BUkRfU1VQUE9SVFNfSVRFTV9QUk9WSURFUlMgKFBMQVRGT1JNKElPUykgJiYgIShQTEFURk9S TShXQVRDSE9TKSB8fCBQTEFURk9STShBUFBMRVRWKSkpCisjZGVmaW5lIE5TVVJMX1NVUFBPUlRT X1RJVExFICghRU5BQkxFKE1JTklNQUxfU0lNVUxBVE9SKSkKIAogU09GVF9MSU5LX0ZSQU1FV09S SyhVSUtpdCkKIFNPRlRfTElOS19DTEFTUyhVSUtpdCwgVUlJbWFnZSkKQEAgLTI1Myw2ICsyNTQs MTQgQEAgc3RhdGljIE5TU3RyaW5nICp3ZWJJT1NQYXN0ZVBib2FyZFR5cGUgPSBAImlPUyByaWNo IGNvbnRlbnQgcGFzdGUgcGFzdGVib2FyZCB0eXAKIAogc3RhdGljIHZvaWQgcmVnaXN0ZXJJdGVt VG9QYXN0ZWJvYXJkKFdlYkl0ZW1Qcm92aWRlclJlZ2lzdHJhdGlvbkluZm9MaXN0ICpyZXByZXNl bnRhdGlvbnNUb1JlZ2lzdGVyLCBpZCA8QWJzdHJhY3RQYXN0ZWJvYXJkPiBwYXN0ZWJvYXJkKQog eworI2lmIEVOQUJMRShNSU5JTUFMX1NJTVVMQVRPUikKKyAgICBhdXRvIGl0ZW1EaWN0aW9uYXJ5 ID0gYWRvcHROUyhbW05TTXV0YWJsZURpY3Rpb25hcnkgYWxsb2NdIGluaXRdKTsKKyAgICBbcmVw cmVzZW50YXRpb25zVG9SZWdpc3RlciBlbnVtZXJhdGVJdGVtczpbaXRlbURpY3Rpb25hcnldIChp ZCA8V2ViSXRlbVByb3ZpZGVyUmVnaXN0cmFyPiBpdGVtLCBOU1VJbnRlZ2VyKSB7CisgICAgICAg IGlmIChbaXRlbSByZXNwb25kc1RvU2VsZWN0b3I6QHNlbGVjdG9yKHR5cGVJZGVudGlmaWVyRm9y Q2xpZW50KV0gJiYgW2l0ZW0gcmVzcG9uZHNUb1NlbGVjdG9yOkBzZWxlY3RvcihkYXRhRm9yQ2xp ZW50KV0pCisgICAgICAgICAgICBbaXRlbURpY3Rpb25hcnkgc2V0T2JqZWN0Oml0ZW0uZGF0YUZv ckNsaWVudCBmb3JLZXk6aXRlbS50eXBlSWRlbnRpZmllckZvckNsaWVudF07CisgICAgfV07Cisg ICAgW3Bhc3RlYm9hcmQgc2V0SXRlbXM6QFsgaXRlbURpY3Rpb25hcnkuZ2V0KCkgXV07CisjZWxz ZQogICAgIGlmIChVSUl0ZW1Qcm92aWRlciAqaXRlbVByb3ZpZGVyID0gcmVwcmVzZW50YXRpb25z VG9SZWdpc3Rlci5pdGVtUHJvdmlkZXIpCiAgICAgICAgIFtwYXN0ZWJvYXJkIHNldEl0ZW1Qcm92 aWRlcnM6QFsgaXRlbVByb3ZpZGVyIF1dOwogICAgIGVsc2UKQEAgLTI2MCw2ICsyNjksOCBAQCBz dGF0aWMgdm9pZCByZWdpc3Rlckl0ZW1Ub1Bhc3RlYm9hcmQoV2ViSXRlbVByb3ZpZGVyUmVnaXN0 cmF0aW9uSW5mb0xpc3QgKnJlcHJlcwogCiAgICAgaWYgKFtwYXN0ZWJvYXJkIHJlc3BvbmRzVG9T ZWxlY3RvcjpAc2VsZWN0b3Ioc3RhZ2VSZWdpc3RyYXRpb25MaXN0OildKQogICAgICAgICBbcGFz dGVib2FyZCBzdGFnZVJlZ2lzdHJhdGlvbkxpc3Q6cmVwcmVzZW50YXRpb25zVG9SZWdpc3Rlcl07 CisjZW5kaWYKKyAgICAKIH0KIAogc3RhdGljIHZvaWQgYWRkUmVwcmVzZW50YXRpb25zRm9yUGxh aW5UZXh0KFdlYkl0ZW1Qcm92aWRlclJlZ2lzdHJhdGlvbkluZm9MaXN0ICppdGVtc1RvUmVnaXN0 ZXIsIGNvbnN0IFN0cmluZyYgcGxhaW5UZXh0KQpAQCAtMzUxLDcgKzM2Miw5IEBAIHZvaWQgUGxh dGZvcm1QYXN0ZWJvYXJkOjp3cml0ZShjb25zdCBQYXN0ZWJvYXJkSW1hZ2UmIHBhc3RlYm9hcmRJ bWFnZSkKICAgICAvLyB0aGUgVVJMIChpLmUuIHRoZSBhbmNob3IncyBocmVmIGF0dHJpYnV0ZSkg dG8gYmUgYSBoaWdoZXIgZmlkZWxpdHkgcmVwcmVzZW50YXRpb24uCiAgICAgYXV0byYgcGFzdGVi b2FyZFVSTCA9IHBhc3RlYm9hcmRJbWFnZS51cmw7CiAgICAgaWYgKE5TVVJMICpuc1VSTCA9IHBh c3RlYm9hcmRVUkwudXJsKSB7CisjaWYgTlNVUkxfU1VQUE9SVFNfVElUTEUKICAgICAgICAgbnNV UkwuX3RpdGxlID0gcGFzdGVib2FyZFVSTC50aXRsZS5pc0VtcHR5KCkgPyB1c2VyVmlzaWJsZVN0 cmluZyhwYXN0ZWJvYXJkVVJMLnVybCkgOiAoTlNTdHJpbmcgKilwYXN0ZWJvYXJkVVJMLnRpdGxl OworI2VuZGlmCiAgICAgICAgIFtyZXByZXNlbnRhdGlvbnNUb1JlZ2lzdGVyIGFkZFJlcHJlc2Vu dGluZ09iamVjdDpuc1VSTF07CiAgICAgfQogCkBAIC0zODEsOCArMzk0LDEwIEBAIHZvaWQgUGxh dGZvcm1QYXN0ZWJvYXJkOjp3cml0ZShjb25zdCBQYXN0ZWJvYXJkVVJMJiB1cmwpCiAgICAgW3Jl cHJlc2VudGF0aW9uc1RvUmVnaXN0ZXIgc2V0UHJlZmVycmVkUHJlc2VudGF0aW9uU3R5bGU6V2Vi UHJlZmVycmVkUHJlc2VudGF0aW9uU3R5bGVJbmxpbmVdOwogCiAgICAgaWYgKE5TVVJMICpuc1VS TCA9IHVybC51cmwpIHsKKyNpZiBOU1VSTF9TVVBQT1JUU19USVRMRQogICAgICAgICBpZiAoIXVy bC50aXRsZS5pc0VtcHR5KCkpCiAgICAgICAgICAgICBuc1VSTC5fdGl0bGUgPSB1cmwudGl0bGU7 CisjZW5kaWYKICAgICAgICAgW3JlcHJlc2VudGF0aW9uc1RvUmVnaXN0ZXIgYWRkUmVwcmVzZW50 aW5nT2JqZWN0Om5zVVJMXTsKICAgICAgICAgW3JlcHJlc2VudGF0aW9uc1RvUmVnaXN0ZXIgYWRk UmVwcmVzZW50aW5nT2JqZWN0OihOU1N0cmluZyAqKXVybC51cmwuc3RyaW5nKCldOwogICAgIH0K QEAgLTYyMyw3ICs2MzgsNyBAQCBVUkwgUGxhdGZvcm1QYXN0ZWJvYXJkOjpyZWFkVVJMKGludCBp bmRleCwgY29uc3QgU3RyaW5nJiB0eXBlLCBTdHJpbmcmIHRpdGxlKQogICAgIGlmICghYWxsb3dS ZWFkaW5nVVJMQXRJbmRleCh1cmwsIGluZGV4KSkKICAgICAgICAgcmV0dXJuIHsgfTsKIAotI2lm IFBBU1RFQk9BUkRfU1VQUE9SVFNfSVRFTV9QUk9WSURFUlMKKyNpZiBQQVNURUJPQVJEX1NVUFBP UlRTX0lURU1fUFJPVklERVJTICYmIE5TVVJMX1NVUFBPUlRTX1RJVExFCiAgICAgdGl0bGUgPSBb dXJsIF90aXRsZV07CiAjZWxzZQogICAgIFVOVVNFRF9QQVJBTSh0aXRsZSk7CmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9pb3MvV2ViSXRlbVByb3ZpZGVyUGFzdGVib2FyZC5o IGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vaW9zL1dlYkl0ZW1Qcm92aWRlclBhc3RlYm9hcmQu aAppbmRleCAxYTQ4ZGVkM2JkYTE1OWIwMjJlYWMxMGZmZDY4MTIxM2YwNjNkZmI3Li5iNDNlYTRl ZWM2OWQ0ZmVhZWE0ZWJmNDcyYTc3NGQ1NTIwZDA1MWNlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9pb3MvV2ViSXRlbVByb3ZpZGVyUGFzdGVib2FyZC5oCisrKyBiL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL2lvcy9XZWJJdGVtUHJvdmlkZXJQYXN0ZWJvYXJkLmgKQEAgLTI3 LDYgKzI3LDE3IEBACiAKICNpZiBUQVJHRVRfT1NfSVBIT05FICYmIF9fSVBIT05FX09TX1ZFUlNJ T05fTUlOX1JFUVVJUkVEID49IDExMDAwMAogCisvLyBVSUl0ZW1Qcm92aWRlcnMgYXJlIG5vdCBp bXBsZW1lbnRlZCBmb3IgaU9TIGFwcHMgZm9yIE1hYywgYmVjYXVzZSB0aGV5IHdlcmUgZGVwcmlj YXRlZCBsYXN0IHllYXIuCisvLyBXZSBuZWVkIHRvIHN3aXRjaCBvdmVyIHRvIE5TSXRlbVByb3Zp ZGVycyBldmVyeXdoZXJlLiBUaGlzIHNob3VsZCBqdXN0IGJlIGEgdGVtcG9yYXJ5IGZpeC4KKyNp ZiBkZWZpbmVkKFRBUkdFVF9PU19JT1NNQUMpICYmIFRBUkdFVF9PU19JT1NNQUMKKworI2RlZmlu ZSBVSUl0ZW1Qcm92aWRlciBOU0l0ZW1Qcm92aWRlcgorI2RlZmluZSBVSUl0ZW1Qcm92aWRlclJl YWRpbmcgTlNJdGVtUHJvdmlkZXJSZWFkaW5nCisjZGVmaW5lIFVJSXRlbVByb3ZpZGVyV3JpdGlu ZyBOU0l0ZW1Qcm92aWRlcldyaXRpbmcKKyNkZWZpbmUgVUlJdGVtUHJvdmlkZXJSZXByZXNlbnRh dGlvbk9wdGlvbnNWaXNpYmlsaXR5QWxsIE5TSXRlbVByb3ZpZGVyUmVwcmVzZW50YXRpb25WaXNp YmlsaXR5QWxsCisKKyNlbmRpZgorCiBAY2xhc3MgVUlJdGVtUHJvdmlkZXI7CiBAcHJvdG9jb2wg VUlJdGVtUHJvdmlkZXJXcml0aW5nOwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9pb3MvV2ViSXRlbVByb3ZpZGVyUGFzdGVib2FyZC5tbSBiL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2lvcy9XZWJJdGVtUHJvdmlkZXJQYXN0ZWJvYXJkLm1tCmluZGV4IDMzMmRlYWQ2MjRm NWRiZjU2ZDFmZDM3MTg3MWZhOTA5ZWZkZDY4ZGUuLjU0NDZiMmI2MTdkYjU2YTMwY2YxZjFiYjBk MDZlMGZiNTFkNWU2NDAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2lvcy9X ZWJJdGVtUHJvdmlkZXJQYXN0ZWJvYXJkLm1tCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L2lvcy9XZWJJdGVtUHJvdmlkZXJQYXN0ZWJvYXJkLm1tCkBAIC0yNiw3ICsyNiw3IEBACiAjaW5j bHVkZSAiY29uZmlnLmgiCiAjaW1wb3J0ICJXZWJJdGVtUHJvdmlkZXJQYXN0ZWJvYXJkLmgiCiAK LSNpZiBFTkFCTEUoREFUQV9JTlRFUkFDVElPTikKKyNpZiBFTkFCTEUoREFUQV9JTlRFUkFDVElP TikgfHwgRU5BQkxFKE1JTklNQUxfU0lNVUxBVE9SKQogCiAjaW1wb3J0IDxGb3VuZGF0aW9uL05T SXRlbVByb3ZpZGVyLmg+CiAjaW1wb3J0IDxGb3VuZGF0aW9uL05TUHJvZ3Jlc3MuaD4KQEAgLTI1 Niw2ICsyNTYsNyBAQCB1c2luZyBXZWJDb3JlOjpQYXN0ZWJvYXJkQ3VzdG9tRGF0YTsKICAgICAg ICAgYmxvY2soW3NlbGYgaXRlbUF0SW5kZXg6aW5kZXhdLCBpbmRleCk7CiB9CiAKKyNpZiAhRU5B QkxFKE1JTklNQUxfU0lNVUxBVE9SKQogc3RhdGljIFVJUHJlZmVycmVkUHJlc2VudGF0aW9uU3R5 bGUgdWlQcmVmZXJyZWRQcmVzZW50YXRpb25TdHlsZShXZWJQcmVmZXJyZWRQcmVzZW50YXRpb25T dHlsZSBzdHlsZSkKIHsKICAgICBzd2l0Y2ggKHN0eWxlKSB7CkBAIC0yNzAsNiArMjcxLDcgQEAg c3RhdGljIFVJUHJlZmVycmVkUHJlc2VudGF0aW9uU3R5bGUgdWlQcmVmZXJyZWRQcmVzZW50YXRp b25TdHlsZShXZWJQcmVmZXJyZWRQcmUKICAgICAgICAgcmV0dXJuIFVJUHJlZmVycmVkUHJlc2Vu dGF0aW9uU3R5bGVVbnNwZWNpZmllZDsKICAgICB9CiB9CisjZW5kaWYKIAogLSAoVUlJdGVtUHJv dmlkZXIgKilpdGVtUHJvdmlkZXIKIHsKQEAgLTI3OSwxMCArMjgxLDE0IEBAIHN0YXRpYyBVSVBy ZWZlcnJlZFByZXNlbnRhdGlvblN0eWxlIHVpUHJlZmVycmVkUHJlc2VudGF0aW9uU3R5bGUoV2Vi UHJlZmVycmVkUHJlCiAgICAgYXV0byBpdGVtUHJvdmlkZXIgPSBhZG9wdE5TKFthbGxvY1VJSXRl bVByb3ZpZGVySW5zdGFuY2UoKSBpbml0XSk7CiAgICAgZm9yIChpZCA8V2ViSXRlbVByb3ZpZGVy UmVnaXN0cmFyPiByZXByZXNlbnRhdGlvbiBpbiBfcmVwcmVzZW50YXRpb25zLmdldCgpKQogICAg ICAgICBbcmVwcmVzZW50YXRpb24gcmVnaXN0ZXJJdGVtUHJvdmlkZXI6aXRlbVByb3ZpZGVyLmdl dCgpXTsKLSAgICBbaXRlbVByb3ZpZGVyIHNldFByZWZlcnJlZFByZXNlbnRhdGlvblNpemU6c2Vs Zi5wcmVmZXJyZWRQcmVzZW50YXRpb25TaXplXTsKICAgICBbaXRlbVByb3ZpZGVyIHNldFN1Z2dl c3RlZE5hbWU6c2VsZi5zdWdnZXN0ZWROYW1lXTsKKyAgICAvLyBVSUl0ZW1Qcm92aWRlcnMgYXJl IG5vdCBpbXBsZW1lbnRlZCBmb3IgaU9TIGFwcHMgZm9yIE1hYywgYmVjYXVzZSB0aGV5IHdlcmUg ZGVwcmljYXRlZCBsYXN0IHllYXIuCisgICAgLy8gV2UgbmVlZCB0byBzd2l0Y2ggb3ZlciB0byBO U0l0ZW1Qcm92aWRlcnMgZXZlcnl3aGVyZS4gVGhpcyBzaG91bGQganVzdCBiZSBhIHRlbXBvcmFy eSBmaXguCisjaWYgIUVOQUJMRShNSU5JTUFMX1NJTVVMQVRPUikKKyAgICBbaXRlbVByb3ZpZGVy IHNldFByZWZlcnJlZFByZXNlbnRhdGlvblNpemU6c2VsZi5wcmVmZXJyZWRQcmVzZW50YXRpb25T aXplXTsKICAgICBbaXRlbVByb3ZpZGVyIHNldFByZWZlcnJlZFByZXNlbnRhdGlvblN0eWxlOnVp UHJlZmVycmVkUHJlc2VudGF0aW9uU3R5bGUoc2VsZi5wcmVmZXJyZWRQcmVzZW50YXRpb25TdHls ZSldOwogICAgIFtpdGVtUHJvdmlkZXIgc2V0VGVhbURhdGE6c2VsZi50ZWFtRGF0YV07CisjZW5k aWYKICAgICByZXR1cm4gaXRlbVByb3ZpZGVyLmF1dG9yZWxlYXNlKCk7CiB9CiAKQEAgLTgzMiw0 ICs4MzgsNCBAQCBzdGF0aWMgTlNVUkwgKmxpbmtUZW1wb3JhcnlJdGVtUHJvdmlkZXJGaWxlc1Rv RHJvcFN0YWdpbmdEaXJlY3RvcnkoTlNVUkwgKnVybCwgTgogCiBAZW5kCiAKLSNlbmRpZiAvLyBF TkFCTEUoREFUQV9JTlRFUkFDVElPTikKKyNlbmRpZiAvLyBFTkFCTEUoREFUQV9JTlRFUkFDVElP TikgfHwgRU5BQkxFKE1JTklNQUxfU0lNVUxBVE9SKQo=