183961 2018-03-23 16:33:52 -0700 Use special software encoder mode in case there is no VCP nor hardware encoder 2018-04-09 14:10:23 -0700 1 1 1 Unclassified WebKit WebRTC WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 youennf youennf commit-queue eric.carlson webkit-bug-importer youennf oldest_to_newest 1408952 0 youennf 2018-03-23 16:33:52 -0700 Use special software encoder mode in case there is no VCP not hardware encoder 1408959 1 336440 youennf 2018-03-23 16:40:25 -0700 Created attachment 336440 Patch 1408975 2 336444 youennf 2018-03-23 17:02:51 -0700 Created attachment 336444 Patch 1412946 3 336444 eric.carlson 2018-04-09 11:58:50 -0700 Comment on attachment 336444 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=336444&action=review > Source/ThirdParty/libwebrtc/Source/webrtc/sdk/objc/Framework/Classes/VideoToolbox/RTCVideoEncoderH264.mm:674 > + CFTypeRef values[attributesSize] = {kCFBooleanTrue, ioSurfaceValue, pixelFormat}; Nit: declaring this immediately after "keys", and using the same one-line-per-value style, would make it easier to understand. > Source/ThirdParty/libwebrtc/Source/webrtc/sdk/objc/Framework/Classes/VideoToolbox/RTCVideoEncoderH264.mm:678 > + ioSurfaceValue = nullptr; Nit: this is never accessed again so clearing it isn't necessary. > Source/ThirdParty/libwebrtc/Source/webrtc/sdk/objc/Framework/Classes/VideoToolbox/RTCVideoEncoderH264.mm:682 > + pixelFormat = nullptr; Ditto. > Source/ThirdParty/libwebrtc/Source/webrtc/sdk/objc/Framework/Classes/VideoToolbox/RTCVideoEncoderH264.mm:685 > + CFMutableDictionaryRef encoder_specs = CFDictionaryCreateMutable( Nit: you use camel case for the other local variables so this should probably as well. > Source/ThirdParty/libwebrtc/Source/webrtc/sdk/objc/Framework/Classes/VideoToolbox/RTCVideoEncoderH264.mm:686 > + nullptr, 2, &kCFTypeDictionaryKeyCallBacks, &kCFTypeDictionaryValueCallBacks); Nit: I don't think the line break makes this more readable. > Source/ThirdParty/libwebrtc/Source/webrtc/sdk/objc/Framework/Classes/VideoToolbox/RTCVideoEncoderH264.mm:693 > + usage = nullptr; Nit: ditto the comment above about clearing. > Source/ThirdParty/libwebrtc/Source/webrtc/sdk/objc/Framework/Classes/VideoToolbox/RTCVideoEncoderH264.mm:711 > + sourceAttributes = nullptr; Ditto. > Source/ThirdParty/libwebrtc/Source/webrtc/sdk/objc/Framework/Classes/VideoToolbox/RTCVideoEncoderH264.mm:715 > + encoder_specs = nullptr; Ditto. 1412959 4 336444 youennf 2018-04-09 12:19:13 -0700 Comment on attachment 336444 Patch We discussed with Eric and will keep clearing the variables even though that is not necessary, for consistency with the style of the file. Will fix the other comments at land time. 1412971 5 337526 youennf 2018-04-09 12:39:10 -0700 Created attachment 337526 Patch for landing 1413013 6 337526 commit-queue 2018-04-09 14:10:00 -0700 Comment on attachment 337526 Patch for landing Clearing flags on attachment: 337526 Committed r230451: <https://trac.webkit.org/changeset/230451> 1413014 7 commit-queue 2018-04-09 14:10:01 -0700 All reviewed patches have been landed. Closing bug. 1413015 8 webkit-bug-importer 2018-04-09 14:10:23 -0700 <rdar://problem/39292552> 336440 2018-03-23 16:40:25 -0700 2018-03-23 17:02:50 -0700 Patch bug-183961-20180323164024.patch text/plain 7434 youennf U3VidmVyc2lvbiBSZXZpc2lvbjogMjI5OTIzCmRpZmYgLS1naXQgYS9Tb3VyY2UvVGhpcmRQYXJ0 eS9saWJ3ZWJydGMvQ2hhbmdlTG9nIGIvU291cmNlL1RoaXJkUGFydHkvbGlid2VicnRjL0NoYW5n ZUxvZwppbmRleCA1NDU4MzI5NDQ2M2VkYWI3ZDcwY2YzMzgwYjlhYzE0ZjQ1NjEyNzE3Li45ZTRk ZTdiMDU1MTc4MGZmNzZiYzJlOTVkZjViNGFkNzY1M2M2MTVhIDEwMDY0NAotLS0gYS9Tb3VyY2Uv VGhpcmRQYXJ0eS9saWJ3ZWJydGMvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9UaGlyZFBhcnR5L2xp YndlYnJ0Yy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNiBAQAorMjAxOC0wMy0yMyAgWW91ZW5uIEZh YmxldCAgPHlvdWVubkBhcHBsZS5jb20+CisKKyAgICAgICAgVXNlIHNwZWNpYWwgc29mdHdhcmUg ZW5jb2RlciBtb2RlIGluIGNhc2UgdGhlcmUgaXMgbm8gVkNQIG5vdCBoYXJkd2FyZSBlbmNvZGVy CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xODM5NjEK KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBJbiBjYXNl IGEgY29tcHJlc3Npb24gc2Vzc2lvbiBpcyBub3QgdXNpbmcgYSBoYXJkd2FyZSBlbmNvZGVyIGFu ZCBWQ1AgaXMgbm90IGFjdGl2ZQorICAgICAgICB1c2UgYSBzcGVjaWZpYyBtb2RlIGlmIHRoZSBy ZXNvbHV0aW9uIGlzIHN0YW5kYXJkLgorCisgICAgICAgICogU291cmNlL3dlYnJ0Yy9zZGsvV2Vi S2l0L1ZpZGVvUHJvY2Vzc2luZ1NvZnRMaW5rLmNwcDoKKyAgICAgICAgKiBTb3VyY2Uvd2VicnRj L3Nkay9vYmpjL0ZyYW1ld29yay9DbGFzc2VzL1ZpZGVvVG9vbGJveC9SVENWaWRlb0VuY29kZXJI MjY0Lm1tOgorCiAyMDE4LTAzLTIzICBZb3Vlbm4gRmFibGV0ICA8eW91ZW5uQGFwcGxlLmNvbT4K IAogICAgICAgICBBZGQgc3VwcG9ydCBmb3IgVkNQIGVuY29kZXIgb24gTWFjT1MgYW5kIGlPUwpk aWZmIC0tZ2l0IGEvU291cmNlL1RoaXJkUGFydHkvbGlid2VicnRjL1NvdXJjZS93ZWJydGMvc2Rr L1dlYktpdC9WaWRlb1Byb2Nlc3NpbmdTb2Z0TGluay5oIGIvU291cmNlL1RoaXJkUGFydHkvbGli d2VicnRjL1NvdXJjZS93ZWJydGMvc2RrL1dlYktpdC9WaWRlb1Byb2Nlc3NpbmdTb2Z0TGluay5o CmluZGV4IDZkOGM2NTVlODdmNjBhOGNmMTE3ZDAzNDFjOTU4MTYyNDBiMGRiZjIuLmU1NjRiYzhi NjA1ZDljMzU3NTI2NWZhZDkxMjU2ZWIzOTc2NjJiYTUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9UaGly ZFBhcnR5L2xpYndlYnJ0Yy9Tb3VyY2Uvd2VicnRjL3Nkay9XZWJLaXQvVmlkZW9Qcm9jZXNzaW5n U29mdExpbmsuaAorKysgYi9Tb3VyY2UvVGhpcmRQYXJ0eS9saWJ3ZWJydGMvU291cmNlL3dlYnJ0 Yy9zZGsvV2ViS2l0L1ZpZGVvUHJvY2Vzc2luZ1NvZnRMaW5rLmgKQEAgLTM4LDEwICszOCw2IEBA CiAjZGVmaW5lIEVOQUJMRV9WQ1BfRU5DT0RFUiAoX19NQUNfT1NfWF9WRVJTSU9OX01BWF9BTExP V0VEID49IDEwMTMwNCkKICNlbmRpZgogCi0jaWYgRU5BQkxFX1ZDUF9FTkNPREVSCi0KLSNpbmNs dWRlIDxWaWRlb1Byb2Nlc3NpbmcvVmlkZW9Qcm9jZXNzaW5nLmg+Ci0KICNkZWZpbmUgQUxXQVlT X0lOTElORSBpbmxpbmUKIAogI2lmZGVmIF9fY3BsdXNwbHVzCkBAIC03OCw2ICs3NCwzNiBAQAog ICAgICAgICByZXR1cm4gZnVuY3Rpb25OYW1lc3BhY2U6OnNvZnRMaW5rIyNmcmFtZXdvcmsjI2Z1 bmN0aW9uTmFtZSBwYXJhbWV0ZXJOYW1lczsgXAogICAgIH0KIAorI2RlZmluZSBTT0ZUX0xJTktf RlJBTUVXT1JLX09QVElPTkFMKGZyYW1ld29yaykgXAorICAgIHN0YXRpYyB2b2lkKiBmcmFtZXdv cmsjI0xpYnJhcnkoKSBcCisgICAgeyBcCisgICAgICAgIHN0YXRpYyB2b2lkKiBmcmFtZXdvcmtM aWJyYXJ5ID0gZGxvcGVuKCIvU3lzdGVtL0xpYnJhcnkvRnJhbWV3b3Jrcy8iICNmcmFtZXdvcmsg Ii5mcmFtZXdvcmsvIiAjZnJhbWV3b3JrLCBSVExEX05PVyk7IFwKKyAgICAgICAgcmV0dXJuIGZy YW1ld29ya0xpYnJhcnk7IFwKKyAgICB9CisKKyNkZWZpbmUgU09GVF9MSU5LX1BPSU5URVJfT1BU SU9OQUwoZnJhbWV3b3JrLCBuYW1lLCB0eXBlKSBcCisgICAgc3RhdGljIHR5cGUgaW5pdCMjbmFt ZSgpOyBcCisgICAgc3RhdGljIHR5cGUgKCpnZXQjI25hbWUpKCkgPSBpbml0IyNuYW1lOyBcCisg ICAgc3RhdGljIHR5cGUgcG9pbnRlciMjbmFtZTsgXAorICAgIFwKKyAgICBzdGF0aWMgdHlwZSBu YW1lIyNGdW5jdGlvbigpIFwKKyAgICB7IFwKKyAgICAgICAgcmV0dXJuIHBvaW50ZXIjI25hbWU7 IFwKKyAgICB9IFwKKyAgICBcCisgICAgc3RhdGljIHR5cGUgaW5pdCMjbmFtZSgpIFwKKyAgICB7 IFwKKyAgICAgICAgdm9pZCoqIHBvaW50ZXIgPSBzdGF0aWNfY2FzdDx2b2lkKio+KGRsc3ltKGZy YW1ld29yayMjTGlicmFyeSgpLCAjbmFtZSkpOyBcCisgICAgICAgIGlmIChwb2ludGVyKSBcCisg ICAgICAgICAgICBwb2ludGVyIyNuYW1lID0gc3RhdGljX2Nhc3Q8dHlwZT4oKnBvaW50ZXIpOyBc CisgICAgICAgIGdldCMjbmFtZSA9IG5hbWUjI0Z1bmN0aW9uOyBcCisgICAgICAgIHJldHVybiBw b2ludGVyIyNuYW1lOyBcCisgICAgfQorCisjaWYgRU5BQkxFX1ZDUF9FTkNPREVSCisKKyNpbmNs dWRlIDxWaWRlb1Byb2Nlc3NpbmcvVmlkZW9Qcm9jZXNzaW5nLmg+CisKIFNPRlRfTElOS19GUkFN RVdPUktfRk9SX0hFQURFUih3ZWJydGMsIFZpZGVvUHJvY2Vzc2luZykKIAogU09GVF9MSU5LX0ZV TkNUSU9OX0ZPUl9IRUFERVIod2VicnRjLCBWaWRlb1Byb2Nlc3NpbmcsIFZDUENvbXByZXNzaW9u U2Vzc2lvblNldFByb3BlcnR5LCBPU1N0YXR1cywgKFZDUENvbXByZXNzaW9uU2Vzc2lvblJlZiBz ZXNzaW9uLCBDRlN0cmluZ1JlZiBrZXksIENGVHlwZVJlZiB2YWx1ZSksIChzZXNzaW9uLCBrZXks IHZhbHVlKSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9UaGlyZFBhcnR5L2xpYndlYnJ0Yy9Tb3VyY2Uv d2VicnRjL3Nkay9vYmpjL0ZyYW1ld29yay9DbGFzc2VzL1ZpZGVvVG9vbGJveC9SVENWaWRlb0Vu Y29kZXJIMjY0Lm1tIGIvU291cmNlL1RoaXJkUGFydHkvbGlid2VicnRjL1NvdXJjZS93ZWJydGMv c2RrL29iamMvRnJhbWV3b3JrL0NsYXNzZXMvVmlkZW9Ub29sYm94L1JUQ1ZpZGVvRW5jb2Rlckgy NjQubW0KaW5kZXggOGMyN2U3NjY3Y2Q1YjZlYWMyOTVmMTM4NDU0NjgyYWE3OWVlYmI0NC4uZWFh NDgyYjRhNDgwMmMwNDA5M2Y3ZjI2MWZhZjM0YmJlOWFmNjQ4MyAxMDA2NDQKLS0tIGEvU291cmNl L1RoaXJkUGFydHkvbGlid2VicnRjL1NvdXJjZS93ZWJydGMvc2RrL29iamMvRnJhbWV3b3JrL0Ns YXNzZXMvVmlkZW9Ub29sYm94L1JUQ1ZpZGVvRW5jb2RlckgyNjQubW0KKysrIGIvU291cmNlL1Ro aXJkUGFydHkvbGlid2VicnRjL1NvdXJjZS93ZWJydGMvc2RrL29iamMvRnJhbWV3b3JrL0NsYXNz ZXMvVmlkZW9Ub29sYm94L1JUQ1ZpZGVvRW5jb2RlckgyNjQubW0KQEAgLTM4LDYgKzM4LDM3IEBA CiAjaW5jbHVkZSAic2RrL1dlYktpdC9FbmNvZGVyVXRpbGl0aWVzLmgiCiAjaW5jbHVkZSAic2Rr L1dlYktpdC9XZWJLaXRVdGlsaXRpZXMuaCIKIAorI2lmICFFTkFCTEVfVkNQX0VOQ09ERVIgJiYg IWRlZmluZWQoV0VCUlRDX0lPUykKK1NPRlRfTElOS19GUkFNRVdPUktfT1BUSU9OQUwoVmlkZW9U b29sQm94KQorU09GVF9MSU5LX1BPSU5URVJfT1BUSU9OQUwoVmlkZW9Ub29sQm94LCBrVlRWaWRl b0VuY29kZXJTcGVjaWZpY2F0aW9uX1VzYWdlLCBOU1N0cmluZyAqKQorCitzdGF0aWMgaW5saW5l IGJvb2wgaXNTdGFuZGFyZEZyYW1lU2l6ZShpbnQzMl90IHdpZHRoLCBpbnQzMl90IGhlaWdodCkK K3sKKyAgICAvLyBGSVhNRTogRW52aXNpb24gcmVsYXhpbmcgdGhpcyBydWxlLCBzb21ldGhpbmcg bGlrZSB3aWR0aCBhbmQgaGVpZ2h0IGRpdmlkYWJsZSBieSA0IG9yIDggc2hvdWxkIGJlIGdvb2Qg ZW5vdWdoLgorICAgIGlmICh3aWR0aCA9PSAxMjgwKQorICAgICAgICByZXR1cm4gaGVpZ2h0ID09 IDcyMDsKKyAgICBpZiAod2lkdGggPT0gNzIwKQorICAgICAgICByZXR1cm4gaGVpZ2h0ID09IDEy ODA7CisgICAgaWYgKHdpZHRoID09IDk2MCkKKyAgICAgICAgcmV0dXJuIGhlaWdodCA9PSA1NDA7 CisgICAgaWYgKHdpZHRoID09IDU0MCkKKyAgICAgICAgcmV0dXJuIGhlaWdodCA9PSA5NjA7Cisg ICAgaWYgKHdpZHRoID09IDY0MCkKKyAgICAgICAgcmV0dXJuIGhlaWdodCA9PSA0ODA7CisgICAg aWYgKHdpZHRoID09IDQ4MCkKKyAgICAgICAgcmV0dXJuIGhlaWdodCA9PSA2NDA7CisgICAgaWYg KHdpZHRoID09IDI4OCkKKyAgICAgICAgcmV0dXJuIGhlaWdodCA9PSAzNTI7CisgICAgaWYgKHdp ZHRoID09IDM1MikKKyAgICAgICAgcmV0dXJuIGhlaWdodCA9PSAyODg7CisgICAgaWYgKHdpZHRo ID09IDMyMCkKKyAgICAgICAgcmV0dXJuIGhlaWdodCA9PSAyNDA7CisgICAgaWYgKHdpZHRoID09 IDI0MCkKKyAgICAgICAgcmV0dXJuIGhlaWdodCA9PSAzMjA7CisgICAgcmV0dXJuIGZhbHNlOwor fQorI2VuZGlmCisKIEBpbnRlcmZhY2UgUlRDVmlkZW9FbmNvZGVySDI2NCAoKQogCiAtICh2b2lk KWZyYW1lV2FzRW5jb2RlZDooT1NTdGF0dXMpc3RhdHVzCkBAIC02MTYsNiArNjQ3LDY4IEBAIC0g KGludClyZXNldENvbXByZXNzaW9uU2Vzc2lvbldpdGhQaXhlbEZvcm1hdDooT1NUeXBlKWZyYW1l UGl4ZWxGb3JtYXQgewogICAgIFJUQ19MT0coTFNfSU5GTykgPDwgIkNvbXByZXNzaW9uIHNlc3Np b24gY3JlYXRlZCB3aXRoIGh3IGFjY2wgZW5hYmxlZCI7CiAgIH0gZWxzZSB7CiAgICAgUlRDX0xP RyhMU19JTkZPKSA8PCAiQ29tcHJlc3Npb24gc2Vzc2lvbiBjcmVhdGVkIHdpdGggaHcgYWNjbCBk aXNhYmxlZCI7CisKKyNpZiAhRU5BQkxFX1ZDUF9FTkNPREVSICYmICFkZWZpbmVkKFdFQlJUQ19J T1MpCisgICAgaWYgKCFpc1N0YW5kYXJkRnJhbWVTaXplKF93aWR0aCwgX2hlaWdodCkpIHsKKyAg ICAgIFJUQ19MT0coTFNfRVJST1IpIDw8ICJVc2luZyBIMjY0IHNvZnR3YXJlIGVuY29kZXIgd2l0 aCBub24gc3RhbmRhcmQgc2l6ZSBpcyBub3Qgc3VwcG9ydGVkIjsKKyAgICAgIHJldHVybiBXRUJS VENfVklERU9fQ09ERUNfRVJST1I7CisgICAgfQorCisgICAgaWYgKCFnZXRrVlRWaWRlb0VuY29k ZXJTcGVjaWZpY2F0aW9uX1VzYWdlKCkpIHsKKyAgICAgIFJUQ19MT0coTFNfRVJST1IpIDw8ICJS VENWaWRlb0VuY29kZXJIMjY0IGNhbm5vdCBjcmVhdGUgYSBIMjY0IHNvZnR3YXJlIGVuY29kZXIi OworICAgICAgcmV0dXJuIFdFQlJUQ19WSURFT19DT0RFQ19FUlJPUjsKKyAgICB9CisKKyAgICBj b25zdCBzaXplX3QgYXR0cmlidXRlc1NpemUgPSAzOworICAgIENGVHlwZVJlZiBrZXlzW2F0dHJp YnV0ZXNTaXplXSA9IHsKKyAgICAgIGtDVlBpeGVsQnVmZmVyT3BlbkdMQ29tcGF0aWJpbGl0eUtl eSwKKyAgICAgIGtDVlBpeGVsQnVmZmVySU9TdXJmYWNlUHJvcGVydGllc0tleSwKKyAgICAgIGtD VlBpeGVsQnVmZmVyUGl4ZWxGb3JtYXRUeXBlS2V5CisgICAgfTsKKyAgICBDRkRpY3Rpb25hcnlS ZWYgaW9TdXJmYWNlVmFsdWUgPSBDcmVhdGVDRlR5cGVEaWN0aW9uYXJ5KG51bGxwdHIsIG51bGxw dHIsIDApOworICAgIGludDY0X3QgcGl4ZWxGb3JtYXRUeXBlID0gZnJhbWVQaXhlbEZvcm1hdDsK KyAgICBDRk51bWJlclJlZiBwaXhlbEZvcm1hdCA9IENGTnVtYmVyQ3JlYXRlKG51bGxwdHIsIGtD Rk51bWJlckxvbmdUeXBlLCAmcGl4ZWxGb3JtYXRUeXBlKTsKKyAgICBDRlR5cGVSZWYgdmFsdWVz W2F0dHJpYnV0ZXNTaXplXSA9IHtrQ0ZCb29sZWFuVHJ1ZSwgaW9TdXJmYWNlVmFsdWUsIHBpeGVs Rm9ybWF0fTsKKyAgICBDRkRpY3Rpb25hcnlSZWYgc291cmNlQXR0cmlidXRlcyA9IENyZWF0ZUNG VHlwZURpY3Rpb25hcnkoa2V5cywgdmFsdWVzLCBhdHRyaWJ1dGVzU2l6ZSk7CisgICAgaWYgKGlv U3VyZmFjZVZhbHVlKSB7CisgICAgICBDRlJlbGVhc2UoaW9TdXJmYWNlVmFsdWUpOworICAgICAg aW9TdXJmYWNlVmFsdWUgPSBudWxscHRyOworICAgIH0KKyAgICBpZiAocGl4ZWxGb3JtYXQpIHsK KyAgICAgIENGUmVsZWFzZShwaXhlbEZvcm1hdCk7CisgICAgICBwaXhlbEZvcm1hdCA9IG51bGxw dHI7CisgICAgfQorCisgICAgQ0ZNdXRhYmxlRGljdGlvbmFyeVJlZiBlbmNvZGVyX3NwZWNzID0g Q0ZEaWN0aW9uYXJ5Q3JlYXRlTXV0YWJsZSgKKyAgICAgICAgbnVsbHB0ciwgMiwgJmtDRlR5cGVE aWN0aW9uYXJ5S2V5Q2FsbEJhY2tzLCAma0NGVHlwZURpY3Rpb25hcnlWYWx1ZUNhbGxCYWNrcyk7 CisgICAgQ0ZEaWN0aW9uYXJ5U2V0VmFsdWUoZW5jb2Rlcl9zcGVjcywga1ZUVmlkZW9FbmNvZGVy U3BlY2lmaWNhdGlvbl9FbmFibGVIYXJkd2FyZUFjY2VsZXJhdGVkVmlkZW9FbmNvZGVyLCBrQ0ZC b29sZWFuRmFsc2UpOworICAgIENGRGljdGlvbmFyeVNldFZhbHVlKGVuY29kZXJfc3BlY3MsIGdl dGtWVFZpZGVvRW5jb2RlclNwZWNpZmljYXRpb25fVXNhZ2UoKSwgMSk7CisKKyAgICBkZXN0cm95 Q29tcHJlc3Npb25TZXNzaW9uKCk7CisKKyAgICBPU1N0YXR1cyBzdGF0dXMgPQorICAgICAgQ29t cHJlc3Npb25TZXNzaW9uQ3JlYXRlKG51bGxwdHIsICAvLyB1c2UgZGVmYXVsdCBhbGxvY2F0b3IK KyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIF93aWR0aCwKKyAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgIF9oZWlnaHQsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICBrQ29kZWNUeXBlSDI2NCwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGVu Y29kZXJfc3BlY3MsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBzb3VyY2VBdHRy aWJ1dGVzLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgbnVsbHB0ciwgIC8vIHVz ZSBkZWZhdWx0IGNvbXByZXNzZWQgZGF0YSBhbGxvY2F0b3IKKyAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgIGNvbXByZXNzaW9uT3V0cHV0Q2FsbGJhY2ssCisgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICBudWxscHRyLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgJl9jb21wcmVzc2lvblNlc3Npb24pOworICAgIGlmIChzb3VyY2VBdHRyaWJ1dGVzKSB7Cisg ICAgICBDRlJlbGVhc2Uoc291cmNlQXR0cmlidXRlcyk7CisgICAgICBzb3VyY2VBdHRyaWJ1dGVz ID0gbnVsbHB0cjsKKyAgICB9CisgICAgaWYgKGVuY29kZXJfc3BlY3MpIHsKKyAgICAgIENGUmVs ZWFzZShlbmNvZGVyX3NwZWNzKTsKKyAgICAgIGVuY29kZXJfc3BlY3MgPSBudWxscHRyOworICAg IH0KKyAgICBpZiAoc3RhdHVzICE9IG5vRXJyKSB7CisgICAgICByZXR1cm4gV0VCUlRDX1ZJREVP X0NPREVDX0VSUk9SOworICAgIH0KKyNlbmRpZgogICB9CiAjZW5kaWYKICAgW3NlbGYgY29uZmln dXJlQ29tcHJlc3Npb25TZXNzaW9uXTsK 336444 2018-03-23 17:02:51 -0700 2018-04-09 12:39:06 -0700 Patch bug-183961-20180323170250.patch text/plain 7674 youennf U3VidmVyc2lvbiBSZXZpc2lvbjogMjI5OTIzCmRpZmYgLS1naXQgYS9Tb3VyY2UvVGhpcmRQYXJ0 eS9saWJ3ZWJydGMvQ2hhbmdlTG9nIGIvU291cmNlL1RoaXJkUGFydHkvbGlid2VicnRjL0NoYW5n ZUxvZwppbmRleCA1NDU4MzI5NDQ2M2VkYWI3ZDcwY2YzMzgwYjlhYzE0ZjQ1NjEyNzE3Li45ZTRk ZTdiMDU1MTc4MGZmNzZiYzJlOTVkZjViNGFkNzY1M2M2MTVhIDEwMDY0NAotLS0gYS9Tb3VyY2Uv VGhpcmRQYXJ0eS9saWJ3ZWJydGMvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9UaGlyZFBhcnR5L2xp YndlYnJ0Yy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNiBAQAorMjAxOC0wMy0yMyAgWW91ZW5uIEZh YmxldCAgPHlvdWVubkBhcHBsZS5jb20+CisKKyAgICAgICAgVXNlIHNwZWNpYWwgc29mdHdhcmUg ZW5jb2RlciBtb2RlIGluIGNhc2UgdGhlcmUgaXMgbm8gVkNQIG5vdCBoYXJkd2FyZSBlbmNvZGVy CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xODM5NjEK KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBJbiBjYXNl IGEgY29tcHJlc3Npb24gc2Vzc2lvbiBpcyBub3QgdXNpbmcgYSBoYXJkd2FyZSBlbmNvZGVyIGFu ZCBWQ1AgaXMgbm90IGFjdGl2ZQorICAgICAgICB1c2UgYSBzcGVjaWZpYyBtb2RlIGlmIHRoZSBy ZXNvbHV0aW9uIGlzIHN0YW5kYXJkLgorCisgICAgICAgICogU291cmNlL3dlYnJ0Yy9zZGsvV2Vi S2l0L1ZpZGVvUHJvY2Vzc2luZ1NvZnRMaW5rLmNwcDoKKyAgICAgICAgKiBTb3VyY2Uvd2VicnRj L3Nkay9vYmpjL0ZyYW1ld29yay9DbGFzc2VzL1ZpZGVvVG9vbGJveC9SVENWaWRlb0VuY29kZXJI MjY0Lm1tOgorCiAyMDE4LTAzLTIzICBZb3Vlbm4gRmFibGV0ICA8eW91ZW5uQGFwcGxlLmNvbT4K IAogICAgICAgICBBZGQgc3VwcG9ydCBmb3IgVkNQIGVuY29kZXIgb24gTWFjT1MgYW5kIGlPUwpk aWZmIC0tZ2l0IGEvU291cmNlL1RoaXJkUGFydHkvbGlid2VicnRjL1NvdXJjZS93ZWJydGMvc2Rr L1dlYktpdC9WaWRlb1Byb2Nlc3NpbmdTb2Z0TGluay5oIGIvU291cmNlL1RoaXJkUGFydHkvbGli d2VicnRjL1NvdXJjZS93ZWJydGMvc2RrL1dlYktpdC9WaWRlb1Byb2Nlc3NpbmdTb2Z0TGluay5o CmluZGV4IDZkOGM2NTVlODdmNjBhOGNmMTE3ZDAzNDFjOTU4MTYyNDBiMGRiZjIuLmU1NjRiYzhi NjA1ZDljMzU3NTI2NWZhZDkxMjU2ZWIzOTc2NjJiYTUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9UaGly ZFBhcnR5L2xpYndlYnJ0Yy9Tb3VyY2Uvd2VicnRjL3Nkay9XZWJLaXQvVmlkZW9Qcm9jZXNzaW5n U29mdExpbmsuaAorKysgYi9Tb3VyY2UvVGhpcmRQYXJ0eS9saWJ3ZWJydGMvU291cmNlL3dlYnJ0 Yy9zZGsvV2ViS2l0L1ZpZGVvUHJvY2Vzc2luZ1NvZnRMaW5rLmgKQEAgLTM4LDEwICszOCw2IEBA CiAjZGVmaW5lIEVOQUJMRV9WQ1BfRU5DT0RFUiAoX19NQUNfT1NfWF9WRVJTSU9OX01BWF9BTExP V0VEID49IDEwMTMwNCkKICNlbmRpZgogCi0jaWYgRU5BQkxFX1ZDUF9FTkNPREVSCi0KLSNpbmNs dWRlIDxWaWRlb1Byb2Nlc3NpbmcvVmlkZW9Qcm9jZXNzaW5nLmg+Ci0KICNkZWZpbmUgQUxXQVlT X0lOTElORSBpbmxpbmUKIAogI2lmZGVmIF9fY3BsdXNwbHVzCkBAIC03OCw2ICs3NCwzNiBAQAog ICAgICAgICByZXR1cm4gZnVuY3Rpb25OYW1lc3BhY2U6OnNvZnRMaW5rIyNmcmFtZXdvcmsjI2Z1 bmN0aW9uTmFtZSBwYXJhbWV0ZXJOYW1lczsgXAogICAgIH0KIAorI2RlZmluZSBTT0ZUX0xJTktf RlJBTUVXT1JLX09QVElPTkFMKGZyYW1ld29yaykgXAorICAgIHN0YXRpYyB2b2lkKiBmcmFtZXdv cmsjI0xpYnJhcnkoKSBcCisgICAgeyBcCisgICAgICAgIHN0YXRpYyB2b2lkKiBmcmFtZXdvcmtM aWJyYXJ5ID0gZGxvcGVuKCIvU3lzdGVtL0xpYnJhcnkvRnJhbWV3b3Jrcy8iICNmcmFtZXdvcmsg Ii5mcmFtZXdvcmsvIiAjZnJhbWV3b3JrLCBSVExEX05PVyk7IFwKKyAgICAgICAgcmV0dXJuIGZy YW1ld29ya0xpYnJhcnk7IFwKKyAgICB9CisKKyNkZWZpbmUgU09GVF9MSU5LX1BPSU5URVJfT1BU SU9OQUwoZnJhbWV3b3JrLCBuYW1lLCB0eXBlKSBcCisgICAgc3RhdGljIHR5cGUgaW5pdCMjbmFt ZSgpOyBcCisgICAgc3RhdGljIHR5cGUgKCpnZXQjI25hbWUpKCkgPSBpbml0IyNuYW1lOyBcCisg ICAgc3RhdGljIHR5cGUgcG9pbnRlciMjbmFtZTsgXAorICAgIFwKKyAgICBzdGF0aWMgdHlwZSBu YW1lIyNGdW5jdGlvbigpIFwKKyAgICB7IFwKKyAgICAgICAgcmV0dXJuIHBvaW50ZXIjI25hbWU7 IFwKKyAgICB9IFwKKyAgICBcCisgICAgc3RhdGljIHR5cGUgaW5pdCMjbmFtZSgpIFwKKyAgICB7 IFwKKyAgICAgICAgdm9pZCoqIHBvaW50ZXIgPSBzdGF0aWNfY2FzdDx2b2lkKio+KGRsc3ltKGZy YW1ld29yayMjTGlicmFyeSgpLCAjbmFtZSkpOyBcCisgICAgICAgIGlmIChwb2ludGVyKSBcCisg ICAgICAgICAgICBwb2ludGVyIyNuYW1lID0gc3RhdGljX2Nhc3Q8dHlwZT4oKnBvaW50ZXIpOyBc CisgICAgICAgIGdldCMjbmFtZSA9IG5hbWUjI0Z1bmN0aW9uOyBcCisgICAgICAgIHJldHVybiBw b2ludGVyIyNuYW1lOyBcCisgICAgfQorCisjaWYgRU5BQkxFX1ZDUF9FTkNPREVSCisKKyNpbmNs dWRlIDxWaWRlb1Byb2Nlc3NpbmcvVmlkZW9Qcm9jZXNzaW5nLmg+CisKIFNPRlRfTElOS19GUkFN RVdPUktfRk9SX0hFQURFUih3ZWJydGMsIFZpZGVvUHJvY2Vzc2luZykKIAogU09GVF9MSU5LX0ZV TkNUSU9OX0ZPUl9IRUFERVIod2VicnRjLCBWaWRlb1Byb2Nlc3NpbmcsIFZDUENvbXByZXNzaW9u U2Vzc2lvblNldFByb3BlcnR5LCBPU1N0YXR1cywgKFZDUENvbXByZXNzaW9uU2Vzc2lvblJlZiBz ZXNzaW9uLCBDRlN0cmluZ1JlZiBrZXksIENGVHlwZVJlZiB2YWx1ZSksIChzZXNzaW9uLCBrZXks IHZhbHVlKSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9UaGlyZFBhcnR5L2xpYndlYnJ0Yy9Tb3VyY2Uv d2VicnRjL3Nkay9vYmpjL0ZyYW1ld29yay9DbGFzc2VzL1ZpZGVvVG9vbGJveC9SVENWaWRlb0Vu Y29kZXJIMjY0Lm1tIGIvU291cmNlL1RoaXJkUGFydHkvbGlid2VicnRjL1NvdXJjZS93ZWJydGMv c2RrL29iamMvRnJhbWV3b3JrL0NsYXNzZXMvVmlkZW9Ub29sYm94L1JUQ1ZpZGVvRW5jb2Rlckgy NjQubW0KaW5kZXggOGMyN2U3NjY3Y2Q1YjZlYWMyOTVmMTM4NDU0NjgyYWE3OWVlYmI0NC4uZTZj OGRhNTQ1N2U2YWVlYjlmZTAzZDM5NjY4NmFjNDM4YmFlNzY5MiAxMDA2NDQKLS0tIGEvU291cmNl L1RoaXJkUGFydHkvbGlid2VicnRjL1NvdXJjZS93ZWJydGMvc2RrL29iamMvRnJhbWV3b3JrL0Ns YXNzZXMvVmlkZW9Ub29sYm94L1JUQ1ZpZGVvRW5jb2RlckgyNjQubW0KKysrIGIvU291cmNlL1Ro aXJkUGFydHkvbGlid2VicnRjL1NvdXJjZS93ZWJydGMvc2RrL29iamMvRnJhbWV3b3JrL0NsYXNz ZXMvVmlkZW9Ub29sYm94L1JUQ1ZpZGVvRW5jb2RlckgyNjQubW0KQEAgLTM4LDYgKzM4LDQwIEBA CiAjaW5jbHVkZSAic2RrL1dlYktpdC9FbmNvZGVyVXRpbGl0aWVzLmgiCiAjaW5jbHVkZSAic2Rr L1dlYktpdC9XZWJLaXRVdGlsaXRpZXMuaCIKIAorI2lmICFFTkFCTEVfVkNQX0VOQ09ERVIgJiYg IWRlZmluZWQoV0VCUlRDX0lPUykKKyNpbXBvcnQgPGRsZmNuLmg+CisjaW1wb3J0IDxvYmpjL3J1 bnRpbWUuaD4KKworU09GVF9MSU5LX0ZSQU1FV09SS19PUFRJT05BTChWaWRlb1Rvb2xCb3gpCitT T0ZUX0xJTktfUE9JTlRFUl9PUFRJT05BTChWaWRlb1Rvb2xCb3gsIGtWVFZpZGVvRW5jb2RlclNw ZWNpZmljYXRpb25fVXNhZ2UsIE5TU3RyaW5nICopCisKK3N0YXRpYyBpbmxpbmUgYm9vbCBpc1N0 YW5kYXJkRnJhbWVTaXplKGludDMyX3Qgd2lkdGgsIGludDMyX3QgaGVpZ2h0KQoreworICAgIC8v IEZJWE1FOiBFbnZpc2lvbiByZWxheGluZyB0aGlzIHJ1bGUsIHNvbWV0aGluZyBsaWtlIHdpZHRo IGFuZCBoZWlnaHQgZGl2aWRhYmxlIGJ5IDQgb3IgOCBzaG91bGQgYmUgZ29vZCBlbm91Z2guCisg ICAgaWYgKHdpZHRoID09IDEyODApCisgICAgICAgIHJldHVybiBoZWlnaHQgPT0gNzIwOworICAg IGlmICh3aWR0aCA9PSA3MjApCisgICAgICAgIHJldHVybiBoZWlnaHQgPT0gMTI4MDsKKyAgICBp ZiAod2lkdGggPT0gOTYwKQorICAgICAgICByZXR1cm4gaGVpZ2h0ID09IDU0MDsKKyAgICBpZiAo d2lkdGggPT0gNTQwKQorICAgICAgICByZXR1cm4gaGVpZ2h0ID09IDk2MDsKKyAgICBpZiAod2lk dGggPT0gNjQwKQorICAgICAgICByZXR1cm4gaGVpZ2h0ID09IDQ4MDsKKyAgICBpZiAod2lkdGgg PT0gNDgwKQorICAgICAgICByZXR1cm4gaGVpZ2h0ID09IDY0MDsKKyAgICBpZiAod2lkdGggPT0g Mjg4KQorICAgICAgICByZXR1cm4gaGVpZ2h0ID09IDM1MjsKKyAgICBpZiAod2lkdGggPT0gMzUy KQorICAgICAgICByZXR1cm4gaGVpZ2h0ID09IDI4ODsKKyAgICBpZiAod2lkdGggPT0gMzIwKQor ICAgICAgICByZXR1cm4gaGVpZ2h0ID09IDI0MDsKKyAgICBpZiAod2lkdGggPT0gMjQwKQorICAg ICAgICByZXR1cm4gaGVpZ2h0ID09IDMyMDsKKyAgICByZXR1cm4gZmFsc2U7Cit9CisjZW5kaWYK KwogQGludGVyZmFjZSBSVENWaWRlb0VuY29kZXJIMjY0ICgpCiAKIC0gKHZvaWQpZnJhbWVXYXNF bmNvZGVkOihPU1N0YXR1cylzdGF0dXMKQEAgLTYxNiw2ICs2NTAsNzQgQEAgLSAoaW50KXJlc2V0 Q29tcHJlc3Npb25TZXNzaW9uV2l0aFBpeGVsRm9ybWF0OihPU1R5cGUpZnJhbWVQaXhlbEZvcm1h dCB7CiAgICAgUlRDX0xPRyhMU19JTkZPKSA8PCAiQ29tcHJlc3Npb24gc2Vzc2lvbiBjcmVhdGVk IHdpdGggaHcgYWNjbCBlbmFibGVkIjsKICAgfSBlbHNlIHsKICAgICBSVENfTE9HKExTX0lORk8p IDw8ICJDb21wcmVzc2lvbiBzZXNzaW9uIGNyZWF0ZWQgd2l0aCBodyBhY2NsIGRpc2FibGVkIjsK KworI2lmICFFTkFCTEVfVkNQX0VOQ09ERVIgJiYgIWRlZmluZWQoV0VCUlRDX0lPUykKKyAgICBp ZiAoIWlzU3RhbmRhcmRGcmFtZVNpemUoX3dpZHRoLCBfaGVpZ2h0KSkgeworICAgICAgUlRDX0xP RyhMU19FUlJPUikgPDwgIlVzaW5nIEgyNjQgc29mdHdhcmUgZW5jb2RlciB3aXRoIG5vbiBzdGFu ZGFyZCBzaXplIGlzIG5vdCBzdXBwb3J0ZWQiOworICAgICAgcmV0dXJuIFdFQlJUQ19WSURFT19D T0RFQ19FUlJPUjsKKyAgICB9CisKKyAgICBpZiAoIWdldGtWVFZpZGVvRW5jb2RlclNwZWNpZmlj YXRpb25fVXNhZ2UoKSkgeworICAgICAgUlRDX0xPRyhMU19FUlJPUikgPDwgIlJUQ1ZpZGVvRW5j b2RlckgyNjQgY2Fubm90IGNyZWF0ZSBhIEgyNjQgc29mdHdhcmUgZW5jb2RlciI7CisgICAgICBy ZXR1cm4gV0VCUlRDX1ZJREVPX0NPREVDX0VSUk9SOworICAgIH0KKworICAgIGNvbnN0IHNpemVf dCBhdHRyaWJ1dGVzU2l6ZSA9IDM7CisgICAgQ0ZUeXBlUmVmIGtleXNbYXR0cmlidXRlc1NpemVd ID0geworICAgICAga0NWUGl4ZWxCdWZmZXJPcGVuR0xDb21wYXRpYmlsaXR5S2V5LAorICAgICAg a0NWUGl4ZWxCdWZmZXJJT1N1cmZhY2VQcm9wZXJ0aWVzS2V5LAorICAgICAga0NWUGl4ZWxCdWZm ZXJQaXhlbEZvcm1hdFR5cGVLZXkKKyAgICB9OworICAgIENGRGljdGlvbmFyeVJlZiBpb1N1cmZh Y2VWYWx1ZSA9IENyZWF0ZUNGVHlwZURpY3Rpb25hcnkobnVsbHB0ciwgbnVsbHB0ciwgMCk7Cisg ICAgaW50NjRfdCBwaXhlbEZvcm1hdFR5cGUgPSBmcmFtZVBpeGVsRm9ybWF0OworICAgIENGTnVt YmVyUmVmIHBpeGVsRm9ybWF0ID0gQ0ZOdW1iZXJDcmVhdGUobnVsbHB0ciwga0NGTnVtYmVyTG9u Z1R5cGUsICZwaXhlbEZvcm1hdFR5cGUpOworICAgIENGVHlwZVJlZiB2YWx1ZXNbYXR0cmlidXRl c1NpemVdID0ge2tDRkJvb2xlYW5UcnVlLCBpb1N1cmZhY2VWYWx1ZSwgcGl4ZWxGb3JtYXR9Owor ICAgIENGRGljdGlvbmFyeVJlZiBzb3VyY2VBdHRyaWJ1dGVzID0gQ3JlYXRlQ0ZUeXBlRGljdGlv bmFyeShrZXlzLCB2YWx1ZXMsIGF0dHJpYnV0ZXNTaXplKTsKKyAgICBpZiAoaW9TdXJmYWNlVmFs dWUpIHsKKyAgICAgIENGUmVsZWFzZShpb1N1cmZhY2VWYWx1ZSk7CisgICAgICBpb1N1cmZhY2VW YWx1ZSA9IG51bGxwdHI7CisgICAgfQorICAgIGlmIChwaXhlbEZvcm1hdCkgeworICAgICAgQ0ZS ZWxlYXNlKHBpeGVsRm9ybWF0KTsKKyAgICAgIHBpeGVsRm9ybWF0ID0gbnVsbHB0cjsKKyAgICB9 CisKKyAgICBDRk11dGFibGVEaWN0aW9uYXJ5UmVmIGVuY29kZXJfc3BlY3MgPSBDRkRpY3Rpb25h cnlDcmVhdGVNdXRhYmxlKAorICAgICAgICBudWxscHRyLCAyLCAma0NGVHlwZURpY3Rpb25hcnlL ZXlDYWxsQmFja3MsICZrQ0ZUeXBlRGljdGlvbmFyeVZhbHVlQ2FsbEJhY2tzKTsKKyAgICBDRkRp Y3Rpb25hcnlTZXRWYWx1ZShlbmNvZGVyX3NwZWNzLCBrVlRWaWRlb0VuY29kZXJTcGVjaWZpY2F0 aW9uX0VuYWJsZUhhcmR3YXJlQWNjZWxlcmF0ZWRWaWRlb0VuY29kZXIsIGtDRkJvb2xlYW5GYWxz ZSk7CisgICAgaW50IHVzYWdlVmFsdWUgPSAxOworICAgIENGTnVtYmVyUmVmIHVzYWdlID0gQ0ZO dW1iZXJDcmVhdGUobnVsbHB0ciwga0NGTnVtYmVySW50VHlwZSwgJnVzYWdlVmFsdWUpOworICAg IENGRGljdGlvbmFyeVNldFZhbHVlKGVuY29kZXJfc3BlY3MsIGdldGtWVFZpZGVvRW5jb2RlclNw ZWNpZmljYXRpb25fVXNhZ2UoKSwgdXNhZ2UpOworICAgIGlmICh1c2FnZSkgeworICAgICAgICBD RlJlbGVhc2UodXNhZ2UpOworICAgICAgICB1c2FnZSA9IG51bGxwdHI7CisgICAgfQorCisgICAg W3NlbGYgZGVzdHJveUNvbXByZXNzaW9uU2Vzc2lvbl07CisKKyAgICBPU1N0YXR1cyBzdGF0dXMg PQorICAgICAgQ29tcHJlc3Npb25TZXNzaW9uQ3JlYXRlKG51bGxwdHIsICAvLyB1c2UgZGVmYXVs dCBhbGxvY2F0b3IKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIF93aWR0aCwKKyAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIF9oZWlnaHQsCisgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICBrQ29kZWNUeXBlSDI2NCwKKyAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgIGVuY29kZXJfc3BlY3MsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICBzb3VyY2VBdHRyaWJ1dGVzLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgbnVs bHB0ciwgIC8vIHVzZSBkZWZhdWx0IGNvbXByZXNzZWQgZGF0YSBhbGxvY2F0b3IKKyAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgIGNvbXByZXNzaW9uT3V0cHV0Q2FsbGJhY2ssCisgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICBudWxscHRyLAorICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgJl9jb21wcmVzc2lvblNlc3Npb24pOworICAgIGlmIChzb3VyY2VBdHRy aWJ1dGVzKSB7CisgICAgICBDRlJlbGVhc2Uoc291cmNlQXR0cmlidXRlcyk7CisgICAgICBzb3Vy Y2VBdHRyaWJ1dGVzID0gbnVsbHB0cjsKKyAgICB9CisgICAgaWYgKGVuY29kZXJfc3BlY3MpIHsK KyAgICAgIENGUmVsZWFzZShlbmNvZGVyX3NwZWNzKTsKKyAgICAgIGVuY29kZXJfc3BlY3MgPSBu dWxscHRyOworICAgIH0KKyAgICBpZiAoc3RhdHVzICE9IG5vRXJyKSB7CisgICAgICByZXR1cm4g V0VCUlRDX1ZJREVPX0NPREVDX0VSUk9SOworICAgIH0KKyNlbmRpZgogICB9CiAjZW5kaWYKICAg W3NlbGYgY29uZmlndXJlQ29tcHJlc3Npb25TZXNzaW9uXTsK 337526 2018-04-09 12:39:10 -0700 2018-04-09 14:10:00 -0700 Patch for landing bug-183961-20180409123909.patch text/plain 7633 youennf U3VidmVyc2lvbiBSZXZpc2lvbjogMjMwMzg4CmRpZmYgLS1naXQgYS9Tb3VyY2UvVGhpcmRQYXJ0 eS9saWJ3ZWJydGMvQ2hhbmdlTG9nIGIvU291cmNlL1RoaXJkUGFydHkvbGlid2VicnRjL0NoYW5n ZUxvZwppbmRleCBjYzcyMmU2YWYzMzE1MTY3MjU0NGZlMWY3NTgwZTRlMjBhNWQzYTIzLi5kOTY1 OTIxYzQxMDdkODY2OWJiNTFhMTZlOWFlZjliMjczOGEwMmM1IDEwMDY0NAotLS0gYS9Tb3VyY2Uv VGhpcmRQYXJ0eS9saWJ3ZWJydGMvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9UaGlyZFBhcnR5L2xp YndlYnJ0Yy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNiBAQAorMjAxOC0wNC0wOSAgWW91ZW5uIEZh YmxldCAgPHlvdWVubkBhcHBsZS5jb20+CisKKyAgICAgICAgVXNlIHNwZWNpYWwgc29mdHdhcmUg ZW5jb2RlciBtb2RlIGluIGNhc2UgdGhlcmUgaXMgbm8gVkNQIG5vdCBoYXJkd2FyZSBlbmNvZGVy CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xODM5NjEK KworICAgICAgICBSZXZpZXdlZCBieSBFcmljIENhcmxzb24uCisKKyAgICAgICAgSW4gY2FzZSBh IGNvbXByZXNzaW9uIHNlc3Npb24gaXMgbm90IHVzaW5nIGEgaGFyZHdhcmUgZW5jb2RlciBhbmQg VkNQIGlzIG5vdCBhY3RpdmUKKyAgICAgICAgdXNlIGEgc3BlY2lmaWMgbW9kZSBpZiB0aGUgcmVz b2x1dGlvbiBpcyBzdGFuZGFyZC4KKworICAgICAgICAqIFNvdXJjZS93ZWJydGMvc2RrL1dlYktp dC9WaWRlb1Byb2Nlc3NpbmdTb2Z0TGluay5jcHA6CisgICAgICAgICogU291cmNlL3dlYnJ0Yy9z ZGsvb2JqYy9GcmFtZXdvcmsvQ2xhc3Nlcy9WaWRlb1Rvb2xib3gvUlRDVmlkZW9FbmNvZGVySDI2 NC5tbToKKwogMjAxOC0wNC0wNSAgQWxlamFuZHJvIEcuIENhc3RybyAgPGFsZXhAaWdhbGlhLmNv bT4KIAogICAgICAgICBbR1RLXSBBZGQgQ01ha2UgcGFja2FnZSBzZWFyY2ggZm9yIHZweCBhbmQg bGliZXZlbnQgbGlicmFyaWVzCmRpZmYgLS1naXQgYS9Tb3VyY2UvVGhpcmRQYXJ0eS9saWJ3ZWJy dGMvU291cmNlL3dlYnJ0Yy9zZGsvV2ViS2l0L1ZpZGVvUHJvY2Vzc2luZ1NvZnRMaW5rLmggYi9T b3VyY2UvVGhpcmRQYXJ0eS9saWJ3ZWJydGMvU291cmNlL3dlYnJ0Yy9zZGsvV2ViS2l0L1ZpZGVv UHJvY2Vzc2luZ1NvZnRMaW5rLmgKaW5kZXggODYwYTUzZmI3Y2YyNjAyMDIzMDVjMjg5ZTQwZTNj ODIwMjg5NmU3ZC4uYzFlNWVjNmVhYjhkNzdkYTNlN2E3MTRmMjg0MWZhZDJkZGJlYzZlYiAxMDA2 NDQKLS0tIGEvU291cmNlL1RoaXJkUGFydHkvbGlid2VicnRjL1NvdXJjZS93ZWJydGMvc2RrL1dl YktpdC9WaWRlb1Byb2Nlc3NpbmdTb2Z0TGluay5oCisrKyBiL1NvdXJjZS9UaGlyZFBhcnR5L2xp YndlYnJ0Yy9Tb3VyY2Uvd2VicnRjL3Nkay9XZWJLaXQvVmlkZW9Qcm9jZXNzaW5nU29mdExpbmsu aApAQCAtNDMsMTAgKzQzLDYgQEAKIAogI2VuZGlmCiAKLSNpZiBFTkFCTEVfVkNQX0VOQ09ERVIK LQotI2luY2x1ZGUgPFZpZGVvUHJvY2Vzc2luZy9WaWRlb1Byb2Nlc3NpbmcuaD4KLQogI2RlZmlu ZSBBTFdBWVNfSU5MSU5FIGlubGluZQogCiAjaWZkZWYgX19jcGx1c3BsdXMKQEAgLTgzLDYgKzc5 LDM2IEBACiAgICAgICAgIHJldHVybiBmdW5jdGlvbk5hbWVzcGFjZTo6c29mdExpbmsjI2ZyYW1l d29yayMjZnVuY3Rpb25OYW1lIHBhcmFtZXRlck5hbWVzOyBcCiAgICAgfQogCisjZGVmaW5lIFNP RlRfTElOS19GUkFNRVdPUktfT1BUSU9OQUwoZnJhbWV3b3JrKSBcCisgICAgc3RhdGljIHZvaWQq IGZyYW1ld29yayMjTGlicmFyeSgpIFwKKyAgICB7IFwKKyAgICAgICAgc3RhdGljIHZvaWQqIGZy YW1ld29ya0xpYnJhcnkgPSBkbG9wZW4oIi9TeXN0ZW0vTGlicmFyeS9GcmFtZXdvcmtzLyIgI2Zy YW1ld29yayAiLmZyYW1ld29yay8iICNmcmFtZXdvcmssIFJUTERfTk9XKTsgXAorICAgICAgICBy ZXR1cm4gZnJhbWV3b3JrTGlicmFyeTsgXAorICAgIH0KKworI2RlZmluZSBTT0ZUX0xJTktfUE9J TlRFUl9PUFRJT05BTChmcmFtZXdvcmssIG5hbWUsIHR5cGUpIFwKKyAgICBzdGF0aWMgdHlwZSBp bml0IyNuYW1lKCk7IFwKKyAgICBzdGF0aWMgdHlwZSAoKmdldCMjbmFtZSkoKSA9IGluaXQjI25h bWU7IFwKKyAgICBzdGF0aWMgdHlwZSBwb2ludGVyIyNuYW1lOyBcCisgICAgXAorICAgIHN0YXRp YyB0eXBlIG5hbWUjI0Z1bmN0aW9uKCkgXAorICAgIHsgXAorICAgICAgICByZXR1cm4gcG9pbnRl ciMjbmFtZTsgXAorICAgIH0gXAorICAgIFwKKyAgICBzdGF0aWMgdHlwZSBpbml0IyNuYW1lKCkg XAorICAgIHsgXAorICAgICAgICB2b2lkKiogcG9pbnRlciA9IHN0YXRpY19jYXN0PHZvaWQqKj4o ZGxzeW0oZnJhbWV3b3JrIyNMaWJyYXJ5KCksICNuYW1lKSk7IFwKKyAgICAgICAgaWYgKHBvaW50 ZXIpIFwKKyAgICAgICAgICAgIHBvaW50ZXIjI25hbWUgPSBzdGF0aWNfY2FzdDx0eXBlPigqcG9p bnRlcik7IFwKKyAgICAgICAgZ2V0IyNuYW1lID0gbmFtZSMjRnVuY3Rpb247IFwKKyAgICAgICAg cmV0dXJuIHBvaW50ZXIjI25hbWU7IFwKKyAgICB9CisKKyNpZiBFTkFCTEVfVkNQX0VOQ09ERVIK KworI2luY2x1ZGUgPFZpZGVvUHJvY2Vzc2luZy9WaWRlb1Byb2Nlc3NpbmcuaD4KKwogU09GVF9M SU5LX0ZSQU1FV09SS19GT1JfSEVBREVSKHdlYnJ0YywgVmlkZW9Qcm9jZXNzaW5nKQogCiBTT0ZU X0xJTktfRlVOQ1RJT05fRk9SX0hFQURFUih3ZWJydGMsIFZpZGVvUHJvY2Vzc2luZywgVkNQQ29t cHJlc3Npb25TZXNzaW9uU2V0UHJvcGVydHksIE9TU3RhdHVzLCAoVkNQQ29tcHJlc3Npb25TZXNz aW9uUmVmIHNlc3Npb24sIENGU3RyaW5nUmVmIGtleSwgQ0ZUeXBlUmVmIHZhbHVlKSwgKHNlc3Np b24sIGtleSwgdmFsdWUpKQpkaWZmIC0tZ2l0IGEvU291cmNlL1RoaXJkUGFydHkvbGlid2VicnRj L1NvdXJjZS93ZWJydGMvc2RrL29iamMvRnJhbWV3b3JrL0NsYXNzZXMvVmlkZW9Ub29sYm94L1JU Q1ZpZGVvRW5jb2RlckgyNjQubW0gYi9Tb3VyY2UvVGhpcmRQYXJ0eS9saWJ3ZWJydGMvU291cmNl L3dlYnJ0Yy9zZGsvb2JqYy9GcmFtZXdvcmsvQ2xhc3Nlcy9WaWRlb1Rvb2xib3gvUlRDVmlkZW9F bmNvZGVySDI2NC5tbQppbmRleCA4YzI3ZTc2NjdjZDViNmVhYzI5NWYxMzg0NTQ2ODJhYTc5ZWVi YjQ0Li5kOWExZjc5NGI1ZjRmZjc2N2Q5YzBkMGJkYzQ4YjAxY2VmYmFhYjM5IDEwMDY0NAotLS0g YS9Tb3VyY2UvVGhpcmRQYXJ0eS9saWJ3ZWJydGMvU291cmNlL3dlYnJ0Yy9zZGsvb2JqYy9GcmFt ZXdvcmsvQ2xhc3Nlcy9WaWRlb1Rvb2xib3gvUlRDVmlkZW9FbmNvZGVySDI2NC5tbQorKysgYi9T b3VyY2UvVGhpcmRQYXJ0eS9saWJ3ZWJydGMvU291cmNlL3dlYnJ0Yy9zZGsvb2JqYy9GcmFtZXdv cmsvQ2xhc3Nlcy9WaWRlb1Rvb2xib3gvUlRDVmlkZW9FbmNvZGVySDI2NC5tbQpAQCAtMzgsNiAr MzgsNDAgQEAKICNpbmNsdWRlICJzZGsvV2ViS2l0L0VuY29kZXJVdGlsaXRpZXMuaCIKICNpbmNs dWRlICJzZGsvV2ViS2l0L1dlYktpdFV0aWxpdGllcy5oIgogCisjaWYgIUVOQUJMRV9WQ1BfRU5D T0RFUiAmJiAhZGVmaW5lZChXRUJSVENfSU9TKQorI2ltcG9ydCA8ZGxmY24uaD4KKyNpbXBvcnQg PG9iamMvcnVudGltZS5oPgorCitTT0ZUX0xJTktfRlJBTUVXT1JLX09QVElPTkFMKFZpZGVvVG9v bEJveCkKK1NPRlRfTElOS19QT0lOVEVSX09QVElPTkFMKFZpZGVvVG9vbEJveCwga1ZUVmlkZW9F bmNvZGVyU3BlY2lmaWNhdGlvbl9Vc2FnZSwgTlNTdHJpbmcgKikKKworc3RhdGljIGlubGluZSBi b29sIGlzU3RhbmRhcmRGcmFtZVNpemUoaW50MzJfdCB3aWR0aCwgaW50MzJfdCBoZWlnaHQpCit7 CisgICAgLy8gRklYTUU6IEVudmlzaW9uIHJlbGF4aW5nIHRoaXMgcnVsZSwgc29tZXRoaW5nIGxp a2Ugd2lkdGggYW5kIGhlaWdodCBkaXZpZGFibGUgYnkgNCBvciA4IHNob3VsZCBiZSBnb29kIGVu b3VnaC4KKyAgICBpZiAod2lkdGggPT0gMTI4MCkKKyAgICAgICAgcmV0dXJuIGhlaWdodCA9PSA3 MjA7CisgICAgaWYgKHdpZHRoID09IDcyMCkKKyAgICAgICAgcmV0dXJuIGhlaWdodCA9PSAxMjgw OworICAgIGlmICh3aWR0aCA9PSA5NjApCisgICAgICAgIHJldHVybiBoZWlnaHQgPT0gNTQwOwor ICAgIGlmICh3aWR0aCA9PSA1NDApCisgICAgICAgIHJldHVybiBoZWlnaHQgPT0gOTYwOworICAg IGlmICh3aWR0aCA9PSA2NDApCisgICAgICAgIHJldHVybiBoZWlnaHQgPT0gNDgwOworICAgIGlm ICh3aWR0aCA9PSA0ODApCisgICAgICAgIHJldHVybiBoZWlnaHQgPT0gNjQwOworICAgIGlmICh3 aWR0aCA9PSAyODgpCisgICAgICAgIHJldHVybiBoZWlnaHQgPT0gMzUyOworICAgIGlmICh3aWR0 aCA9PSAzNTIpCisgICAgICAgIHJldHVybiBoZWlnaHQgPT0gMjg4OworICAgIGlmICh3aWR0aCA9 PSAzMjApCisgICAgICAgIHJldHVybiBoZWlnaHQgPT0gMjQwOworICAgIGlmICh3aWR0aCA9PSAy NDApCisgICAgICAgIHJldHVybiBoZWlnaHQgPT0gMzIwOworICAgIHJldHVybiBmYWxzZTsKK30K KyNlbmRpZgorCiBAaW50ZXJmYWNlIFJUQ1ZpZGVvRW5jb2RlckgyNjQgKCkKIAogLSAodm9pZClm cmFtZVdhc0VuY29kZWQ6KE9TU3RhdHVzKXN0YXR1cwpAQCAtNjE2LDYgKzY1MCw3OCBAQCAtIChp bnQpcmVzZXRDb21wcmVzc2lvblNlc3Npb25XaXRoUGl4ZWxGb3JtYXQ6KE9TVHlwZSlmcmFtZVBp eGVsRm9ybWF0IHsKICAgICBSVENfTE9HKExTX0lORk8pIDw8ICJDb21wcmVzc2lvbiBzZXNzaW9u IGNyZWF0ZWQgd2l0aCBodyBhY2NsIGVuYWJsZWQiOwogICB9IGVsc2UgewogICAgIFJUQ19MT0co TFNfSU5GTykgPDwgIkNvbXByZXNzaW9uIHNlc3Npb24gY3JlYXRlZCB3aXRoIGh3IGFjY2wgZGlz YWJsZWQiOworCisjaWYgIUVOQUJMRV9WQ1BfRU5DT0RFUiAmJiAhZGVmaW5lZChXRUJSVENfSU9T KQorICAgIGlmICghaXNTdGFuZGFyZEZyYW1lU2l6ZShfd2lkdGgsIF9oZWlnaHQpKSB7CisgICAg ICBSVENfTE9HKExTX0VSUk9SKSA8PCAiVXNpbmcgSDI2NCBzb2Z0d2FyZSBlbmNvZGVyIHdpdGgg bm9uIHN0YW5kYXJkIHNpemUgaXMgbm90IHN1cHBvcnRlZCI7CisgICAgICByZXR1cm4gV0VCUlRD X1ZJREVPX0NPREVDX0VSUk9SOworICAgIH0KKworICAgIGlmICghZ2V0a1ZUVmlkZW9FbmNvZGVy U3BlY2lmaWNhdGlvbl9Vc2FnZSgpKSB7CisgICAgICBSVENfTE9HKExTX0VSUk9SKSA8PCAiUlRD VmlkZW9FbmNvZGVySDI2NCBjYW5ub3QgY3JlYXRlIGEgSDI2NCBzb2Z0d2FyZSBlbmNvZGVyIjsK KyAgICAgIHJldHVybiBXRUJSVENfVklERU9fQ09ERUNfRVJST1I7CisgICAgfQorCisgICAgQ0ZE aWN0aW9uYXJ5UmVmIGlvU3VyZmFjZVZhbHVlID0gQ3JlYXRlQ0ZUeXBlRGljdGlvbmFyeShudWxs cHRyLCBudWxscHRyLCAwKTsKKyAgICBpbnQ2NF90IHBpeGVsRm9ybWF0VHlwZSA9IGZyYW1lUGl4 ZWxGb3JtYXQ7CisgICAgQ0ZOdW1iZXJSZWYgcGl4ZWxGb3JtYXQgPSBDRk51bWJlckNyZWF0ZShu dWxscHRyLCBrQ0ZOdW1iZXJMb25nVHlwZSwgJnBpeGVsRm9ybWF0VHlwZSk7CisKKyAgICBjb25z dCBzaXplX3QgYXR0cmlidXRlc1NpemUgPSAzOworICAgIENGVHlwZVJlZiBrZXlzW2F0dHJpYnV0 ZXNTaXplXSA9IHsKKyAgICAgIGtDVlBpeGVsQnVmZmVyT3BlbkdMQ29tcGF0aWJpbGl0eUtleSwK KyAgICAgIGtDVlBpeGVsQnVmZmVySU9TdXJmYWNlUHJvcGVydGllc0tleSwKKyAgICAgIGtDVlBp eGVsQnVmZmVyUGl4ZWxGb3JtYXRUeXBlS2V5CisgICAgfTsKKyAgICBDRlR5cGVSZWYgdmFsdWVz W2F0dHJpYnV0ZXNTaXplXSA9IHsKKyAgICAgIGtDRkJvb2xlYW5UcnVlLAorICAgICAgaW9TdXJm YWNlVmFsdWUsCisgICAgICBwaXhlbEZvcm1hdH07CisgICAgQ0ZEaWN0aW9uYXJ5UmVmIHNvdXJj ZUF0dHJpYnV0ZXMgPSBDcmVhdGVDRlR5cGVEaWN0aW9uYXJ5KGtleXMsIHZhbHVlcywgYXR0cmli dXRlc1NpemUpOworCisgICAgaWYgKGlvU3VyZmFjZVZhbHVlKSB7CisgICAgICBDRlJlbGVhc2Uo aW9TdXJmYWNlVmFsdWUpOworICAgICAgaW9TdXJmYWNlVmFsdWUgPSBudWxscHRyOworICAgIH0K KyAgICBpZiAocGl4ZWxGb3JtYXQpIHsKKyAgICAgIENGUmVsZWFzZShwaXhlbEZvcm1hdCk7Cisg ICAgICBwaXhlbEZvcm1hdCA9IG51bGxwdHI7CisgICAgfQorCisgICAgQ0ZNdXRhYmxlRGljdGlv bmFyeVJlZiBlbmNvZGVyU3BlY3MgPSBDRkRpY3Rpb25hcnlDcmVhdGVNdXRhYmxlKG51bGxwdHIs IDIsICZrQ0ZUeXBlRGljdGlvbmFyeUtleUNhbGxCYWNrcywgJmtDRlR5cGVEaWN0aW9uYXJ5VmFs dWVDYWxsQmFja3MpOworICAgIENGRGljdGlvbmFyeVNldFZhbHVlKGVuY29kZXJTcGVjcywga1ZU VmlkZW9FbmNvZGVyU3BlY2lmaWNhdGlvbl9FbmFibGVIYXJkd2FyZUFjY2VsZXJhdGVkVmlkZW9F bmNvZGVyLCBrQ0ZCb29sZWFuRmFsc2UpOworICAgIGludCB1c2FnZVZhbHVlID0gMTsKKyAgICBD Rk51bWJlclJlZiB1c2FnZSA9IENGTnVtYmVyQ3JlYXRlKG51bGxwdHIsIGtDRk51bWJlckludFR5 cGUsICZ1c2FnZVZhbHVlKTsKKyAgICBDRkRpY3Rpb25hcnlTZXRWYWx1ZShlbmNvZGVyU3BlY3Ms IGdldGtWVFZpZGVvRW5jb2RlclNwZWNpZmljYXRpb25fVXNhZ2UoKSwgdXNhZ2UpOworICAgIGlm ICh1c2FnZSkgeworICAgICAgQ0ZSZWxlYXNlKHVzYWdlKTsKKyAgICAgIHVzYWdlID0gbnVsbHB0 cjsKKyAgICB9CisKKyAgICBbc2VsZiBkZXN0cm95Q29tcHJlc3Npb25TZXNzaW9uXTsKKworICAg IE9TU3RhdHVzIHN0YXR1cyA9CisgICAgICBDb21wcmVzc2lvblNlc3Npb25DcmVhdGUobnVsbHB0 ciwgIC8vIHVzZSBkZWZhdWx0IGFsbG9jYXRvcgorICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgX3dpZHRoLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgX2hlaWdodCwK KyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGtDb2RlY1R5cGVIMjY0LAorICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgZW5jb2RlclNwZWNzLAorICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgc291cmNlQXR0cmlidXRlcywKKyAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgIG51bGxwdHIsICAvLyB1c2UgZGVmYXVsdCBjb21wcmVzc2VkIGRhdGEgYWxs b2NhdG9yCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBjb21wcmVzc2lvbk91dHB1 dENhbGxiYWNrLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgbnVsbHB0ciwKKyAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICZfY29tcHJlc3Npb25TZXNzaW9uKTsKKyAg ICBpZiAoc291cmNlQXR0cmlidXRlcykgeworICAgICAgQ0ZSZWxlYXNlKHNvdXJjZUF0dHJpYnV0 ZXMpOworICAgICAgc291cmNlQXR0cmlidXRlcyA9IG51bGxwdHI7CisgICAgfQorICAgIGlmIChl bmNvZGVyX3NwZWNzKSB7CisgICAgICBDRlJlbGVhc2UoZW5jb2Rlcl9zcGVjcyk7CisgICAgICBl bmNvZGVyX3NwZWNzID0gbnVsbHB0cjsKKyAgICB9CisgICAgaWYgKHN0YXR1cyAhPSBub0Vycikg eworICAgICAgcmV0dXJuIFdFQlJUQ19WSURFT19DT0RFQ19FUlJPUjsKKyAgICB9CisjZW5kaWYK ICAgfQogI2VuZGlmCiAgIFtzZWxmIGNvbmZpZ3VyZUNvbXByZXNzaW9uU2Vzc2lvbl07Cg==