126719 2014-01-09 14:03:04 -0800 [CSS Shapes] Move CSSPrimitiveValue <-> LayoutBox Conversion to CSSPrimitiveValueMappings 2014-01-14 13:37:56 -0800 1 1 1 Unclassified WebKit CSS 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 124173 1 betravis betravis commit-queue eflews.bot esprehn+autocc glenn gyuyoung.kim macpherson menard oldest_to_newest 966060 0 betravis 2014-01-09 14:03:04 -0800 The conversion between CSSPrimitiveValues (eg CSSValueMarginBox) and LayoutBoxes (MarginBox) should happen in CSSPrimitiveValueMappings rather than in BasicShapeFunctions, as that's the standard place to put such conversions. 966063 1 220767 betravis 2014-01-09 14:06:29 -0800 Created attachment 220767 Initial Patch 966267 2 220767 krit 2014-01-10 00:00:29 -0800 Comment on attachment 220767 Initial Patch r=me 966479 3 220767 commit-queue 2014-01-10 11:22:06 -0800 Comment on attachment 220767 Initial Patch Rejecting attachment 220767 from commit-queue. Failed to run "['/Volumes/Data/EWS/WebKit/Tools/Scripts/webkit-patch', '--status-host=webkit-queues.appspot.com', '--bot-id=webkit-cq-01', 'apply-attachment', '--no-update', '--non-interactive', 220767, '--port=mac']" exit_code: 1 cwd: /Volumes/Data/EWS/WebKit Last 500 characters of output: ubmit return self.open(self.click(*args, **kwds)) File "/Volumes/Data/EWS/WebKit/Tools/Scripts/webkitpy/thirdparty/autoinstalled/mechanize/_mechanize.py", line 203, in open return self._mech_open(url, data, timeout=timeout) File "/Volumes/Data/EWS/WebKit/Tools/Scripts/webkitpy/thirdparty/autoinstalled/mechanize/_mechanize.py", line 255, in _mech_open raise response webkitpy.thirdparty.autoinstalled.mechanize._response.httperror_seek_wrapper: HTTP Error 500: Internal Server Error Full output: http://webkit-queues.appspot.com/results/6327271866499072 966794 4 220934 betravis 2014-01-11 09:50:23 -0800 Created attachment 220934 Updated Patch 966796 5 220934 eflews.bot 2014-01-11 10:04:28 -0800 Comment on attachment 220934 Updated Patch Attachment 220934 did not pass efl-wk2-ews (efl-wk2): Output: http://webkit-queues.appspot.com/results/4746130793431040 967425 6 221066 betravis 2014-01-13 11:24:25 -0800 Created attachment 221066 Updated Patch 967960 7 221066 commit-queue 2014-01-14 11:50:47 -0800 Comment on attachment 221066 Updated Patch Rejecting attachment 221066 from commit-queue. Failed to run "['/Volumes/Data/EWS/WebKit/Tools/Scripts/webkit-patch', '--status-host=webkit-queues.appspot.com', '--bot-id=webkit-cq-02', 'validate-changelog', '--check-oops', '--non-interactive', 221066, '--port=mac']" exit_code: 1 cwd: /Volumes/Data/EWS/WebKit ChangeLog entry in Source/WebCore/ChangeLog contains OOPS!. Full output: http://webkit-queues.appspot.com/results/5644115442139136 967989 8 221190 betravis 2014-01-14 13:01:43 -0800 Created attachment 221190 Adding reviewer to changelogs 968013 9 221190 commit-queue 2014-01-14 13:37:54 -0800 Comment on attachment 221190 Adding reviewer to changelogs Clearing flags on attachment: 221190 Committed r162001: <http://trac.webkit.org/changeset/162001> 968014 10 commit-queue 2014-01-14 13:37:56 -0800 All reviewed patches have been landed. Closing bug. 220767 2014-01-09 14:06:29 -0800 2014-01-11 09:50:23 -0800 Initial Patch bug-126719-20140109140620.patch text/plain 9549 betravis U3VidmVyc2lvbiBSZXZpc2lvbjogMTYxNTc3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMjA2YWM2NTAxOTg1Yjdj MjUzZDYwNjkxZGRlOGE2YjBlNDg3ZmMyOS4uNTdlOWE0NWI0YTUyYzRlYTY3YzVhZThjOTYxNWQ0 OWQwYTA1ODEwZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI4IEBACisyMDE0LTAxLTA5ICBCZWFy IFRyYXZpcyAgPGJldHJhdmlzQGFkb2JlLmNvbT4KKworICAgICAgICBbQ1NTIFNoYXBlc10gTW92 ZSBDU1NQcmltaXRpdmVWYWx1ZSA8LT4gTGF5b3V0Qm94IENvbnZlcnNpb24gdG8gQ1NTUHJpbWl0 aXZlVmFsdWVNYXBwaW5ncworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MTI2NzE5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgVGhlIHN0YW5kYXJkIGxvY2F0aW9uIGZvciBjb252ZXJzaW9ucyB0by9mcm9tIENT U1ByaW1pdGl2ZVZhbHVlcyBpcyBDU1NQcmltaXRpdmVWYWx1ZU1hcHBpbmdzLgorICAgICAgICBU aGlzIHBhdGNoIG1vdmVzIHRoZSBjb252ZXJzaW9uIGZvciBMYXlvdXRCb3hlcyBmcm9tIEJhc2lj U2hhcGVGdW5jdGlvbnMgdG8KKyAgICAgICAgQ1NTUHJpbWl0aXZlVmFsdWVNYXBwaW5ncy5oLgor CisgICAgICAgIFJlZmFjdG9yaW5nLCBubyBuZXcgdGVzdHMuCisKKyAgICAgICAgKiBjc3MvQmFz aWNTaGFwZUZ1bmN0aW9ucy5jcHA6CisgICAgICAgIChXZWJDb3JlOjp2YWx1ZUZvckJhc2ljU2hh cGUpOgorICAgICAgICAoV2ViQ29yZTo6YmFzaWNTaGFwZUZvclZhbHVlKToKKyAgICAgICAgKiBj c3MvQ1NTQ29tcHV0ZWRTdHlsZURlY2xhcmF0aW9uLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkNv bXB1dGVkU3R5bGVFeHRyYWN0b3I6OnByb3BlcnR5VmFsdWUpOgorICAgICAgICAqIGNzcy9DU1NQ cmltaXRpdmVWYWx1ZU1hcHBpbmdzLmg6CisgICAgICAgIChXZWJDb3JlOjpDU1NQcmltaXRpdmVW YWx1ZTo6Q1NTUHJpbWl0aXZlVmFsdWUpOgorICAgICAgICAoV2ViQ29yZTo6Q1NTUHJpbWl0aXZl VmFsdWU6Om9wZXJhdG9yIExheW91dEJveCk6CisgICAgICAgICogY3NzL0RlcHJlY2F0ZWRTdHls ZUJ1aWxkZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6QXBwbHlQcm9wZXJ0eUNsaXBQYXRoOjph cHBseVZhbHVlKToKKyAgICAgICAgKFdlYkNvcmU6OkFwcGx5UHJvcGVydHlTaGFwZTo6YXBwbHlW YWx1ZSk6CisKIDIwMTQtMDEtMDkgIEJyaWFuIEJ1cmcgIDxiYnVyZ0BhcHBsZS5jb20+CiAKICAg ICAgICAgUkVHUkVTU0lPTiAocjE2MDE1Mik6IFNlbGVjdGlvbiBkcmFnIHNuYXBzaG90IGRvZXNu J3QgYXBwZWFyIG9yIGhhcyB0aGUgd3JvbmcgY29udGVudCBvbiBSZXRpbmEKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL2Nzcy9CYXNpY1NoYXBlRnVuY3Rpb25zLmNwcCBiL1NvdXJjZS9XZWJD b3JlL2Nzcy9CYXNpY1NoYXBlRnVuY3Rpb25zLmNwcAppbmRleCBlZGE3NzcwMWM0NmNjZjMxOTY3 ZGZjY2Y5NmJjYjgxNmNmOTg0M2UwLi4zZmUwZmEwMjM4NDcyNTIxMDUzN2VkZmVlOTE3MmU4OGM3 Njg5YTVlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9jc3MvQmFzaWNTaGFwZUZ1bmN0aW9u cy5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvY3NzL0Jhc2ljU2hhcGVGdW5jdGlvbnMuY3BwCkBA IC0zOSw0OCArMzksNiBAQAogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKLVBhc3NSZWZQdHI8Q1NT UHJpbWl0aXZlVmFsdWU+IHZhbHVlRm9yQm94KExheW91dEJveCBib3gpCi17Ci0gICAgc3dpdGNo IChib3gpIHsKLSAgICBjYXNlIENvbnRlbnRCb3g6Ci0gICAgICAgIHJldHVybiBjc3NWYWx1ZVBv b2woKS5jcmVhdGVJZGVudGlmaWVyVmFsdWUoQ1NTVmFsdWVDb250ZW50Qm94KTsKLSAgICBjYXNl IFBhZGRpbmdCb3g6Ci0gICAgICAgIHJldHVybiBjc3NWYWx1ZVBvb2woKS5jcmVhdGVJZGVudGlm aWVyVmFsdWUoQ1NTVmFsdWVQYWRkaW5nQm94KTsKLSAgICBjYXNlIEJvcmRlckJveDoKLSAgICAg ICAgcmV0dXJuIGNzc1ZhbHVlUG9vbCgpLmNyZWF0ZUlkZW50aWZpZXJWYWx1ZShDU1NWYWx1ZUJv cmRlckJveCk7Ci0gICAgY2FzZSBNYXJnaW5Cb3g6Ci0gICAgICAgIHJldHVybiBjc3NWYWx1ZVBv b2woKS5jcmVhdGVJZGVudGlmaWVyVmFsdWUoQ1NTVmFsdWVNYXJnaW5Cb3gpOwotICAgIGNhc2Ug Qm91bmRpbmdCb3g6Ci0gICAgICAgIHJldHVybiBjc3NWYWx1ZVBvb2woKS5jcmVhdGVJZGVudGlm aWVyVmFsdWUoQ1NTVmFsdWVCb3VuZGluZ0JveCk7Ci0gICAgY2FzZSBCb3hNaXNzaW5nOgotICAg ICAgICByZXR1cm4gbnVsbHB0cjsKLSAgICB9Ci0gICAgQVNTRVJUX05PVF9SRUFDSEVEKCk7Ci0g ICAgcmV0dXJuIG51bGxwdHI7Ci19Ci0KLUxheW91dEJveCBib3hGb3JWYWx1ZShjb25zdCBDU1NQ cmltaXRpdmVWYWx1ZSogdmFsdWUpCi17Ci0gICAgaWYgKCF2YWx1ZSkKLSAgICAgICAgcmV0dXJu IEJveE1pc3Npbmc7Ci0KLSAgICBzd2l0Y2ggKHZhbHVlLT5nZXRWYWx1ZUlEKCkpIHsKLSAgICBj YXNlIENTU1ZhbHVlQ29udGVudEJveDoKLSAgICAgICAgcmV0dXJuIENvbnRlbnRCb3g7Ci0gICAg Y2FzZSBDU1NWYWx1ZVBhZGRpbmdCb3g6Ci0gICAgICAgIHJldHVybiBQYWRkaW5nQm94OwotICAg IGNhc2UgQ1NTVmFsdWVCb3JkZXJCb3g6Ci0gICAgICAgIHJldHVybiBCb3JkZXJCb3g7Ci0gICAg Y2FzZSBDU1NWYWx1ZU1hcmdpbkJveDoKLSAgICAgICAgcmV0dXJuIE1hcmdpbkJveDsKLSAgICBj YXNlIENTU1ZhbHVlQm91bmRpbmdCb3g6Ci0gICAgICAgIHJldHVybiBCb3VuZGluZ0JveDsKLSAg ICBkZWZhdWx0OgotICAgICAgICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsKLSAgICAgICAgcmV0dXJu IEJveE1pc3Npbmc7Ci0gICAgfQotfQotCiBzdGF0aWMgUGFzc1JlZlB0cjxDU1NQcmltaXRpdmVW YWx1ZT4gdmFsdWVGb3JDZW50ZXJDb29yZGluYXRlKENTU1ZhbHVlUG9vbCYgcG9vbCwgY29uc3Qg UmVuZGVyU3R5bGUqIHN0eWxlLCBjb25zdCBCYXNpY1NoYXBlQ2VudGVyQ29vcmRpbmF0ZSYgY2Vu dGVyKQogewogICAgIENTU1ZhbHVlSUQga2V5d29yZCA9IENTU1ZhbHVlSW52YWxpZDsKQEAgLTIz MCw3ICsxODgsOCBAQCBQYXNzUmVmUHRyPENTU1ZhbHVlPiB2YWx1ZUZvckJhc2ljU2hhcGUoY29u c3QgUmVuZGVyU3R5bGUqIHN0eWxlLCBjb25zdCBCYXNpY1NoYQogICAgICAgICBicmVhazsKICAg ICB9CiAKLSAgICBiYXNpY1NoYXBlVmFsdWUtPnNldExheW91dEJveCh2YWx1ZUZvckJveChiYXNp Y1NoYXBlLT5sYXlvdXRCb3goKSkpOworICAgIGlmIChiYXNpY1NoYXBlLT5sYXlvdXRCb3goKSAh PSBCb3hNaXNzaW5nKQorICAgICAgICBiYXNpY1NoYXBlVmFsdWUtPnNldExheW91dEJveChwb29s LmNyZWF0ZVZhbHVlKGJhc2ljU2hhcGUtPmxheW91dEJveCgpKSk7CiAKICAgICByZXR1cm4gcG9v bC5jcmVhdGVWYWx1ZShiYXNpY1NoYXBlVmFsdWUucmVsZWFzZSgpKTsKIH0KQEAgLTQ2MCw3ICs0 MTksOCBAQCBQYXNzUmVmUHRyPEJhc2ljU2hhcGU+IGJhc2ljU2hhcGVGb3JWYWx1ZShjb25zdCBS ZW5kZXJTdHlsZSogc3R5bGUsIGNvbnN0IFJlbmRlcgogICAgICAgICBicmVhazsKICAgICB9CiAK LSAgICBiYXNpY1NoYXBlLT5zZXRMYXlvdXRCb3goYm94Rm9yVmFsdWUoYmFzaWNTaGFwZVZhbHVl LT5sYXlvdXRCb3goKSkpOworICAgIGlmIChiYXNpY1NoYXBlVmFsdWUtPmxheW91dEJveCgpKQor ICAgICAgICBiYXNpY1NoYXBlLT5zZXRMYXlvdXRCb3goTGF5b3V0Qm94KCpiYXNpY1NoYXBlVmFs dWUtPmxheW91dEJveCgpKSk7CiAKICAgICByZXR1cm4gYmFzaWNTaGFwZS5yZWxlYXNlKCk7CiB9 CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTQ29tcHV0ZWRTdHlsZURlY2xhcmF0 aW9uLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NDb21wdXRlZFN0eWxlRGVjbGFyYXRpb24u Y3BwCmluZGV4IGRiYjEzYzU3YzFkMDdjYmRjMmEzZDljZGIzNzcyZmE0YTY1MGU0NjAuLjBjYjc3 N2Y5Zjc1MWQxM2NhY2U2MDg5YmRjY2IzMTdjY2EyZDFkZjYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL2Nzcy9DU1NDb21wdXRlZFN0eWxlRGVjbGFyYXRpb24uY3BwCisrKyBiL1NvdXJjZS9X ZWJDb3JlL2Nzcy9DU1NDb21wdXRlZFN0eWxlRGVjbGFyYXRpb24uY3BwCkBAIC0yODg1LDExICsy ODg1LDExIEBAIFBhc3NSZWZQdHI8Q1NTVmFsdWU+IENvbXB1dGVkU3R5bGVFeHRyYWN0b3I6OnBy b3BlcnR5VmFsdWUoQ1NTUHJvcGVydHlJRCBwcm9wZXJ0CiAgICAgICAgICAgICAgICAgU2hhcGVD bGlwUGF0aE9wZXJhdGlvbiYgc2hhcGVPcGVyYXRpb24gPSB0b1NoYXBlQ2xpcFBhdGhPcGVyYXRp b24oKm9wZXJhdGlvbik7CiAgICAgICAgICAgICAgICAgbGlzdC0+YXBwZW5kKHZhbHVlRm9yQmFz aWNTaGFwZShzdHlsZS5nZXQoKSwgc2hhcGVPcGVyYXRpb24uYmFzaWNTaGFwZSgpKSk7CiAgICAg ICAgICAgICAgICAgaWYgKHNoYXBlT3BlcmF0aW9uLnJlZmVyZW5jZUJveCgpICE9IEJveE1pc3Np bmcpCi0gICAgICAgICAgICAgICAgICAgIGxpc3QtPmFwcGVuZCh2YWx1ZUZvckJveChzaGFwZU9w ZXJhdGlvbi5yZWZlcmVuY2VCb3goKSkpOworICAgICAgICAgICAgICAgICAgICBsaXN0LT5hcHBl bmQoY3NzVmFsdWVQb29sKCkuY3JlYXRlVmFsdWUoc2hhcGVPcGVyYXRpb24ucmVmZXJlbmNlQm94 KCkpKTsKICAgICAgICAgICAgIH0KICAgICAgICAgICAgIGlmIChvcGVyYXRpb24tPnR5cGUoKSA9 PSBDbGlwUGF0aE9wZXJhdGlvbjo6Qm94KSB7CiAgICAgICAgICAgICAgICAgQm94Q2xpcFBhdGhP cGVyYXRpb24mIGJveE9wZXJhdGlvbiA9IHRvQm94Q2xpcFBhdGhPcGVyYXRpb24oKm9wZXJhdGlv bik7Ci0gICAgICAgICAgICAgICAgbGlzdC0+YXBwZW5kKHZhbHVlRm9yQm94KGJveE9wZXJhdGlv bi5yZWZlcmVuY2VCb3goKSkpOworICAgICAgICAgICAgICAgIGxpc3QtPmFwcGVuZChjc3NWYWx1 ZVBvb2woKS5jcmVhdGVWYWx1ZShib3hPcGVyYXRpb24ucmVmZXJlbmNlQm94KCkpKTsKICAgICAg ICAgICAgIH0KICAgICAgICAgICAgIHJldHVybiBsaXN0LnJlbGVhc2UoKTsKICAgICAgICAgfQpA QCAtMjkyMiw3ICsyOTIyLDcgQEAgUGFzc1JlZlB0cjxDU1NWYWx1ZT4gQ29tcHV0ZWRTdHlsZUV4 dHJhY3Rvcjo6cHJvcGVydHlWYWx1ZShDU1NQcm9wZXJ0eUlEIHByb3BlcnQKICAgICAgICAgICAg IGlmICghc3R5bGUtPnNoYXBlSW5zaWRlKCkpCiAgICAgICAgICAgICAgICAgcmV0dXJuIGNzc1Zh bHVlUG9vbCgpLmNyZWF0ZUlkZW50aWZpZXJWYWx1ZShDU1NWYWx1ZU5vbmUpOwogICAgICAgICAg ICAgaWYgKHN0eWxlLT5zaGFwZUluc2lkZSgpLT50eXBlKCkgPT0gU2hhcGVWYWx1ZTo6Qm94KQot ICAgICAgICAgICAgICAgIHJldHVybiB2YWx1ZUZvckJveChzdHlsZS0+c2hhcGVJbnNpZGUoKS0+ bGF5b3V0Qm94KCkpOworICAgICAgICAgICAgICAgIHJldHVybiBjc3NWYWx1ZVBvb2woKS5jcmVh dGVWYWx1ZShzdHlsZS0+c2hhcGVJbnNpZGUoKS0+bGF5b3V0Qm94KCkpOwogICAgICAgICAgICAg aWYgKHN0eWxlLT5zaGFwZUluc2lkZSgpLT50eXBlKCkgPT0gU2hhcGVWYWx1ZTo6T3V0c2lkZSkK ICAgICAgICAgICAgICAgICByZXR1cm4gY3NzVmFsdWVQb29sKCkuY3JlYXRlSWRlbnRpZmllclZh bHVlKENTU1ZhbHVlT3V0c2lkZVNoYXBlKTsKICAgICAgICAgICAgIGlmIChzdHlsZS0+c2hhcGVJ bnNpZGUoKS0+dHlwZSgpID09IFNoYXBlVmFsdWU6OkltYWdlKSB7CkBAIC0yOTM2LDcgKzI5MzYs NyBAQCBQYXNzUmVmUHRyPENTU1ZhbHVlPiBDb21wdXRlZFN0eWxlRXh0cmFjdG9yOjpwcm9wZXJ0 eVZhbHVlKENTU1Byb3BlcnR5SUQgcHJvcGVydAogICAgICAgICAgICAgaWYgKCFzdHlsZS0+c2hh cGVPdXRzaWRlKCkpCiAgICAgICAgICAgICAgICAgcmV0dXJuIGNzc1ZhbHVlUG9vbCgpLmNyZWF0 ZUlkZW50aWZpZXJWYWx1ZShDU1NWYWx1ZU5vbmUpOwogICAgICAgICAgICAgaWYgKHN0eWxlLT5z aGFwZU91dHNpZGUoKS0+dHlwZSgpID09IFNoYXBlVmFsdWU6OkJveCkKLSAgICAgICAgICAgICAg ICByZXR1cm4gdmFsdWVGb3JCb3goc3R5bGUtPnNoYXBlT3V0c2lkZSgpLT5sYXlvdXRCb3goKSk7 CisgICAgICAgICAgICAgICAgcmV0dXJuIGNzc1ZhbHVlUG9vbCgpLmNyZWF0ZVZhbHVlKHN0eWxl LT5zaGFwZU91dHNpZGUoKS0+bGF5b3V0Qm94KCkpOwogICAgICAgICAgICAgaWYgKHN0eWxlLT5z aGFwZU91dHNpZGUoKS0+dHlwZSgpID09IFNoYXBlVmFsdWU6OkltYWdlKSB7CiAgICAgICAgICAg ICAgICAgaWYgKHN0eWxlLT5zaGFwZU91dHNpZGUoKS0+aW1hZ2UoKSkKICAgICAgICAgICAgICAg ICAgICAgcmV0dXJuIHN0eWxlLT5zaGFwZU91dHNpZGUoKS0+aW1hZ2UoKS0+Y3NzVmFsdWUoKTsK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NQcmltaXRpdmVWYWx1ZU1hcHBpbmdz LmggYi9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTUHJpbWl0aXZlVmFsdWVNYXBwaW5ncy5oCmluZGV4 IDMwZmY4MWQwN2E5MDcxNDI5MTJlOTdlMjg0YWUwMzYxNGU2OWI1MTQuLjcyYmNhZDg1Zjg1Y2Yy ODAwZWZhYzRkNDFjMTEyZWE1NjM2ZDg1YzggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2Nz cy9DU1NQcmltaXRpdmVWYWx1ZU1hcHBpbmdzLmgKKysrIGIvU291cmNlL1dlYkNvcmUvY3NzL0NT U1ByaW1pdGl2ZVZhbHVlTWFwcGluZ3MuaApAQCAtNTE2NSw2ICs1MTY1LDUzIEBAIHRlbXBsYXRl PD4gaW5saW5lIENTU1ByaW1pdGl2ZVZhbHVlOjpvcGVyYXRvciBJbWFnZU9yaWVudGF0aW9uRW51 bSgpIGNvbnN0CiAKICNlbmRpZiAvLyBFTkFCTEUoQ1NTX0lNQUdFX09SSUVOVEFUSU9OKQogCit0 ZW1wbGF0ZTw+IGlubGluZSBDU1NQcmltaXRpdmVWYWx1ZTo6Q1NTUHJpbWl0aXZlVmFsdWUoTGF5 b3V0Qm94IGxheW91dEJveCkKKyAgICA6IENTU1ZhbHVlKFByaW1pdGl2ZUNsYXNzKQoreworICAg IG1fcHJpbWl0aXZlVW5pdFR5cGUgPSBDU1NfVkFMVUVfSUQ7CisgICAgc3dpdGNoIChsYXlvdXRC b3gpIHsKKyAgICBjYXNlIEJvdW5kaW5nQm94OgorICAgICAgICBtX3ZhbHVlLnZhbHVlSUQgPSBD U1NWYWx1ZUJvdW5kaW5nQm94OworICAgICAgICBicmVhazsKKyAgICBjYXNlIE1hcmdpbkJveDoK KyAgICAgICAgbV92YWx1ZS52YWx1ZUlEID0gQ1NTVmFsdWVNYXJnaW5Cb3g7CisgICAgICAgIGJy ZWFrOworICAgIGNhc2UgQm9yZGVyQm94OgorICAgICAgICBtX3ZhbHVlLnZhbHVlSUQgPSBDU1NW YWx1ZUJvcmRlckJveDsKKyAgICAgICAgYnJlYWs7CisgICAgY2FzZSBQYWRkaW5nQm94OgorICAg ICAgICBtX3ZhbHVlLnZhbHVlSUQgPSBDU1NWYWx1ZVBhZGRpbmdCb3g7CisgICAgICAgIGJyZWFr OworICAgIGNhc2UgQ29udGVudEJveDoKKyAgICAgICAgbV92YWx1ZS52YWx1ZUlEID0gQ1NTVmFs dWVDb250ZW50Qm94OworICAgICAgICBicmVhazsKKyAgICBjYXNlIEJveE1pc3Npbmc6CisgICAg ICAgIEFTU0VSVF9OT1RfUkVBQ0hFRCgpOworICAgICAgICBtX3ZhbHVlLnZhbHVlSUQgPSBDU1NW YWx1ZU5vbmU7CisgICAgICAgIGJyZWFrOworICAgIH0KK30KKwordGVtcGxhdGU8PiBpbmxpbmUg Q1NTUHJpbWl0aXZlVmFsdWU6Om9wZXJhdG9yIExheW91dEJveCgpIGNvbnN0Cit7CisgICAgc3dp dGNoIChnZXRWYWx1ZUlEKCkpIHsKKyAgICBjYXNlIENTU1ZhbHVlQm91bmRpbmdCb3g6CisgICAg ICAgIHJldHVybiBCb3VuZGluZ0JveDsKKyAgICBjYXNlIENTU1ZhbHVlTWFyZ2luQm94OgorICAg ICAgICByZXR1cm4gTWFyZ2luQm94OworICAgIGNhc2UgQ1NTVmFsdWVCb3JkZXJCb3g6CisgICAg ICAgIHJldHVybiBCb3JkZXJCb3g7CisgICAgY2FzZSBDU1NWYWx1ZVBhZGRpbmdCb3g6CisgICAg ICAgIHJldHVybiBQYWRkaW5nQm94OworICAgIGNhc2UgQ1NTVmFsdWVDb250ZW50Qm94OgorICAg ICAgICByZXR1cm4gQ29udGVudEJveDsKKyAgICBkZWZhdWx0OgorICAgICAgICBicmVhazsKKyAg ICB9CisgICAgQVNTRVJUX05PVF9SRUFDSEVEKCk7CisgICAgcmV0dXJuIEJveE1pc3Npbmc7Cit9 CisKIH0KIAogI2VuZGlmCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9jc3MvRGVwcmVjYXRl ZFN0eWxlQnVpbGRlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9jc3MvRGVwcmVjYXRlZFN0eWxlQnVp bGRlci5jcHAKaW5kZXggYzRkMDBiOGZjOWQ5MjdhY2M0NjU3MjA4MWM0ZWNlNWNkOGE4MWVhZi4u OTJlYmRhMDVmY2YyMTU1MmQzYzhlMGE1NTk4ZjBiYjc5MzYwMGQwNCAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvY3NzL0RlcHJlY2F0ZWRTdHlsZUJ1aWxkZXIuY3BwCisrKyBiL1NvdXJjZS9X ZWJDb3JlL2Nzcy9EZXByZWNhdGVkU3R5bGVCdWlsZGVyLmNwcApAQCAtMjA3Niw3ICsyMDc2LDcg QEAgcHVibGljOgogICAgICAgICAgICAgICAgIHx8IHByaW1pdGl2ZVZhbHVlLmdldFZhbHVlSUQo KSA9PSBDU1NWYWx1ZU1hcmdpbkJveAogICAgICAgICAgICAgICAgIHx8IHByaW1pdGl2ZVZhbHVl LmdldFZhbHVlSUQoKSA9PSBDU1NWYWx1ZUJvdW5kaW5nQm94KQogICAgICAgICAgICAgICAgICYm IHJlZmVyZW5jZUJveCA9PSBCb3hNaXNzaW5nKQotICAgICAgICAgICAgICAgIHJlZmVyZW5jZUJv eCA9IGJveEZvclZhbHVlKCZwcmltaXRpdmVWYWx1ZSk7CisgICAgICAgICAgICAgICAgcmVmZXJl bmNlQm94ID0gTGF5b3V0Qm94KHByaW1pdGl2ZVZhbHVlKTsKICAgICAgICAgICAgIGVsc2UKICAg ICAgICAgICAgICAgICByZXR1cm47CiAgICAgICAgIH0KQEAgLTIxMTAsNyArMjExMCw3IEBAIHB1 YmxpYzoKICAgICAgICAgICAgICAgICB8fCBwcmltaXRpdmVWYWx1ZS0+Z2V0VmFsdWVJRCgpID09 IENTU1ZhbHVlQm9yZGVyQm94CiAgICAgICAgICAgICAgICAgfHwgcHJpbWl0aXZlVmFsdWUtPmdl dFZhbHVlSUQoKSA9PSBDU1NWYWx1ZVBhZGRpbmdCb3gKICAgICAgICAgICAgICAgICB8fCBwcmlt aXRpdmVWYWx1ZS0+Z2V0VmFsdWVJRCgpID09IENTU1ZhbHVlTWFyZ2luQm94KQotICAgICAgICAg ICAgICAgIHNldFZhbHVlKHN0eWxlUmVzb2x2ZXItPnN0eWxlKCksIFNoYXBlVmFsdWU6OmNyZWF0 ZUxheW91dEJveFZhbHVlKGJveEZvclZhbHVlKHByaW1pdGl2ZVZhbHVlKSkpOworICAgICAgICAg ICAgICAgIHNldFZhbHVlKHN0eWxlUmVzb2x2ZXItPnN0eWxlKCksIFNoYXBlVmFsdWU6OmNyZWF0 ZUxheW91dEJveFZhbHVlKExheW91dEJveCgqcHJpbWl0aXZlVmFsdWUpKSk7CiAgICAgICAgICAg ICBlbHNlIGlmIChwcmltaXRpdmVWYWx1ZS0+Z2V0VmFsdWVJRCgpID09IENTU1ZhbHVlT3V0c2lk ZVNoYXBlKQogICAgICAgICAgICAgICAgIHNldFZhbHVlKHN0eWxlUmVzb2x2ZXItPnN0eWxlKCks IFNoYXBlVmFsdWU6OmNyZWF0ZU91dHNpZGVWYWx1ZSgpKTsKICAgICAgICAgICAgIGVsc2UgaWYg KHByaW1pdGl2ZVZhbHVlLT5pc1NoYXBlKCkpIHsK 220934 2014-01-11 09:50:23 -0800 2014-01-13 11:25:03 -0800 Updated Patch 126719.patch text/plain 9151 betravis ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA3NzRlMmVjLi44MWIyNTg1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjgg QEAKKzIwMTQtMDEtMTEgIEJlYXIgVHJhdmlzICA8YmV0cmF2aXNAYWRvYmUuY29tPgorCisgICAg ICAgIFtDU1MgU2hhcGVzXSBNb3ZlIENTU1ByaW1pdGl2ZVZhbHVlIDwtPiBMYXlvdXRCb3ggQ29u dmVyc2lvbiB0byBDU1NQcmltaXRpdmVWYWx1ZU1hcHBpbmdzCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMjY3MTkKKworICAgICAgICBSZXZpZXdlZCBi eSBEaXJrIFNjaHVsemUuCisKKyAgICAgICAgVGhlIHN0YW5kYXJkIGxvY2F0aW9uIGZvciBjb252 ZXJzaW9ucyB0by9mcm9tIENTU1ByaW1pdGl2ZVZhbHVlcyBpcyBDU1NQcmltaXRpdmVWYWx1ZU1h cHBpbmdzLgorICAgICAgICBUaGlzIHBhdGNoIG1vdmVzIHRoZSBjb252ZXJzaW9uIGZvciBMYXlv dXRCb3hlcyBmcm9tIEJhc2ljU2hhcGVGdW5jdGlvbnMgdG8KKyAgICAgICAgQ1NTUHJpbWl0aXZl VmFsdWVNYXBwaW5ncy5oLgorCisgICAgICAgIFJlZmFjdG9yaW5nLCBubyBuZXcgdGVzdHMuCisK KyAgICAgICAgKiBjc3MvQmFzaWNTaGFwZUZ1bmN0aW9ucy5jcHA6CisgICAgICAgIChXZWJDb3Jl Ojp2YWx1ZUZvckJhc2ljU2hhcGUpOgorICAgICAgICAoV2ViQ29yZTo6YmFzaWNTaGFwZUZvclZh bHVlKToKKyAgICAgICAgKiBjc3MvQ1NTQ29tcHV0ZWRTdHlsZURlY2xhcmF0aW9uLmNwcDoKKyAg ICAgICAgKFdlYkNvcmU6OkNvbXB1dGVkU3R5bGVFeHRyYWN0b3I6OnByb3BlcnR5VmFsdWUpOgor ICAgICAgICAqIGNzcy9DU1NQcmltaXRpdmVWYWx1ZU1hcHBpbmdzLmg6CisgICAgICAgIChXZWJD b3JlOjpDU1NQcmltaXRpdmVWYWx1ZTo6Q1NTUHJpbWl0aXZlVmFsdWUpOgorICAgICAgICAoV2Vi Q29yZTo6Q1NTUHJpbWl0aXZlVmFsdWU6Om9wZXJhdG9yIExheW91dEJveCk6CisgICAgICAgICog Y3NzL0RlcHJlY2F0ZWRTdHlsZUJ1aWxkZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6QXBwbHlQ cm9wZXJ0eUNsaXBQYXRoOjphcHBseVZhbHVlKToKKyAgICAgICAgKFdlYkNvcmU6OkFwcGx5UHJv cGVydHlTaGFwZTo6YXBwbHlWYWx1ZSk6CisKIDIwMTQtMDEtMTEgIFNpbW9uIEZyYXNlciAgPHNp bW9uLmZyYXNlckBhcHBsZS5jb20+CiAKICAgICAgICAgI2lmZGVmIG91dCB0aGUgY29udGVudHMg b2YgVG91Y2gqIGZpbGVzIGZvciBpT1MuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9jc3Mv QmFzaWNTaGFwZUZ1bmN0aW9ucy5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9jc3MvQmFzaWNTaGFwZUZ1 bmN0aW9ucy5jcHAKaW5kZXggZWRhNzc3MC4uM2ZlMGZhMCAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvY3NzL0Jhc2ljU2hhcGVGdW5jdGlvbnMuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2Nz cy9CYXNpY1NoYXBlRnVuY3Rpb25zLmNwcApAQCAtMzksNDggKzM5LDYgQEAKIAogbmFtZXNwYWNl IFdlYkNvcmUgewogCi1QYXNzUmVmUHRyPENTU1ByaW1pdGl2ZVZhbHVlPiB2YWx1ZUZvckJveChM YXlvdXRCb3ggYm94KQotewotICAgIHN3aXRjaCAoYm94KSB7Ci0gICAgY2FzZSBDb250ZW50Qm94 OgotICAgICAgICByZXR1cm4gY3NzVmFsdWVQb29sKCkuY3JlYXRlSWRlbnRpZmllclZhbHVlKENT U1ZhbHVlQ29udGVudEJveCk7Ci0gICAgY2FzZSBQYWRkaW5nQm94OgotICAgICAgICByZXR1cm4g Y3NzVmFsdWVQb29sKCkuY3JlYXRlSWRlbnRpZmllclZhbHVlKENTU1ZhbHVlUGFkZGluZ0JveCk7 Ci0gICAgY2FzZSBCb3JkZXJCb3g6Ci0gICAgICAgIHJldHVybiBjc3NWYWx1ZVBvb2woKS5jcmVh dGVJZGVudGlmaWVyVmFsdWUoQ1NTVmFsdWVCb3JkZXJCb3gpOwotICAgIGNhc2UgTWFyZ2luQm94 OgotICAgICAgICByZXR1cm4gY3NzVmFsdWVQb29sKCkuY3JlYXRlSWRlbnRpZmllclZhbHVlKENT U1ZhbHVlTWFyZ2luQm94KTsKLSAgICBjYXNlIEJvdW5kaW5nQm94OgotICAgICAgICByZXR1cm4g Y3NzVmFsdWVQb29sKCkuY3JlYXRlSWRlbnRpZmllclZhbHVlKENTU1ZhbHVlQm91bmRpbmdCb3gp OwotICAgIGNhc2UgQm94TWlzc2luZzoKLSAgICAgICAgcmV0dXJuIG51bGxwdHI7Ci0gICAgfQot ICAgIEFTU0VSVF9OT1RfUkVBQ0hFRCgpOwotICAgIHJldHVybiBudWxscHRyOwotfQotCi1MYXlv dXRCb3ggYm94Rm9yVmFsdWUoY29uc3QgQ1NTUHJpbWl0aXZlVmFsdWUqIHZhbHVlKQotewotICAg IGlmICghdmFsdWUpCi0gICAgICAgIHJldHVybiBCb3hNaXNzaW5nOwotCi0gICAgc3dpdGNoICh2 YWx1ZS0+Z2V0VmFsdWVJRCgpKSB7Ci0gICAgY2FzZSBDU1NWYWx1ZUNvbnRlbnRCb3g6Ci0gICAg ICAgIHJldHVybiBDb250ZW50Qm94OwotICAgIGNhc2UgQ1NTVmFsdWVQYWRkaW5nQm94OgotICAg ICAgICByZXR1cm4gUGFkZGluZ0JveDsKLSAgICBjYXNlIENTU1ZhbHVlQm9yZGVyQm94OgotICAg ICAgICByZXR1cm4gQm9yZGVyQm94OwotICAgIGNhc2UgQ1NTVmFsdWVNYXJnaW5Cb3g6Ci0gICAg ICAgIHJldHVybiBNYXJnaW5Cb3g7Ci0gICAgY2FzZSBDU1NWYWx1ZUJvdW5kaW5nQm94OgotICAg ICAgICByZXR1cm4gQm91bmRpbmdCb3g7Ci0gICAgZGVmYXVsdDoKLSAgICAgICAgQVNTRVJUX05P VF9SRUFDSEVEKCk7Ci0gICAgICAgIHJldHVybiBCb3hNaXNzaW5nOwotICAgIH0KLX0KLQogc3Rh dGljIFBhc3NSZWZQdHI8Q1NTUHJpbWl0aXZlVmFsdWU+IHZhbHVlRm9yQ2VudGVyQ29vcmRpbmF0 ZShDU1NWYWx1ZVBvb2wmIHBvb2wsIGNvbnN0IFJlbmRlclN0eWxlKiBzdHlsZSwgY29uc3QgQmFz aWNTaGFwZUNlbnRlckNvb3JkaW5hdGUmIGNlbnRlcikKIHsKICAgICBDU1NWYWx1ZUlEIGtleXdv cmQgPSBDU1NWYWx1ZUludmFsaWQ7CkBAIC0yMzAsNyArMTg4LDggQEAgUGFzc1JlZlB0cjxDU1NW YWx1ZT4gdmFsdWVGb3JCYXNpY1NoYXBlKGNvbnN0IFJlbmRlclN0eWxlKiBzdHlsZSwgY29uc3Qg QmFzaWNTaGEKICAgICAgICAgYnJlYWs7CiAgICAgfQogCi0gICAgYmFzaWNTaGFwZVZhbHVlLT5z ZXRMYXlvdXRCb3godmFsdWVGb3JCb3goYmFzaWNTaGFwZS0+bGF5b3V0Qm94KCkpKTsKKyAgICBp ZiAoYmFzaWNTaGFwZS0+bGF5b3V0Qm94KCkgIT0gQm94TWlzc2luZykKKyAgICAgICAgYmFzaWNT aGFwZVZhbHVlLT5zZXRMYXlvdXRCb3gocG9vbC5jcmVhdGVWYWx1ZShiYXNpY1NoYXBlLT5sYXlv dXRCb3goKSkpOwogCiAgICAgcmV0dXJuIHBvb2wuY3JlYXRlVmFsdWUoYmFzaWNTaGFwZVZhbHVl LnJlbGVhc2UoKSk7CiB9CkBAIC00NjAsNyArNDE5LDggQEAgUGFzc1JlZlB0cjxCYXNpY1NoYXBl PiBiYXNpY1NoYXBlRm9yVmFsdWUoY29uc3QgUmVuZGVyU3R5bGUqIHN0eWxlLCBjb25zdCBSZW5k ZXIKICAgICAgICAgYnJlYWs7CiAgICAgfQogCi0gICAgYmFzaWNTaGFwZS0+c2V0TGF5b3V0Qm94 KGJveEZvclZhbHVlKGJhc2ljU2hhcGVWYWx1ZS0+bGF5b3V0Qm94KCkpKTsKKyAgICBpZiAoYmFz aWNTaGFwZVZhbHVlLT5sYXlvdXRCb3goKSkKKyAgICAgICAgYmFzaWNTaGFwZS0+c2V0TGF5b3V0 Qm94KExheW91dEJveCgqYmFzaWNTaGFwZVZhbHVlLT5sYXlvdXRCb3goKSkpOwogCiAgICAgcmV0 dXJuIGJhc2ljU2hhcGUucmVsZWFzZSgpOwogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv Y3NzL0NTU0NvbXB1dGVkU3R5bGVEZWNsYXJhdGlvbi5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9jc3Mv Q1NTQ29tcHV0ZWRTdHlsZURlY2xhcmF0aW9uLmNwcAppbmRleCBlOTQxNGRiLi5hMWU1OTkwIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTQ29tcHV0ZWRTdHlsZURlY2xhcmF0aW9u LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTQ29tcHV0ZWRTdHlsZURlY2xhcmF0aW9u LmNwcApAQCAtMjg4NSwxMSArMjg4NSwxMSBAQCBQYXNzUmVmUHRyPENTU1ZhbHVlPiBDb21wdXRl ZFN0eWxlRXh0cmFjdG9yOjpwcm9wZXJ0eVZhbHVlKENTU1Byb3BlcnR5SUQgcHJvcGVydAogICAg ICAgICAgICAgICAgIFNoYXBlQ2xpcFBhdGhPcGVyYXRpb24mIHNoYXBlT3BlcmF0aW9uID0gdG9T aGFwZUNsaXBQYXRoT3BlcmF0aW9uKCpvcGVyYXRpb24pOwogICAgICAgICAgICAgICAgIGxpc3Qt PmFwcGVuZCh2YWx1ZUZvckJhc2ljU2hhcGUoc3R5bGUuZ2V0KCksIHNoYXBlT3BlcmF0aW9uLmJh c2ljU2hhcGUoKSkpOwogICAgICAgICAgICAgICAgIGlmIChzaGFwZU9wZXJhdGlvbi5yZWZlcmVu Y2VCb3goKSAhPSBCb3hNaXNzaW5nKQotICAgICAgICAgICAgICAgICAgICBsaXN0LT5hcHBlbmQo dmFsdWVGb3JCb3goc2hhcGVPcGVyYXRpb24ucmVmZXJlbmNlQm94KCkpKTsKKyAgICAgICAgICAg ICAgICAgICAgbGlzdC0+YXBwZW5kKGNzc1ZhbHVlUG9vbCgpLmNyZWF0ZVZhbHVlKHNoYXBlT3Bl cmF0aW9uLnJlZmVyZW5jZUJveCgpKSk7CiAgICAgICAgICAgICB9CiAgICAgICAgICAgICBpZiAo b3BlcmF0aW9uLT50eXBlKCkgPT0gQ2xpcFBhdGhPcGVyYXRpb246OkJveCkgewogICAgICAgICAg ICAgICAgIEJveENsaXBQYXRoT3BlcmF0aW9uJiBib3hPcGVyYXRpb24gPSB0b0JveENsaXBQYXRo T3BlcmF0aW9uKCpvcGVyYXRpb24pOwotICAgICAgICAgICAgICAgIGxpc3QtPmFwcGVuZCh2YWx1 ZUZvckJveChib3hPcGVyYXRpb24ucmVmZXJlbmNlQm94KCkpKTsKKyAgICAgICAgICAgICAgICBs aXN0LT5hcHBlbmQoY3NzVmFsdWVQb29sKCkuY3JlYXRlVmFsdWUoYm94T3BlcmF0aW9uLnJlZmVy ZW5jZUJveCgpKSk7CiAgICAgICAgICAgICB9CiAgICAgICAgICAgICByZXR1cm4gbGlzdC5yZWxl YXNlKCk7CiAgICAgICAgIH0KQEAgLTI5MjIsNyArMjkyMiw3IEBAIFBhc3NSZWZQdHI8Q1NTVmFs dWU+IENvbXB1dGVkU3R5bGVFeHRyYWN0b3I6OnByb3BlcnR5VmFsdWUoQ1NTUHJvcGVydHlJRCBw cm9wZXJ0CiAgICAgICAgICAgICBpZiAoIXN0eWxlLT5zaGFwZUluc2lkZSgpKQogICAgICAgICAg ICAgICAgIHJldHVybiBjc3NWYWx1ZVBvb2woKS5jcmVhdGVJZGVudGlmaWVyVmFsdWUoQ1NTVmFs dWVOb25lKTsKICAgICAgICAgICAgIGlmIChzdHlsZS0+c2hhcGVJbnNpZGUoKS0+dHlwZSgpID09 IFNoYXBlVmFsdWU6OkJveCkKLSAgICAgICAgICAgICAgICByZXR1cm4gdmFsdWVGb3JCb3goc3R5 bGUtPnNoYXBlSW5zaWRlKCktPmxheW91dEJveCgpKTsKKyAgICAgICAgICAgICAgICByZXR1cm4g Y3NzVmFsdWVQb29sKCkuY3JlYXRlVmFsdWUoc3R5bGUtPnNoYXBlSW5zaWRlKCktPmxheW91dEJv eCgpKTsKICAgICAgICAgICAgIGlmIChzdHlsZS0+c2hhcGVJbnNpZGUoKS0+dHlwZSgpID09IFNo YXBlVmFsdWU6Ok91dHNpZGUpCiAgICAgICAgICAgICAgICAgcmV0dXJuIGNzc1ZhbHVlUG9vbCgp LmNyZWF0ZUlkZW50aWZpZXJWYWx1ZShDU1NWYWx1ZU91dHNpZGVTaGFwZSk7CiAgICAgICAgICAg ICBpZiAoc3R5bGUtPnNoYXBlSW5zaWRlKCktPnR5cGUoKSA9PSBTaGFwZVZhbHVlOjpJbWFnZSkg ewpAQCAtMjkzNiw3ICsyOTM2LDcgQEAgUGFzc1JlZlB0cjxDU1NWYWx1ZT4gQ29tcHV0ZWRTdHls ZUV4dHJhY3Rvcjo6cHJvcGVydHlWYWx1ZShDU1NQcm9wZXJ0eUlEIHByb3BlcnQKICAgICAgICAg ICAgIGlmICghc3R5bGUtPnNoYXBlT3V0c2lkZSgpKQogICAgICAgICAgICAgICAgIHJldHVybiBj c3NWYWx1ZVBvb2woKS5jcmVhdGVJZGVudGlmaWVyVmFsdWUoQ1NTVmFsdWVOb25lKTsKICAgICAg ICAgICAgIGlmIChzdHlsZS0+c2hhcGVPdXRzaWRlKCktPnR5cGUoKSA9PSBTaGFwZVZhbHVlOjpC b3gpCi0gICAgICAgICAgICAgICAgcmV0dXJuIHZhbHVlRm9yQm94KHN0eWxlLT5zaGFwZU91dHNp ZGUoKS0+bGF5b3V0Qm94KCkpOworICAgICAgICAgICAgICAgIHJldHVybiBjc3NWYWx1ZVBvb2wo KS5jcmVhdGVWYWx1ZShzdHlsZS0+c2hhcGVPdXRzaWRlKCktPmxheW91dEJveCgpKTsKICAgICAg ICAgICAgIGlmIChzdHlsZS0+c2hhcGVPdXRzaWRlKCktPnR5cGUoKSA9PSBTaGFwZVZhbHVlOjpJ bWFnZSkgewogICAgICAgICAgICAgICAgIGlmIChzdHlsZS0+c2hhcGVPdXRzaWRlKCktPmltYWdl KCkpCiAgICAgICAgICAgICAgICAgICAgIHJldHVybiBzdHlsZS0+c2hhcGVPdXRzaWRlKCktPmlt YWdlKCktPmNzc1ZhbHVlKCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTUHJp bWl0aXZlVmFsdWVNYXBwaW5ncy5oIGIvU291cmNlL1dlYkNvcmUvY3NzL0NTU1ByaW1pdGl2ZVZh bHVlTWFwcGluZ3MuaAppbmRleCAzMGZmODFkLi43MmJjYWQ4IDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9jc3MvQ1NTUHJpbWl0aXZlVmFsdWVNYXBwaW5ncy5oCisrKyBiL1NvdXJjZS9XZWJD b3JlL2Nzcy9DU1NQcmltaXRpdmVWYWx1ZU1hcHBpbmdzLmgKQEAgLTUxNjUsNiArNTE2NSw1MyBA QCB0ZW1wbGF0ZTw+IGlubGluZSBDU1NQcmltaXRpdmVWYWx1ZTo6b3BlcmF0b3IgSW1hZ2VPcmll bnRhdGlvbkVudW0oKSBjb25zdAogCiAjZW5kaWYgLy8gRU5BQkxFKENTU19JTUFHRV9PUklFTlRB VElPTikKIAordGVtcGxhdGU8PiBpbmxpbmUgQ1NTUHJpbWl0aXZlVmFsdWU6OkNTU1ByaW1pdGl2 ZVZhbHVlKExheW91dEJveCBsYXlvdXRCb3gpCisgICAgOiBDU1NWYWx1ZShQcmltaXRpdmVDbGFz cykKK3sKKyAgICBtX3ByaW1pdGl2ZVVuaXRUeXBlID0gQ1NTX1ZBTFVFX0lEOworICAgIHN3aXRj aCAobGF5b3V0Qm94KSB7CisgICAgY2FzZSBCb3VuZGluZ0JveDoKKyAgICAgICAgbV92YWx1ZS52 YWx1ZUlEID0gQ1NTVmFsdWVCb3VuZGluZ0JveDsKKyAgICAgICAgYnJlYWs7CisgICAgY2FzZSBN YXJnaW5Cb3g6CisgICAgICAgIG1fdmFsdWUudmFsdWVJRCA9IENTU1ZhbHVlTWFyZ2luQm94Owor ICAgICAgICBicmVhazsKKyAgICBjYXNlIEJvcmRlckJveDoKKyAgICAgICAgbV92YWx1ZS52YWx1 ZUlEID0gQ1NTVmFsdWVCb3JkZXJCb3g7CisgICAgICAgIGJyZWFrOworICAgIGNhc2UgUGFkZGlu Z0JveDoKKyAgICAgICAgbV92YWx1ZS52YWx1ZUlEID0gQ1NTVmFsdWVQYWRkaW5nQm94OworICAg ICAgICBicmVhazsKKyAgICBjYXNlIENvbnRlbnRCb3g6CisgICAgICAgIG1fdmFsdWUudmFsdWVJ RCA9IENTU1ZhbHVlQ29udGVudEJveDsKKyAgICAgICAgYnJlYWs7CisgICAgY2FzZSBCb3hNaXNz aW5nOgorICAgICAgICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsKKyAgICAgICAgbV92YWx1ZS52YWx1 ZUlEID0gQ1NTVmFsdWVOb25lOworICAgICAgICBicmVhazsKKyAgICB9Cit9CisKK3RlbXBsYXRl PD4gaW5saW5lIENTU1ByaW1pdGl2ZVZhbHVlOjpvcGVyYXRvciBMYXlvdXRCb3goKSBjb25zdAor eworICAgIHN3aXRjaCAoZ2V0VmFsdWVJRCgpKSB7CisgICAgY2FzZSBDU1NWYWx1ZUJvdW5kaW5n Qm94OgorICAgICAgICByZXR1cm4gQm91bmRpbmdCb3g7CisgICAgY2FzZSBDU1NWYWx1ZU1hcmdp bkJveDoKKyAgICAgICAgcmV0dXJuIE1hcmdpbkJveDsKKyAgICBjYXNlIENTU1ZhbHVlQm9yZGVy Qm94OgorICAgICAgICByZXR1cm4gQm9yZGVyQm94OworICAgIGNhc2UgQ1NTVmFsdWVQYWRkaW5n Qm94OgorICAgICAgICByZXR1cm4gUGFkZGluZ0JveDsKKyAgICBjYXNlIENTU1ZhbHVlQ29udGVu dEJveDoKKyAgICAgICAgcmV0dXJuIENvbnRlbnRCb3g7CisgICAgZGVmYXVsdDoKKyAgICAgICAg YnJlYWs7CisgICAgfQorICAgIEFTU0VSVF9OT1RfUkVBQ0hFRCgpOworICAgIHJldHVybiBCb3hN aXNzaW5nOworfQorCiB9CiAKICNlbmRpZgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvY3Nz L0RlcHJlY2F0ZWRTdHlsZUJ1aWxkZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvY3NzL0RlcHJlY2F0 ZWRTdHlsZUJ1aWxkZXIuY3BwCmluZGV4IDM4YzA4YzguLjZlNTE0YmUgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL2Nzcy9EZXByZWNhdGVkU3R5bGVCdWlsZGVyLmNwcAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9jc3MvRGVwcmVjYXRlZFN0eWxlQnVpbGRlci5jcHAKQEAgLTIxMTAsNyArMjExMCw3 IEBAIHB1YmxpYzoKICAgICAgICAgICAgICAgICB8fCBwcmltaXRpdmVWYWx1ZS5nZXRWYWx1ZUlE KCkgPT0gQ1NTVmFsdWVNYXJnaW5Cb3gKICAgICAgICAgICAgICAgICB8fCBwcmltaXRpdmVWYWx1 ZS5nZXRWYWx1ZUlEKCkgPT0gQ1NTVmFsdWVCb3VuZGluZ0JveCkKICAgICAgICAgICAgICAgICAm JiByZWZlcmVuY2VCb3ggPT0gQm94TWlzc2luZykKLSAgICAgICAgICAgICAgICByZWZlcmVuY2VC b3ggPSBib3hGb3JWYWx1ZSgmcHJpbWl0aXZlVmFsdWUpOworICAgICAgICAgICAgICAgIHJlZmVy ZW5jZUJveCA9IExheW91dEJveChwcmltaXRpdmVWYWx1ZSk7CiAgICAgICAgICAgICBlbHNlCiAg ICAgICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICB9CkBAIC0yMTQ0LDcgKzIxNDQsNyBAQCBw dWJsaWM6CiAgICAgICAgICAgICAgICAgfHwgcHJpbWl0aXZlVmFsdWUtPmdldFZhbHVlSUQoKSA9 PSBDU1NWYWx1ZUJvcmRlckJveAogICAgICAgICAgICAgICAgIHx8IHByaW1pdGl2ZVZhbHVlLT5n ZXRWYWx1ZUlEKCkgPT0gQ1NTVmFsdWVQYWRkaW5nQm94CiAgICAgICAgICAgICAgICAgfHwgcHJp bWl0aXZlVmFsdWUtPmdldFZhbHVlSUQoKSA9PSBDU1NWYWx1ZU1hcmdpbkJveCkKLSAgICAgICAg ICAgICAgICBzZXRWYWx1ZShzdHlsZVJlc29sdmVyLT5zdHlsZSgpLCBTaGFwZVZhbHVlOjpjcmVh dGVMYXlvdXRCb3hWYWx1ZShib3hGb3JWYWx1ZShwcmltaXRpdmVWYWx1ZSkpKTsKKyAgICAgICAg ICAgICAgICBzZXRWYWx1ZShzdHlsZVJlc29sdmVyLT5zdHlsZSgpLCBTaGFwZVZhbHVlOjpjcmVh dGVMYXlvdXRCb3hWYWx1ZShMYXlvdXRCb3goKnByaW1pdGl2ZVZhbHVlKSkpOwogICAgICAgICAg ICAgZWxzZSBpZiAocHJpbWl0aXZlVmFsdWUtPmdldFZhbHVlSUQoKSA9PSBDU1NWYWx1ZU91dHNp ZGVTaGFwZSkKICAgICAgICAgICAgICAgICBzZXRWYWx1ZShzdHlsZVJlc29sdmVyLT5zdHlsZSgp LCBTaGFwZVZhbHVlOjpjcmVhdGVPdXRzaWRlVmFsdWUoKSk7CiAgICAgICAgICAgICBlbHNlIGlm IChwcmltaXRpdmVWYWx1ZS0+aXNTaGFwZSgpKSB7Cg== 221066 2014-01-13 11:24:25 -0800 2014-01-14 13:01:43 -0800 Updated Patch bug-126719-20140113112422.patch text/plain 9479 betravis U3VidmVyc2lvbiBSZXZpc2lvbjogMTYxODk2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNWRmMWMyYmZkZWIxNDMy NWRkMDQ4ZDczMWU3MGJjOTcyZWUzY2ZiZC4uYThlNWU1YTQ2MWExMGQ4ZWRlMjgxYjMwODJmOGJh N2E1ZDc2MmY4YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI4IEBACisyMDE0LTAxLTEzICBCZWFy IFRyYXZpcyAgPGJldHJhdmlzQGFkb2JlLmNvbT4KKworICAgICAgICBbQ1NTIFNoYXBlc10gTW92 ZSBDU1NQcmltaXRpdmVWYWx1ZSA8LT4gTGF5b3V0Qm94IENvbnZlcnNpb24gdG8gQ1NTUHJpbWl0 aXZlVmFsdWVNYXBwaW5ncworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MTI2NzE5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgVGhlIHN0YW5kYXJkIGxvY2F0aW9uIGZvciBjb252ZXJzaW9ucyB0by9mcm9tIENT U1ByaW1pdGl2ZVZhbHVlcyBpcyBDU1NQcmltaXRpdmVWYWx1ZU1hcHBpbmdzLgorICAgICAgICBU aGlzIHBhdGNoIG1vdmVzIHRoZSBjb252ZXJzaW9uIGZvciBMYXlvdXRCb3hlcyBmcm9tIEJhc2lj U2hhcGVGdW5jdGlvbnMgdG8KKyAgICAgICAgQ1NTUHJpbWl0aXZlVmFsdWVNYXBwaW5ncy5oLgor CisgICAgICAgIFJlZmFjdG9yaW5nLCBubyBuZXcgdGVzdHMuCisKKyAgICAgICAgKiBjc3MvQmFz aWNTaGFwZUZ1bmN0aW9ucy5jcHA6CisgICAgICAgIChXZWJDb3JlOjp2YWx1ZUZvckJhc2ljU2hh cGUpOgorICAgICAgICAoV2ViQ29yZTo6YmFzaWNTaGFwZUZvclZhbHVlKToKKyAgICAgICAgKiBj c3MvQ1NTQ29tcHV0ZWRTdHlsZURlY2xhcmF0aW9uLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkNv bXB1dGVkU3R5bGVFeHRyYWN0b3I6OnByb3BlcnR5VmFsdWUpOgorICAgICAgICAqIGNzcy9DU1NQ cmltaXRpdmVWYWx1ZU1hcHBpbmdzLmg6CisgICAgICAgIChXZWJDb3JlOjpDU1NQcmltaXRpdmVW YWx1ZTo6Q1NTUHJpbWl0aXZlVmFsdWUpOgorICAgICAgICAoV2ViQ29yZTo6Q1NTUHJpbWl0aXZl VmFsdWU6Om9wZXJhdG9yIExheW91dEJveCk6CisgICAgICAgICogY3NzL0RlcHJlY2F0ZWRTdHls ZUJ1aWxkZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6QXBwbHlQcm9wZXJ0eUNsaXBQYXRoOjph cHBseVZhbHVlKToKKyAgICAgICAgKFdlYkNvcmU6OkFwcGx5UHJvcGVydHlTaGFwZTo6YXBwbHlW YWx1ZSk6CisKIDIwMTQtMDEtMTMgIEFsZXhleSBQcm9za3VyeWFrb3YgIDxhcEBhcHBsZS5jb20+ CiAKICAgICAgICAgRml4IHRoZSBidWlsZCBtb3JlLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvY3NzL0Jhc2ljU2hhcGVGdW5jdGlvbnMuY3BwIGIvU291cmNlL1dlYkNvcmUvY3NzL0Jhc2lj U2hhcGVGdW5jdGlvbnMuY3BwCmluZGV4IGVkYTc3NzAxYzQ2Y2NmMzE5NjdkZmNjZjk2YmNiODE2 Y2Y5ODQzZTAuLjNmZTBmYTAyMzg0NzI1MjEwNTM3ZWRmZWU5MTcyZTg4Yzc2ODlhNWUgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9CYXNpY1NoYXBlRnVuY3Rpb25zLmNwcAorKysgYi9T b3VyY2UvV2ViQ29yZS9jc3MvQmFzaWNTaGFwZUZ1bmN0aW9ucy5jcHAKQEAgLTM5LDQ4ICszOSw2 IEBACiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAotUGFzc1JlZlB0cjxDU1NQcmltaXRpdmVWYWx1 ZT4gdmFsdWVGb3JCb3goTGF5b3V0Qm94IGJveCkKLXsKLSAgICBzd2l0Y2ggKGJveCkgewotICAg IGNhc2UgQ29udGVudEJveDoKLSAgICAgICAgcmV0dXJuIGNzc1ZhbHVlUG9vbCgpLmNyZWF0ZUlk ZW50aWZpZXJWYWx1ZShDU1NWYWx1ZUNvbnRlbnRCb3gpOwotICAgIGNhc2UgUGFkZGluZ0JveDoK LSAgICAgICAgcmV0dXJuIGNzc1ZhbHVlUG9vbCgpLmNyZWF0ZUlkZW50aWZpZXJWYWx1ZShDU1NW YWx1ZVBhZGRpbmdCb3gpOwotICAgIGNhc2UgQm9yZGVyQm94OgotICAgICAgICByZXR1cm4gY3Nz VmFsdWVQb29sKCkuY3JlYXRlSWRlbnRpZmllclZhbHVlKENTU1ZhbHVlQm9yZGVyQm94KTsKLSAg ICBjYXNlIE1hcmdpbkJveDoKLSAgICAgICAgcmV0dXJuIGNzc1ZhbHVlUG9vbCgpLmNyZWF0ZUlk ZW50aWZpZXJWYWx1ZShDU1NWYWx1ZU1hcmdpbkJveCk7Ci0gICAgY2FzZSBCb3VuZGluZ0JveDoK LSAgICAgICAgcmV0dXJuIGNzc1ZhbHVlUG9vbCgpLmNyZWF0ZUlkZW50aWZpZXJWYWx1ZShDU1NW YWx1ZUJvdW5kaW5nQm94KTsKLSAgICBjYXNlIEJveE1pc3Npbmc6Ci0gICAgICAgIHJldHVybiBu dWxscHRyOwotICAgIH0KLSAgICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsKLSAgICByZXR1cm4gbnVs bHB0cjsKLX0KLQotTGF5b3V0Qm94IGJveEZvclZhbHVlKGNvbnN0IENTU1ByaW1pdGl2ZVZhbHVl KiB2YWx1ZSkKLXsKLSAgICBpZiAoIXZhbHVlKQotICAgICAgICByZXR1cm4gQm94TWlzc2luZzsK LQotICAgIHN3aXRjaCAodmFsdWUtPmdldFZhbHVlSUQoKSkgewotICAgIGNhc2UgQ1NTVmFsdWVD b250ZW50Qm94OgotICAgICAgICByZXR1cm4gQ29udGVudEJveDsKLSAgICBjYXNlIENTU1ZhbHVl UGFkZGluZ0JveDoKLSAgICAgICAgcmV0dXJuIFBhZGRpbmdCb3g7Ci0gICAgY2FzZSBDU1NWYWx1 ZUJvcmRlckJveDoKLSAgICAgICAgcmV0dXJuIEJvcmRlckJveDsKLSAgICBjYXNlIENTU1ZhbHVl TWFyZ2luQm94OgotICAgICAgICByZXR1cm4gTWFyZ2luQm94OwotICAgIGNhc2UgQ1NTVmFsdWVC b3VuZGluZ0JveDoKLSAgICAgICAgcmV0dXJuIEJvdW5kaW5nQm94OwotICAgIGRlZmF1bHQ6Ci0g ICAgICAgIEFTU0VSVF9OT1RfUkVBQ0hFRCgpOwotICAgICAgICByZXR1cm4gQm94TWlzc2luZzsK LSAgICB9Ci19Ci0KIHN0YXRpYyBQYXNzUmVmUHRyPENTU1ByaW1pdGl2ZVZhbHVlPiB2YWx1ZUZv ckNlbnRlckNvb3JkaW5hdGUoQ1NTVmFsdWVQb29sJiBwb29sLCBjb25zdCBSZW5kZXJTdHlsZSog c3R5bGUsIGNvbnN0IEJhc2ljU2hhcGVDZW50ZXJDb29yZGluYXRlJiBjZW50ZXIpCiB7CiAgICAg Q1NTVmFsdWVJRCBrZXl3b3JkID0gQ1NTVmFsdWVJbnZhbGlkOwpAQCAtMjMwLDcgKzE4OCw4IEBA IFBhc3NSZWZQdHI8Q1NTVmFsdWU+IHZhbHVlRm9yQmFzaWNTaGFwZShjb25zdCBSZW5kZXJTdHls ZSogc3R5bGUsIGNvbnN0IEJhc2ljU2hhCiAgICAgICAgIGJyZWFrOwogICAgIH0KIAotICAgIGJh c2ljU2hhcGVWYWx1ZS0+c2V0TGF5b3V0Qm94KHZhbHVlRm9yQm94KGJhc2ljU2hhcGUtPmxheW91 dEJveCgpKSk7CisgICAgaWYgKGJhc2ljU2hhcGUtPmxheW91dEJveCgpICE9IEJveE1pc3Npbmcp CisgICAgICAgIGJhc2ljU2hhcGVWYWx1ZS0+c2V0TGF5b3V0Qm94KHBvb2wuY3JlYXRlVmFsdWUo YmFzaWNTaGFwZS0+bGF5b3V0Qm94KCkpKTsKIAogICAgIHJldHVybiBwb29sLmNyZWF0ZVZhbHVl KGJhc2ljU2hhcGVWYWx1ZS5yZWxlYXNlKCkpOwogfQpAQCAtNDYwLDcgKzQxOSw4IEBAIFBhc3NS ZWZQdHI8QmFzaWNTaGFwZT4gYmFzaWNTaGFwZUZvclZhbHVlKGNvbnN0IFJlbmRlclN0eWxlKiBz dHlsZSwgY29uc3QgUmVuZGVyCiAgICAgICAgIGJyZWFrOwogICAgIH0KIAotICAgIGJhc2ljU2hh cGUtPnNldExheW91dEJveChib3hGb3JWYWx1ZShiYXNpY1NoYXBlVmFsdWUtPmxheW91dEJveCgp KSk7CisgICAgaWYgKGJhc2ljU2hhcGVWYWx1ZS0+bGF5b3V0Qm94KCkpCisgICAgICAgIGJhc2lj U2hhcGUtPnNldExheW91dEJveChMYXlvdXRCb3goKmJhc2ljU2hhcGVWYWx1ZS0+bGF5b3V0Qm94 KCkpKTsKIAogICAgIHJldHVybiBiYXNpY1NoYXBlLnJlbGVhc2UoKTsKIH0KZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NDb21wdXRlZFN0eWxlRGVjbGFyYXRpb24uY3BwIGIvU291 cmNlL1dlYkNvcmUvY3NzL0NTU0NvbXB1dGVkU3R5bGVEZWNsYXJhdGlvbi5jcHAKaW5kZXggZTk0 MTRkYjExN2VkMjkzM2IwNTNkMDgzMzZjMjJmMDA3MTY0OGYxMi4uYTFlNTk5MGNhNTk5NTIxZGQ3 ZTg3M2JkNWEzNGVhNjg0NzA2NWVmYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvY3NzL0NT U0NvbXB1dGVkU3R5bGVEZWNsYXJhdGlvbi5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvY3NzL0NT U0NvbXB1dGVkU3R5bGVEZWNsYXJhdGlvbi5jcHAKQEAgLTI4ODUsMTEgKzI4ODUsMTEgQEAgUGFz c1JlZlB0cjxDU1NWYWx1ZT4gQ29tcHV0ZWRTdHlsZUV4dHJhY3Rvcjo6cHJvcGVydHlWYWx1ZShD U1NQcm9wZXJ0eUlEIHByb3BlcnQKICAgICAgICAgICAgICAgICBTaGFwZUNsaXBQYXRoT3BlcmF0 aW9uJiBzaGFwZU9wZXJhdGlvbiA9IHRvU2hhcGVDbGlwUGF0aE9wZXJhdGlvbigqb3BlcmF0aW9u KTsKICAgICAgICAgICAgICAgICBsaXN0LT5hcHBlbmQodmFsdWVGb3JCYXNpY1NoYXBlKHN0eWxl LmdldCgpLCBzaGFwZU9wZXJhdGlvbi5iYXNpY1NoYXBlKCkpKTsKICAgICAgICAgICAgICAgICBp ZiAoc2hhcGVPcGVyYXRpb24ucmVmZXJlbmNlQm94KCkgIT0gQm94TWlzc2luZykKLSAgICAgICAg ICAgICAgICAgICAgbGlzdC0+YXBwZW5kKHZhbHVlRm9yQm94KHNoYXBlT3BlcmF0aW9uLnJlZmVy ZW5jZUJveCgpKSk7CisgICAgICAgICAgICAgICAgICAgIGxpc3QtPmFwcGVuZChjc3NWYWx1ZVBv b2woKS5jcmVhdGVWYWx1ZShzaGFwZU9wZXJhdGlvbi5yZWZlcmVuY2VCb3goKSkpOwogICAgICAg ICAgICAgfQogICAgICAgICAgICAgaWYgKG9wZXJhdGlvbi0+dHlwZSgpID09IENsaXBQYXRoT3Bl cmF0aW9uOjpCb3gpIHsKICAgICAgICAgICAgICAgICBCb3hDbGlwUGF0aE9wZXJhdGlvbiYgYm94 T3BlcmF0aW9uID0gdG9Cb3hDbGlwUGF0aE9wZXJhdGlvbigqb3BlcmF0aW9uKTsKLSAgICAgICAg ICAgICAgICBsaXN0LT5hcHBlbmQodmFsdWVGb3JCb3goYm94T3BlcmF0aW9uLnJlZmVyZW5jZUJv eCgpKSk7CisgICAgICAgICAgICAgICAgbGlzdC0+YXBwZW5kKGNzc1ZhbHVlUG9vbCgpLmNyZWF0 ZVZhbHVlKGJveE9wZXJhdGlvbi5yZWZlcmVuY2VCb3goKSkpOwogICAgICAgICAgICAgfQogICAg ICAgICAgICAgcmV0dXJuIGxpc3QucmVsZWFzZSgpOwogICAgICAgICB9CkBAIC0yOTIyLDcgKzI5 MjIsNyBAQCBQYXNzUmVmUHRyPENTU1ZhbHVlPiBDb21wdXRlZFN0eWxlRXh0cmFjdG9yOjpwcm9w ZXJ0eVZhbHVlKENTU1Byb3BlcnR5SUQgcHJvcGVydAogICAgICAgICAgICAgaWYgKCFzdHlsZS0+ c2hhcGVJbnNpZGUoKSkKICAgICAgICAgICAgICAgICByZXR1cm4gY3NzVmFsdWVQb29sKCkuY3Jl YXRlSWRlbnRpZmllclZhbHVlKENTU1ZhbHVlTm9uZSk7CiAgICAgICAgICAgICBpZiAoc3R5bGUt PnNoYXBlSW5zaWRlKCktPnR5cGUoKSA9PSBTaGFwZVZhbHVlOjpCb3gpCi0gICAgICAgICAgICAg ICAgcmV0dXJuIHZhbHVlRm9yQm94KHN0eWxlLT5zaGFwZUluc2lkZSgpLT5sYXlvdXRCb3goKSk7 CisgICAgICAgICAgICAgICAgcmV0dXJuIGNzc1ZhbHVlUG9vbCgpLmNyZWF0ZVZhbHVlKHN0eWxl LT5zaGFwZUluc2lkZSgpLT5sYXlvdXRCb3goKSk7CiAgICAgICAgICAgICBpZiAoc3R5bGUtPnNo YXBlSW5zaWRlKCktPnR5cGUoKSA9PSBTaGFwZVZhbHVlOjpPdXRzaWRlKQogICAgICAgICAgICAg ICAgIHJldHVybiBjc3NWYWx1ZVBvb2woKS5jcmVhdGVJZGVudGlmaWVyVmFsdWUoQ1NTVmFsdWVP dXRzaWRlU2hhcGUpOwogICAgICAgICAgICAgaWYgKHN0eWxlLT5zaGFwZUluc2lkZSgpLT50eXBl KCkgPT0gU2hhcGVWYWx1ZTo6SW1hZ2UpIHsKQEAgLTI5MzYsNyArMjkzNiw3IEBAIFBhc3NSZWZQ dHI8Q1NTVmFsdWU+IENvbXB1dGVkU3R5bGVFeHRyYWN0b3I6OnByb3BlcnR5VmFsdWUoQ1NTUHJv cGVydHlJRCBwcm9wZXJ0CiAgICAgICAgICAgICBpZiAoIXN0eWxlLT5zaGFwZU91dHNpZGUoKSkK ICAgICAgICAgICAgICAgICByZXR1cm4gY3NzVmFsdWVQb29sKCkuY3JlYXRlSWRlbnRpZmllclZh bHVlKENTU1ZhbHVlTm9uZSk7CiAgICAgICAgICAgICBpZiAoc3R5bGUtPnNoYXBlT3V0c2lkZSgp LT50eXBlKCkgPT0gU2hhcGVWYWx1ZTo6Qm94KQotICAgICAgICAgICAgICAgIHJldHVybiB2YWx1 ZUZvckJveChzdHlsZS0+c2hhcGVPdXRzaWRlKCktPmxheW91dEJveCgpKTsKKyAgICAgICAgICAg ICAgICByZXR1cm4gY3NzVmFsdWVQb29sKCkuY3JlYXRlVmFsdWUoc3R5bGUtPnNoYXBlT3V0c2lk ZSgpLT5sYXlvdXRCb3goKSk7CiAgICAgICAgICAgICBpZiAoc3R5bGUtPnNoYXBlT3V0c2lkZSgp LT50eXBlKCkgPT0gU2hhcGVWYWx1ZTo6SW1hZ2UpIHsKICAgICAgICAgICAgICAgICBpZiAoc3R5 bGUtPnNoYXBlT3V0c2lkZSgpLT5pbWFnZSgpKQogICAgICAgICAgICAgICAgICAgICByZXR1cm4g c3R5bGUtPnNoYXBlT3V0c2lkZSgpLT5pbWFnZSgpLT5jc3NWYWx1ZSgpOwpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvY3NzL0NTU1ByaW1pdGl2ZVZhbHVlTWFwcGluZ3MuaCBiL1NvdXJjZS9X ZWJDb3JlL2Nzcy9DU1NQcmltaXRpdmVWYWx1ZU1hcHBpbmdzLmgKaW5kZXggMzBmZjgxZDA3YTkw NzE0MjkxMmU5N2UyODRhZTAzNjE0ZTY5YjUxNC4uNzJiY2FkODVmODVjZjI4MDBlZmFjNGQ0MWMx MTJlYTU2MzZkODVjOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvY3NzL0NTU1ByaW1pdGl2 ZVZhbHVlTWFwcGluZ3MuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTUHJpbWl0aXZlVmFs dWVNYXBwaW5ncy5oCkBAIC01MTY1LDYgKzUxNjUsNTMgQEAgdGVtcGxhdGU8PiBpbmxpbmUgQ1NT UHJpbWl0aXZlVmFsdWU6Om9wZXJhdG9yIEltYWdlT3JpZW50YXRpb25FbnVtKCkgY29uc3QKIAog I2VuZGlmIC8vIEVOQUJMRShDU1NfSU1BR0VfT1JJRU5UQVRJT04pCiAKK3RlbXBsYXRlPD4gaW5s aW5lIENTU1ByaW1pdGl2ZVZhbHVlOjpDU1NQcmltaXRpdmVWYWx1ZShMYXlvdXRCb3ggbGF5b3V0 Qm94KQorICAgIDogQ1NTVmFsdWUoUHJpbWl0aXZlQ2xhc3MpCit7CisgICAgbV9wcmltaXRpdmVV bml0VHlwZSA9IENTU19WQUxVRV9JRDsKKyAgICBzd2l0Y2ggKGxheW91dEJveCkgeworICAgIGNh c2UgQm91bmRpbmdCb3g6CisgICAgICAgIG1fdmFsdWUudmFsdWVJRCA9IENTU1ZhbHVlQm91bmRp bmdCb3g7CisgICAgICAgIGJyZWFrOworICAgIGNhc2UgTWFyZ2luQm94OgorICAgICAgICBtX3Zh bHVlLnZhbHVlSUQgPSBDU1NWYWx1ZU1hcmdpbkJveDsKKyAgICAgICAgYnJlYWs7CisgICAgY2Fz ZSBCb3JkZXJCb3g6CisgICAgICAgIG1fdmFsdWUudmFsdWVJRCA9IENTU1ZhbHVlQm9yZGVyQm94 OworICAgICAgICBicmVhazsKKyAgICBjYXNlIFBhZGRpbmdCb3g6CisgICAgICAgIG1fdmFsdWUu dmFsdWVJRCA9IENTU1ZhbHVlUGFkZGluZ0JveDsKKyAgICAgICAgYnJlYWs7CisgICAgY2FzZSBD b250ZW50Qm94OgorICAgICAgICBtX3ZhbHVlLnZhbHVlSUQgPSBDU1NWYWx1ZUNvbnRlbnRCb3g7 CisgICAgICAgIGJyZWFrOworICAgIGNhc2UgQm94TWlzc2luZzoKKyAgICAgICAgQVNTRVJUX05P VF9SRUFDSEVEKCk7CisgICAgICAgIG1fdmFsdWUudmFsdWVJRCA9IENTU1ZhbHVlTm9uZTsKKyAg ICAgICAgYnJlYWs7CisgICAgfQorfQorCit0ZW1wbGF0ZTw+IGlubGluZSBDU1NQcmltaXRpdmVW YWx1ZTo6b3BlcmF0b3IgTGF5b3V0Qm94KCkgY29uc3QKK3sKKyAgICBzd2l0Y2ggKGdldFZhbHVl SUQoKSkgeworICAgIGNhc2UgQ1NTVmFsdWVCb3VuZGluZ0JveDoKKyAgICAgICAgcmV0dXJuIEJv dW5kaW5nQm94OworICAgIGNhc2UgQ1NTVmFsdWVNYXJnaW5Cb3g6CisgICAgICAgIHJldHVybiBN YXJnaW5Cb3g7CisgICAgY2FzZSBDU1NWYWx1ZUJvcmRlckJveDoKKyAgICAgICAgcmV0dXJuIEJv cmRlckJveDsKKyAgICBjYXNlIENTU1ZhbHVlUGFkZGluZ0JveDoKKyAgICAgICAgcmV0dXJuIFBh ZGRpbmdCb3g7CisgICAgY2FzZSBDU1NWYWx1ZUNvbnRlbnRCb3g6CisgICAgICAgIHJldHVybiBD b250ZW50Qm94OworICAgIGRlZmF1bHQ6CisgICAgICAgIGJyZWFrOworICAgIH0KKyAgICBBU1NF UlRfTk9UX1JFQUNIRUQoKTsKKyAgICByZXR1cm4gQm94TWlzc2luZzsKK30KKwogfQogCiAjZW5k aWYKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9EZXByZWNhdGVkU3R5bGVCdWlsZGVy LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9EZXByZWNhdGVkU3R5bGVCdWlsZGVyLmNwcAppbmRl eCAzOGMwOGM4ODM3MGMyNTdhZTNlZGU2NjA4MWI2M2Y0MTYyZTUwMzcxLi42ZTUxNGJlYTM5ZTEw N2EzMGRiMmE1YWNjNDk0NWQzNzBlMTZkZmI1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9j c3MvRGVwcmVjYXRlZFN0eWxlQnVpbGRlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvY3NzL0Rl cHJlY2F0ZWRTdHlsZUJ1aWxkZXIuY3BwCkBAIC0yMTEwLDcgKzIxMTAsNyBAQCBwdWJsaWM6CiAg ICAgICAgICAgICAgICAgfHwgcHJpbWl0aXZlVmFsdWUuZ2V0VmFsdWVJRCgpID09IENTU1ZhbHVl TWFyZ2luQm94CiAgICAgICAgICAgICAgICAgfHwgcHJpbWl0aXZlVmFsdWUuZ2V0VmFsdWVJRCgp ID09IENTU1ZhbHVlQm91bmRpbmdCb3gpCiAgICAgICAgICAgICAgICAgJiYgcmVmZXJlbmNlQm94 ID09IEJveE1pc3NpbmcpCi0gICAgICAgICAgICAgICAgcmVmZXJlbmNlQm94ID0gYm94Rm9yVmFs dWUoJnByaW1pdGl2ZVZhbHVlKTsKKyAgICAgICAgICAgICAgICByZWZlcmVuY2VCb3ggPSBMYXlv dXRCb3gocHJpbWl0aXZlVmFsdWUpOwogICAgICAgICAgICAgZWxzZQogICAgICAgICAgICAgICAg IHJldHVybjsKICAgICAgICAgfQpAQCAtMjE0NCw3ICsyMTQ0LDcgQEAgcHVibGljOgogICAgICAg ICAgICAgICAgIHx8IHByaW1pdGl2ZVZhbHVlLT5nZXRWYWx1ZUlEKCkgPT0gQ1NTVmFsdWVCb3Jk ZXJCb3gKICAgICAgICAgICAgICAgICB8fCBwcmltaXRpdmVWYWx1ZS0+Z2V0VmFsdWVJRCgpID09 IENTU1ZhbHVlUGFkZGluZ0JveAogICAgICAgICAgICAgICAgIHx8IHByaW1pdGl2ZVZhbHVlLT5n ZXRWYWx1ZUlEKCkgPT0gQ1NTVmFsdWVNYXJnaW5Cb3gpCi0gICAgICAgICAgICAgICAgc2V0VmFs dWUoc3R5bGVSZXNvbHZlci0+c3R5bGUoKSwgU2hhcGVWYWx1ZTo6Y3JlYXRlTGF5b3V0Qm94VmFs dWUoYm94Rm9yVmFsdWUocHJpbWl0aXZlVmFsdWUpKSk7CisgICAgICAgICAgICAgICAgc2V0VmFs dWUoc3R5bGVSZXNvbHZlci0+c3R5bGUoKSwgU2hhcGVWYWx1ZTo6Y3JlYXRlTGF5b3V0Qm94VmFs dWUoTGF5b3V0Qm94KCpwcmltaXRpdmVWYWx1ZSkpKTsKICAgICAgICAgICAgIGVsc2UgaWYgKHBy aW1pdGl2ZVZhbHVlLT5nZXRWYWx1ZUlEKCkgPT0gQ1NTVmFsdWVPdXRzaWRlU2hhcGUpCiAgICAg ICAgICAgICAgICAgc2V0VmFsdWUoc3R5bGVSZXNvbHZlci0+c3R5bGUoKSwgU2hhcGVWYWx1ZTo6 Y3JlYXRlT3V0c2lkZVZhbHVlKCkpOwogICAgICAgICAgICAgZWxzZSBpZiAocHJpbWl0aXZlVmFs dWUtPmlzU2hhcGUoKSkgewo= 221190 2014-01-14 13:01:43 -0800 2014-01-14 13:37:54 -0800 Adding reviewer to changelogs 126719.patch text/plain 9177 betravis ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBkMjc1ZmI1Li5lOWE0YzhjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjgg QEAKKzIwMTQtMDEtMTMgIEJlYXIgVHJhdmlzICA8YmV0cmF2aXNAYWRvYmUuY29tPgorCisgICAg ICAgIFtDU1MgU2hhcGVzXSBNb3ZlIENTU1ByaW1pdGl2ZVZhbHVlIDwtPiBMYXlvdXRCb3ggQ29u dmVyc2lvbiB0byBDU1NQcmltaXRpdmVWYWx1ZU1hcHBpbmdzCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMjY3MTkKKworICAgICAgICBSZXZpZXdlZCBi eSBEaXJrIFNjaHVsemUuCisKKyAgICAgICAgVGhlIHN0YW5kYXJkIGxvY2F0aW9uIGZvciBjb252 ZXJzaW9ucyB0by9mcm9tIENTU1ByaW1pdGl2ZVZhbHVlcyBpcyBDU1NQcmltaXRpdmVWYWx1ZU1h cHBpbmdzLgorICAgICAgICBUaGlzIHBhdGNoIG1vdmVzIHRoZSBjb252ZXJzaW9uIGZvciBMYXlv dXRCb3hlcyBmcm9tIEJhc2ljU2hhcGVGdW5jdGlvbnMgdG8KKyAgICAgICAgQ1NTUHJpbWl0aXZl VmFsdWVNYXBwaW5ncy5oLgorCisgICAgICAgIFJlZmFjdG9yaW5nLCBubyBuZXcgdGVzdHMuCisK KyAgICAgICAgKiBjc3MvQmFzaWNTaGFwZUZ1bmN0aW9ucy5jcHA6CisgICAgICAgIChXZWJDb3Jl Ojp2YWx1ZUZvckJhc2ljU2hhcGUpOgorICAgICAgICAoV2ViQ29yZTo6YmFzaWNTaGFwZUZvclZh bHVlKToKKyAgICAgICAgKiBjc3MvQ1NTQ29tcHV0ZWRTdHlsZURlY2xhcmF0aW9uLmNwcDoKKyAg ICAgICAgKFdlYkNvcmU6OkNvbXB1dGVkU3R5bGVFeHRyYWN0b3I6OnByb3BlcnR5VmFsdWUpOgor ICAgICAgICAqIGNzcy9DU1NQcmltaXRpdmVWYWx1ZU1hcHBpbmdzLmg6CisgICAgICAgIChXZWJD b3JlOjpDU1NQcmltaXRpdmVWYWx1ZTo6Q1NTUHJpbWl0aXZlVmFsdWUpOgorICAgICAgICAoV2Vi Q29yZTo6Q1NTUHJpbWl0aXZlVmFsdWU6Om9wZXJhdG9yIExheW91dEJveCk6CisgICAgICAgICog Y3NzL0RlcHJlY2F0ZWRTdHlsZUJ1aWxkZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6QXBwbHlQ cm9wZXJ0eUNsaXBQYXRoOjphcHBseVZhbHVlKToKKyAgICAgICAgKFdlYkNvcmU6OkFwcGx5UHJv cGVydHlTaGFwZTo6YXBwbHlWYWx1ZSk6CisKIDIwMTQtMDEtMTQgIEJyZW50IEZ1bGdoYW0gIDxi ZnVsZ2hhbUBhcHBsZS5jb20+CiAKICAgICAgICAgW1dlYkdMXSBJbnZhbGlkIHJhbmdlIGNoZWNr aW5nIGluIFdlYkdMUmVuZGVyaW5nQ29udGV4dDo6dmFsaWRhdGVUZXhGdW5jTGV2ZWwKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9CYXNpY1NoYXBlRnVuY3Rpb25zLmNwcCBiL1NvdXJj ZS9XZWJDb3JlL2Nzcy9CYXNpY1NoYXBlRnVuY3Rpb25zLmNwcAppbmRleCBlZGE3NzcwLi4zZmUw ZmEwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9jc3MvQmFzaWNTaGFwZUZ1bmN0aW9ucy5j cHAKKysrIGIvU291cmNlL1dlYkNvcmUvY3NzL0Jhc2ljU2hhcGVGdW5jdGlvbnMuY3BwCkBAIC0z OSw0OCArMzksNiBAQAogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKLVBhc3NSZWZQdHI8Q1NTUHJp bWl0aXZlVmFsdWU+IHZhbHVlRm9yQm94KExheW91dEJveCBib3gpCi17Ci0gICAgc3dpdGNoIChi b3gpIHsKLSAgICBjYXNlIENvbnRlbnRCb3g6Ci0gICAgICAgIHJldHVybiBjc3NWYWx1ZVBvb2wo KS5jcmVhdGVJZGVudGlmaWVyVmFsdWUoQ1NTVmFsdWVDb250ZW50Qm94KTsKLSAgICBjYXNlIFBh ZGRpbmdCb3g6Ci0gICAgICAgIHJldHVybiBjc3NWYWx1ZVBvb2woKS5jcmVhdGVJZGVudGlmaWVy VmFsdWUoQ1NTVmFsdWVQYWRkaW5nQm94KTsKLSAgICBjYXNlIEJvcmRlckJveDoKLSAgICAgICAg cmV0dXJuIGNzc1ZhbHVlUG9vbCgpLmNyZWF0ZUlkZW50aWZpZXJWYWx1ZShDU1NWYWx1ZUJvcmRl ckJveCk7Ci0gICAgY2FzZSBNYXJnaW5Cb3g6Ci0gICAgICAgIHJldHVybiBjc3NWYWx1ZVBvb2wo KS5jcmVhdGVJZGVudGlmaWVyVmFsdWUoQ1NTVmFsdWVNYXJnaW5Cb3gpOwotICAgIGNhc2UgQm91 bmRpbmdCb3g6Ci0gICAgICAgIHJldHVybiBjc3NWYWx1ZVBvb2woKS5jcmVhdGVJZGVudGlmaWVy VmFsdWUoQ1NTVmFsdWVCb3VuZGluZ0JveCk7Ci0gICAgY2FzZSBCb3hNaXNzaW5nOgotICAgICAg ICByZXR1cm4gbnVsbHB0cjsKLSAgICB9Ci0gICAgQVNTRVJUX05PVF9SRUFDSEVEKCk7Ci0gICAg cmV0dXJuIG51bGxwdHI7Ci19Ci0KLUxheW91dEJveCBib3hGb3JWYWx1ZShjb25zdCBDU1NQcmlt aXRpdmVWYWx1ZSogdmFsdWUpCi17Ci0gICAgaWYgKCF2YWx1ZSkKLSAgICAgICAgcmV0dXJuIEJv eE1pc3Npbmc7Ci0KLSAgICBzd2l0Y2ggKHZhbHVlLT5nZXRWYWx1ZUlEKCkpIHsKLSAgICBjYXNl IENTU1ZhbHVlQ29udGVudEJveDoKLSAgICAgICAgcmV0dXJuIENvbnRlbnRCb3g7Ci0gICAgY2Fz ZSBDU1NWYWx1ZVBhZGRpbmdCb3g6Ci0gICAgICAgIHJldHVybiBQYWRkaW5nQm94OwotICAgIGNh c2UgQ1NTVmFsdWVCb3JkZXJCb3g6Ci0gICAgICAgIHJldHVybiBCb3JkZXJCb3g7Ci0gICAgY2Fz ZSBDU1NWYWx1ZU1hcmdpbkJveDoKLSAgICAgICAgcmV0dXJuIE1hcmdpbkJveDsKLSAgICBjYXNl IENTU1ZhbHVlQm91bmRpbmdCb3g6Ci0gICAgICAgIHJldHVybiBCb3VuZGluZ0JveDsKLSAgICBk ZWZhdWx0OgotICAgICAgICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsKLSAgICAgICAgcmV0dXJuIEJv eE1pc3Npbmc7Ci0gICAgfQotfQotCiBzdGF0aWMgUGFzc1JlZlB0cjxDU1NQcmltaXRpdmVWYWx1 ZT4gdmFsdWVGb3JDZW50ZXJDb29yZGluYXRlKENTU1ZhbHVlUG9vbCYgcG9vbCwgY29uc3QgUmVu ZGVyU3R5bGUqIHN0eWxlLCBjb25zdCBCYXNpY1NoYXBlQ2VudGVyQ29vcmRpbmF0ZSYgY2VudGVy KQogewogICAgIENTU1ZhbHVlSUQga2V5d29yZCA9IENTU1ZhbHVlSW52YWxpZDsKQEAgLTIzMCw3 ICsxODgsOCBAQCBQYXNzUmVmUHRyPENTU1ZhbHVlPiB2YWx1ZUZvckJhc2ljU2hhcGUoY29uc3Qg UmVuZGVyU3R5bGUqIHN0eWxlLCBjb25zdCBCYXNpY1NoYQogICAgICAgICBicmVhazsKICAgICB9 CiAKLSAgICBiYXNpY1NoYXBlVmFsdWUtPnNldExheW91dEJveCh2YWx1ZUZvckJveChiYXNpY1No YXBlLT5sYXlvdXRCb3goKSkpOworICAgIGlmIChiYXNpY1NoYXBlLT5sYXlvdXRCb3goKSAhPSBC b3hNaXNzaW5nKQorICAgICAgICBiYXNpY1NoYXBlVmFsdWUtPnNldExheW91dEJveChwb29sLmNy ZWF0ZVZhbHVlKGJhc2ljU2hhcGUtPmxheW91dEJveCgpKSk7CiAKICAgICByZXR1cm4gcG9vbC5j cmVhdGVWYWx1ZShiYXNpY1NoYXBlVmFsdWUucmVsZWFzZSgpKTsKIH0KQEAgLTQ2MCw3ICs0MTks OCBAQCBQYXNzUmVmUHRyPEJhc2ljU2hhcGU+IGJhc2ljU2hhcGVGb3JWYWx1ZShjb25zdCBSZW5k ZXJTdHlsZSogc3R5bGUsIGNvbnN0IFJlbmRlcgogICAgICAgICBicmVhazsKICAgICB9CiAKLSAg ICBiYXNpY1NoYXBlLT5zZXRMYXlvdXRCb3goYm94Rm9yVmFsdWUoYmFzaWNTaGFwZVZhbHVlLT5s YXlvdXRCb3goKSkpOworICAgIGlmIChiYXNpY1NoYXBlVmFsdWUtPmxheW91dEJveCgpKQorICAg ICAgICBiYXNpY1NoYXBlLT5zZXRMYXlvdXRCb3goTGF5b3V0Qm94KCpiYXNpY1NoYXBlVmFsdWUt PmxheW91dEJveCgpKSk7CiAKICAgICByZXR1cm4gYmFzaWNTaGFwZS5yZWxlYXNlKCk7CiB9CmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTQ29tcHV0ZWRTdHlsZURlY2xhcmF0aW9u LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NDb21wdXRlZFN0eWxlRGVjbGFyYXRpb24uY3Bw CmluZGV4IGU5NDE0ZGIuLmExZTU5OTAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9D U1NDb21wdXRlZFN0eWxlRGVjbGFyYXRpb24uY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9D U1NDb21wdXRlZFN0eWxlRGVjbGFyYXRpb24uY3BwCkBAIC0yODg1LDExICsyODg1LDExIEBAIFBh c3NSZWZQdHI8Q1NTVmFsdWU+IENvbXB1dGVkU3R5bGVFeHRyYWN0b3I6OnByb3BlcnR5VmFsdWUo Q1NTUHJvcGVydHlJRCBwcm9wZXJ0CiAgICAgICAgICAgICAgICAgU2hhcGVDbGlwUGF0aE9wZXJh dGlvbiYgc2hhcGVPcGVyYXRpb24gPSB0b1NoYXBlQ2xpcFBhdGhPcGVyYXRpb24oKm9wZXJhdGlv bik7CiAgICAgICAgICAgICAgICAgbGlzdC0+YXBwZW5kKHZhbHVlRm9yQmFzaWNTaGFwZShzdHls ZS5nZXQoKSwgc2hhcGVPcGVyYXRpb24uYmFzaWNTaGFwZSgpKSk7CiAgICAgICAgICAgICAgICAg aWYgKHNoYXBlT3BlcmF0aW9uLnJlZmVyZW5jZUJveCgpICE9IEJveE1pc3NpbmcpCi0gICAgICAg ICAgICAgICAgICAgIGxpc3QtPmFwcGVuZCh2YWx1ZUZvckJveChzaGFwZU9wZXJhdGlvbi5yZWZl cmVuY2VCb3goKSkpOworICAgICAgICAgICAgICAgICAgICBsaXN0LT5hcHBlbmQoY3NzVmFsdWVQ b29sKCkuY3JlYXRlVmFsdWUoc2hhcGVPcGVyYXRpb24ucmVmZXJlbmNlQm94KCkpKTsKICAgICAg ICAgICAgIH0KICAgICAgICAgICAgIGlmIChvcGVyYXRpb24tPnR5cGUoKSA9PSBDbGlwUGF0aE9w ZXJhdGlvbjo6Qm94KSB7CiAgICAgICAgICAgICAgICAgQm94Q2xpcFBhdGhPcGVyYXRpb24mIGJv eE9wZXJhdGlvbiA9IHRvQm94Q2xpcFBhdGhPcGVyYXRpb24oKm9wZXJhdGlvbik7Ci0gICAgICAg ICAgICAgICAgbGlzdC0+YXBwZW5kKHZhbHVlRm9yQm94KGJveE9wZXJhdGlvbi5yZWZlcmVuY2VC b3goKSkpOworICAgICAgICAgICAgICAgIGxpc3QtPmFwcGVuZChjc3NWYWx1ZVBvb2woKS5jcmVh dGVWYWx1ZShib3hPcGVyYXRpb24ucmVmZXJlbmNlQm94KCkpKTsKICAgICAgICAgICAgIH0KICAg ICAgICAgICAgIHJldHVybiBsaXN0LnJlbGVhc2UoKTsKICAgICAgICAgfQpAQCAtMjkyMiw3ICsy OTIyLDcgQEAgUGFzc1JlZlB0cjxDU1NWYWx1ZT4gQ29tcHV0ZWRTdHlsZUV4dHJhY3Rvcjo6cHJv cGVydHlWYWx1ZShDU1NQcm9wZXJ0eUlEIHByb3BlcnQKICAgICAgICAgICAgIGlmICghc3R5bGUt PnNoYXBlSW5zaWRlKCkpCiAgICAgICAgICAgICAgICAgcmV0dXJuIGNzc1ZhbHVlUG9vbCgpLmNy ZWF0ZUlkZW50aWZpZXJWYWx1ZShDU1NWYWx1ZU5vbmUpOwogICAgICAgICAgICAgaWYgKHN0eWxl LT5zaGFwZUluc2lkZSgpLT50eXBlKCkgPT0gU2hhcGVWYWx1ZTo6Qm94KQotICAgICAgICAgICAg ICAgIHJldHVybiB2YWx1ZUZvckJveChzdHlsZS0+c2hhcGVJbnNpZGUoKS0+bGF5b3V0Qm94KCkp OworICAgICAgICAgICAgICAgIHJldHVybiBjc3NWYWx1ZVBvb2woKS5jcmVhdGVWYWx1ZShzdHls ZS0+c2hhcGVJbnNpZGUoKS0+bGF5b3V0Qm94KCkpOwogICAgICAgICAgICAgaWYgKHN0eWxlLT5z aGFwZUluc2lkZSgpLT50eXBlKCkgPT0gU2hhcGVWYWx1ZTo6T3V0c2lkZSkKICAgICAgICAgICAg ICAgICByZXR1cm4gY3NzVmFsdWVQb29sKCkuY3JlYXRlSWRlbnRpZmllclZhbHVlKENTU1ZhbHVl T3V0c2lkZVNoYXBlKTsKICAgICAgICAgICAgIGlmIChzdHlsZS0+c2hhcGVJbnNpZGUoKS0+dHlw ZSgpID09IFNoYXBlVmFsdWU6OkltYWdlKSB7CkBAIC0yOTM2LDcgKzI5MzYsNyBAQCBQYXNzUmVm UHRyPENTU1ZhbHVlPiBDb21wdXRlZFN0eWxlRXh0cmFjdG9yOjpwcm9wZXJ0eVZhbHVlKENTU1By b3BlcnR5SUQgcHJvcGVydAogICAgICAgICAgICAgaWYgKCFzdHlsZS0+c2hhcGVPdXRzaWRlKCkp CiAgICAgICAgICAgICAgICAgcmV0dXJuIGNzc1ZhbHVlUG9vbCgpLmNyZWF0ZUlkZW50aWZpZXJW YWx1ZShDU1NWYWx1ZU5vbmUpOwogICAgICAgICAgICAgaWYgKHN0eWxlLT5zaGFwZU91dHNpZGUo KS0+dHlwZSgpID09IFNoYXBlVmFsdWU6OkJveCkKLSAgICAgICAgICAgICAgICByZXR1cm4gdmFs dWVGb3JCb3goc3R5bGUtPnNoYXBlT3V0c2lkZSgpLT5sYXlvdXRCb3goKSk7CisgICAgICAgICAg ICAgICAgcmV0dXJuIGNzc1ZhbHVlUG9vbCgpLmNyZWF0ZVZhbHVlKHN0eWxlLT5zaGFwZU91dHNp ZGUoKS0+bGF5b3V0Qm94KCkpOwogICAgICAgICAgICAgaWYgKHN0eWxlLT5zaGFwZU91dHNpZGUo KS0+dHlwZSgpID09IFNoYXBlVmFsdWU6OkltYWdlKSB7CiAgICAgICAgICAgICAgICAgaWYgKHN0 eWxlLT5zaGFwZU91dHNpZGUoKS0+aW1hZ2UoKSkKICAgICAgICAgICAgICAgICAgICAgcmV0dXJu IHN0eWxlLT5zaGFwZU91dHNpZGUoKS0+aW1hZ2UoKS0+Y3NzVmFsdWUoKTsKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NQcmltaXRpdmVWYWx1ZU1hcHBpbmdzLmggYi9Tb3VyY2Uv V2ViQ29yZS9jc3MvQ1NTUHJpbWl0aXZlVmFsdWVNYXBwaW5ncy5oCmluZGV4IDMwZmY4MWQuLjcy YmNhZDggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NQcmltaXRpdmVWYWx1ZU1h cHBpbmdzLmgKKysrIGIvU291cmNlL1dlYkNvcmUvY3NzL0NTU1ByaW1pdGl2ZVZhbHVlTWFwcGlu Z3MuaApAQCAtNTE2NSw2ICs1MTY1LDUzIEBAIHRlbXBsYXRlPD4gaW5saW5lIENTU1ByaW1pdGl2 ZVZhbHVlOjpvcGVyYXRvciBJbWFnZU9yaWVudGF0aW9uRW51bSgpIGNvbnN0CiAKICNlbmRpZiAv LyBFTkFCTEUoQ1NTX0lNQUdFX09SSUVOVEFUSU9OKQogCit0ZW1wbGF0ZTw+IGlubGluZSBDU1NQ cmltaXRpdmVWYWx1ZTo6Q1NTUHJpbWl0aXZlVmFsdWUoTGF5b3V0Qm94IGxheW91dEJveCkKKyAg ICA6IENTU1ZhbHVlKFByaW1pdGl2ZUNsYXNzKQoreworICAgIG1fcHJpbWl0aXZlVW5pdFR5cGUg PSBDU1NfVkFMVUVfSUQ7CisgICAgc3dpdGNoIChsYXlvdXRCb3gpIHsKKyAgICBjYXNlIEJvdW5k aW5nQm94OgorICAgICAgICBtX3ZhbHVlLnZhbHVlSUQgPSBDU1NWYWx1ZUJvdW5kaW5nQm94Owor ICAgICAgICBicmVhazsKKyAgICBjYXNlIE1hcmdpbkJveDoKKyAgICAgICAgbV92YWx1ZS52YWx1 ZUlEID0gQ1NTVmFsdWVNYXJnaW5Cb3g7CisgICAgICAgIGJyZWFrOworICAgIGNhc2UgQm9yZGVy Qm94OgorICAgICAgICBtX3ZhbHVlLnZhbHVlSUQgPSBDU1NWYWx1ZUJvcmRlckJveDsKKyAgICAg ICAgYnJlYWs7CisgICAgY2FzZSBQYWRkaW5nQm94OgorICAgICAgICBtX3ZhbHVlLnZhbHVlSUQg PSBDU1NWYWx1ZVBhZGRpbmdCb3g7CisgICAgICAgIGJyZWFrOworICAgIGNhc2UgQ29udGVudEJv eDoKKyAgICAgICAgbV92YWx1ZS52YWx1ZUlEID0gQ1NTVmFsdWVDb250ZW50Qm94OworICAgICAg ICBicmVhazsKKyAgICBjYXNlIEJveE1pc3Npbmc6CisgICAgICAgIEFTU0VSVF9OT1RfUkVBQ0hF RCgpOworICAgICAgICBtX3ZhbHVlLnZhbHVlSUQgPSBDU1NWYWx1ZU5vbmU7CisgICAgICAgIGJy ZWFrOworICAgIH0KK30KKwordGVtcGxhdGU8PiBpbmxpbmUgQ1NTUHJpbWl0aXZlVmFsdWU6Om9w ZXJhdG9yIExheW91dEJveCgpIGNvbnN0Cit7CisgICAgc3dpdGNoIChnZXRWYWx1ZUlEKCkpIHsK KyAgICBjYXNlIENTU1ZhbHVlQm91bmRpbmdCb3g6CisgICAgICAgIHJldHVybiBCb3VuZGluZ0Jv eDsKKyAgICBjYXNlIENTU1ZhbHVlTWFyZ2luQm94OgorICAgICAgICByZXR1cm4gTWFyZ2luQm94 OworICAgIGNhc2UgQ1NTVmFsdWVCb3JkZXJCb3g6CisgICAgICAgIHJldHVybiBCb3JkZXJCb3g7 CisgICAgY2FzZSBDU1NWYWx1ZVBhZGRpbmdCb3g6CisgICAgICAgIHJldHVybiBQYWRkaW5nQm94 OworICAgIGNhc2UgQ1NTVmFsdWVDb250ZW50Qm94OgorICAgICAgICByZXR1cm4gQ29udGVudEJv eDsKKyAgICBkZWZhdWx0OgorICAgICAgICBicmVhazsKKyAgICB9CisgICAgQVNTRVJUX05PVF9S RUFDSEVEKCk7CisgICAgcmV0dXJuIEJveE1pc3Npbmc7Cit9CisKIH0KIAogI2VuZGlmCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9jc3MvRGVwcmVjYXRlZFN0eWxlQnVpbGRlci5jcHAgYi9T b3VyY2UvV2ViQ29yZS9jc3MvRGVwcmVjYXRlZFN0eWxlQnVpbGRlci5jcHAKaW5kZXggOWYyZWE2 My4uYjg2Y2Q0OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvY3NzL0RlcHJlY2F0ZWRTdHls ZUJ1aWxkZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9EZXByZWNhdGVkU3R5bGVCdWls ZGVyLmNwcApAQCAtMjExMCw3ICsyMTEwLDcgQEAgcHVibGljOgogICAgICAgICAgICAgICAgIHx8 IHByaW1pdGl2ZVZhbHVlLmdldFZhbHVlSUQoKSA9PSBDU1NWYWx1ZU1hcmdpbkJveAogICAgICAg ICAgICAgICAgIHx8IHByaW1pdGl2ZVZhbHVlLmdldFZhbHVlSUQoKSA9PSBDU1NWYWx1ZUJvdW5k aW5nQm94KQogICAgICAgICAgICAgICAgICYmIHJlZmVyZW5jZUJveCA9PSBCb3hNaXNzaW5nKQot ICAgICAgICAgICAgICAgIHJlZmVyZW5jZUJveCA9IGJveEZvclZhbHVlKCZwcmltaXRpdmVWYWx1 ZSk7CisgICAgICAgICAgICAgICAgcmVmZXJlbmNlQm94ID0gTGF5b3V0Qm94KHByaW1pdGl2ZVZh bHVlKTsKICAgICAgICAgICAgIGVsc2UKICAgICAgICAgICAgICAgICByZXR1cm47CiAgICAgICAg IH0KQEAgLTIxNDQsNyArMjE0NCw3IEBAIHB1YmxpYzoKICAgICAgICAgICAgICAgICB8fCBwcmlt aXRpdmVWYWx1ZS0+Z2V0VmFsdWVJRCgpID09IENTU1ZhbHVlQm9yZGVyQm94CiAgICAgICAgICAg ICAgICAgfHwgcHJpbWl0aXZlVmFsdWUtPmdldFZhbHVlSUQoKSA9PSBDU1NWYWx1ZVBhZGRpbmdC b3gKICAgICAgICAgICAgICAgICB8fCBwcmltaXRpdmVWYWx1ZS0+Z2V0VmFsdWVJRCgpID09IENT U1ZhbHVlTWFyZ2luQm94KQotICAgICAgICAgICAgICAgIHNldFZhbHVlKHN0eWxlUmVzb2x2ZXIt PnN0eWxlKCksIFNoYXBlVmFsdWU6OmNyZWF0ZUxheW91dEJveFZhbHVlKGJveEZvclZhbHVlKHBy aW1pdGl2ZVZhbHVlKSkpOworICAgICAgICAgICAgICAgIHNldFZhbHVlKHN0eWxlUmVzb2x2ZXIt PnN0eWxlKCksIFNoYXBlVmFsdWU6OmNyZWF0ZUxheW91dEJveFZhbHVlKExheW91dEJveCgqcHJp bWl0aXZlVmFsdWUpKSk7CiAgICAgICAgICAgICBlbHNlIGlmIChwcmltaXRpdmVWYWx1ZS0+Z2V0 VmFsdWVJRCgpID09IENTU1ZhbHVlT3V0c2lkZVNoYXBlKQogICAgICAgICAgICAgICAgIHNldFZh bHVlKHN0eWxlUmVzb2x2ZXItPnN0eWxlKCksIFNoYXBlVmFsdWU6OmNyZWF0ZU91dHNpZGVWYWx1 ZSgpKTsKICAgICAgICAgICAgIGVsc2UgaWYgKHByaW1pdGl2ZVZhbHVlLT5pc1NoYXBlKCkpIHsK