108257 2013-01-29 16:53:31 -0800 ASSERTION FAILED: m_clipRectsCache->m_respectingOverflowClip[clipRectsType] == (clipRectsContext.respectOverflowClip == RespectOverflowClip) in RenderLayer. 2013-03-04 09:31:27 -0800 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 79668 108254 1 dongseong.hwang vollick d-r eric esprehn+autocc jberlin jussi.kukkonen kadam ojan.autocc ossy rhodovan.u-szeged simon.fraser tmpsantos vollick webkit.review.bot zarvai oldest_to_newest 819501 0 dongseong.hwang 2013-01-29 16:53:31 -0800 Two tests hit assertion fail. compositing/overflow/automatically-opt-into-composited-scrolling.html compositing/overflow/composited-scrolling-creates-a-stacking-container.html crash log for WebProcess (pid <unknown>): STDOUT: <empty> STDERR: ASSERTION FAILED: m_clipRectsCache->m_respectingOverflowClip[clipRectsType] == (clipRectsContext.respectOverflowClip == RespectOverflowClip) STDERR: /media/WDDisk/workspace/WebKit/WebKit/Source/WebCore/rendering/RenderLayer.cpp(4521) : void WebCore::RenderLayer::updateClipRects(const WebCore::RenderLayer::ClipRectsContext&) STDERR: 1 0x7fa38ba41ee7 WebCore::RenderLayer::updateClipRects(WebCore::RenderLayer::ClipRectsContext const&) STDERR: 2 0x7fa38ba42a53 WebCore::RenderLayer::parentClipRects(WebCore::RenderLayer::ClipRectsContext const&, WebCore::ClipRects&) const STDERR: 3 0x7fa38ba42ba4 WebCore::RenderLayer::backgroundClipRect(WebCore::RenderLayer::ClipRectsContext const&) const STDERR: 4 0x7fa38ba42da7 WebCore::RenderLayer::calculateRects(WebCore::RenderLayer::ClipRectsContext const&, WebCore::LayoutRect const&, WebCore::LayoutRect&, WebCore::ClipRect&, WebCore::ClipRect&, WebCore::ClipRect&, WebCore::LayoutPoint const*) const STDERR: 5 0x7fa38ba3db18 WebCore::RenderLayer::paintLayerContents(WebCore::GraphicsContext*, WebCore::RenderLayer::LayerPaintingInfo const&, unsigned int) STDERR: 6 0x7fa38ba3d3af WebCore::RenderLayer::paintLayerContentsAndReflection(WebCore::GraphicsContext*, WebCore::RenderLayer::LayerPaintingInfo const&, unsigned int) STDERR: 7 0x7fa38ba3d284 WebCore::RenderLayer::paintLayer(WebCore::GraphicsContext*, WebCore::RenderLayer::LayerPaintingInfo const&, unsigned int) STDERR: 8 0x7fa38ba3e71f WebCore::RenderLayer::paintList(WTF::Vector<WebCore::RenderLayer*, 0ul>*, WebCore::GraphicsContext*, WebCore::RenderLayer::LayerPaintingInfo const&, unsigned int) STDERR: 9 0x7fa38ba3e31f WebCore::RenderLayer::paintLayerContents(WebCore::GraphicsContext*, WebCore::RenderLayer::LayerPaintingInfo const&, unsigned int) STDERR: 10 0x7fa38ba5b89c WebCore::RenderLayerBacking::paintIntoLayer(WebCore::GraphicsLayer const*, WebCore::GraphicsContext*, WebCore::IntRect const&, unsigned int, unsigned int) STDERR: 11 0x7fa38ba5bc15 WebCore::RenderLayerBacking::paintContents(WebCore::GraphicsLayer const*, WebCore::GraphicsContext&, unsigned int, WebCore::IntRect const&) STDERR: 12 0x7fa38b835405 WebCore::GraphicsLayer::paintGraphicsLayerContents(WebCore::GraphicsContext&, WebCore::IntRect const&) STDERR: 13 0x7fa38fcaa12f WebCore::CoordinatedGraphicsLayer::tiledBackingStorePaint(WebCore::GraphicsContext*, WebCore::IntRect const&) STDERR: 14 0x7fa38fcad97a WebKit::CoordinatedTile::updateBackBuffer() STDERR: 15 0x7fa38b857d97 WebCore::TiledBackingStore::updateTileBuffers() STDERR: 16 0x7fa38b858cf9 WebCore::TiledBackingStore::createTiles() STDERR: 17 0x7fa38b8579e6 WebCore::TiledBackingStore::coverWithTilesIfNeeded() STDERR: 18 0x7fa38b858321 WebCore::TiledBackingStore::commitScaleChange() STDERR: 19 0x7fa38b8582d0 WebCore::TiledBackingStore::setContentsScale(float) STDERR: 20 0x7fa38fcaa0e1 WebCore::CoordinatedGraphicsLayer::createBackingStore() STDERR: 21 0x7fa38fcaacad WebCore::CoordinatedGraphicsLayer::updateContentBuffers() STDERR: 22 0x7fa38fca9bf8 WebCore::CoordinatedGraphicsLayer::flushCompositingStateForThisLayerOnly() STDERR: 23 0x7fa38fca8ed3 WebCore::CoordinatedGraphicsLayer::flushCompositingState(WebCore::FloatRect const&) STDERR: 24 0x7fa38fca8f14 WebCore::CoordinatedGraphicsLayer::flushCompositingState(WebCore::FloatRect const&) STDERR: 25 0x7fa38fca8f14 WebCore::CoordinatedGraphicsLayer::flushCompositingState(WebCore::FloatRect const&) STDERR: 26 0x7fa38fca8f14 WebCore::CoordinatedGraphicsLayer::flushCompositingState(WebCore::FloatRect const&) STDERR: 27 0x7fa38fca8f14 WebCore::CoordinatedGraphicsLayer::flushCompositingState(WebCore::FloatRect const&) STDERR: 28 0x7fa38fca8f14 WebCore::CoordinatedGraphicsLayer::flushCompositingState(WebCore::FloatRect const&) STDERR: 29 0x7fa38fca8f14 WebCore::CoordinatedGraphicsLayer::flushCompositingState(WebCore::FloatRect const&) STDERR: 30 0x7fa38fca8f14 WebCore::CoordinatedGraphicsLayer::flushCompositingState(WebCore::FloatRect const&) STDERR: 31 0x7fa38ba5ee4c WebCore::RenderLayerCompositor::flushPendingLayerChanges(bool) 819969 1 d-r 2013-01-30 02:06:51 -0800 My assumption is, this happened after bug 106142, r140999. 820293 2 jussi.kukkonen 2013-01-30 10:14:41 -0800 This is asserting as well: compositing/overflow/clip-content-under-overflow-controls.html 820610 3 simon.fraser 2013-01-30 14:44:02 -0800 This is related to compositing scrolling. Mac shows it also. 821456 4 kadam 2013-01-31 06:04:16 -0800 These tests assertion fail on Qt debug too. * compositing/overflow/composited-scrolling-creates-a-stacking-container.html diff: http://build.webkit.sed.hu/results/x86-64%20Linux%20Qt%20Debug/r141400%20(27435)/compositing/overflow/composited-scrolling-creates-a-stacking-container-crash-log.txt * compositing/overflow/automatically-opt-into-composited-scrolling.html http://build.webkit.sed.hu/results/x86-64%20Linux%20Qt%20Debug/r141400%20(27435)/compositing/overflow/automatically-opt-into-composited-scrolling-crash-log.txt 821572 5 simon.fraser 2013-01-31 09:09:48 -0800 *** Bug 108452 has been marked as a duplicate of this bug. *** 821753 6 jberlin 2013-01-31 11:31:27 -0800 I am going to mark these as Crashing in Debug in platform/mac’s TestExpectations, since nobody appears to be actively working on this. 821795 7 jberlin 2013-01-31 12:02:28 -0800 Marked the tests as crashing in debug for mac in http://trac.webkit.org/changeset/141457 822821 8 jberlin 2013-02-01 08:41:45 -0800 <rdar://problem/13133130> 845407 9 191012 vollick 2013-03-01 12:33:02 -0800 Created attachment 191012 Patch 845477 10 191031 vollick 2013-03-01 13:57:31 -0800 Created attachment 191031 Updated test expectations 846548 11 191031 hyatt 2013-03-04 09:06:24 -0800 Comment on attachment 191031 Updated test expectations r=me 846568 12 191031 webkit.review.bot 2013-03-04 09:31:21 -0800 Comment on attachment 191031 Updated test expectations Clearing flags on attachment: 191031 Committed r144639: <http://trac.webkit.org/changeset/144639> 846569 13 webkit.review.bot 2013-03-04 09:31:27 -0800 All reviewed patches have been landed. Closing bug. 191012 2013-03-01 12:33:02 -0800 2013-03-01 13:57:27 -0800 Patch bug-108257-20130301152913.patch text/plain 11313 vollick U3VidmVyc2lvbiBSZXZpc2lvbjogMTQ0NDU5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYTk1OWY5MmFiODMzYmQ2 ZGVmYTgzYzIzZDIzYjMwNzc0YjUzNGI2MC4uMmYyOWI2Mzc3NDBlOTM2Nzc3YTQ0MTkzNDA0YWUw N2UzZDI3OWY1MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQwIEBACisyMDEzLTAzLTAxICBJYW4g Vm9sbGljayAgPHZvbGxpY2tAY2hyb21pdW0ub3JnPgorCisgICAgICAgIEFTU0VSVElPTiBGQUlM RUQ6IG1fY2xpcFJlY3RzQ2FjaGUtPm1fcmVzcGVjdGluZ092ZXJmbG93Q2xpcFtjbGlwUmVjdHNU eXBlXSA9PSAoY2xpcFJlY3RzQ29udGV4dC5yZXNwZWN0T3ZlcmZsb3dDbGlwID09IFJlc3BlY3RP dmVyZmxvd0NsaXApIGluIFJlbmRlckxheWVyLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTA4MjU3CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgV2l0aCBjb21wb3NpdGVkIHNjcm9sbGluZyB3ZSBwYWludCBi b3RoIHdpdGggYW5kIHdpdGhvdXQgcmVzcGVjdGluZworICAgICAgICBvdmVyZmxvdyBjbGlwLiBU byBwcmV2ZW50IGNvbGxpc2lvbnMgaW4gdGhlIGNsaXAgY2FjaGUsIGFuZCB0byBwcmV2ZW50Cisg ICAgICAgIHRocm93aW5nIGF3YXkgY2FjaGVkIGNsaXBzIHVubmVjZXNzYXJpbHksIHdlIGtlZXAg dHdvIGNvcGllcyBvZiB0aGUKKyAgICAgICAgY2xpcCBjYWNoZSAtLSBvbmUgZm9yIHdoZW4gb3Zl cmZsb3cgY2xpcCBpcyByZXNwZWN0ZWQsIGFuZCBvbmUgZm9yCisgICAgICAgIHdoZW4gaXQgaXNu J3QuCisKKyAgICAgICAgTm8gbmV3IHRlc3RzLiBDb3ZlcmVkIGJ5IGV4aXN0aW5nIHRlc3RzIChp biBkZWJ1Zyk6CisgICAgICAgICAgY29tcG9zaXRpbmcvb3ZlcmZsb3cvYXV0b21hdGljYWxseS1v cHQtaW50by1jb21wb3NpdGVkLXNjcm9sbGluZy5odG1sCisgICAgICAgICAgY29tcG9zaXRpbmcv b3ZlcmZsb3cvY29tcG9zaXRlZC1zY3JvbGxpbmctY3JlYXRlcy1hLXN0YWNraW5nLWNvbnRhaW5l ci5odG1sCisKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyTGF5ZXIuY3BwOgorICAgICAgICAo V2ViQ29yZTo6UmVuZGVyTGF5ZXI6OnVwZGF0ZUNsaXBSZWN0cyk6CisgICAgICAgICAgTm8gbG9u Z2VyIGFzc2VydHMgdGhhdCBvdXIgJ3Jlc3BlY3Qgb3ZlcmZsb3cgY2xpcCcgc3RhdHVzIGlzCisg ICAgICAgICAgY29uc2lzdGVudC4gSXQgYWxzbyBnZXRzIGFuZCBzZXRzIHRoZSBjbGlwIGNhY2hl IHVzaW5nIHRoZSBjbGlwIHJlY3QKKyAgICAgICAgICBjb250ZXh0IHJhdGhlciB0aGFuIGp1c3Qg dGhlIGNsaXAgcmVjdCB0eXBlLgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyTGF5ZXI6OmNhbGN1 bGF0ZUNsaXBSZWN0cyk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJMYXllcjo6cGFyZW50Q2xp cFJlY3RzKToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckxheWVyOjpjbGVhckNsaXBSZWN0cyk6 CisgICAgICAgIChXZWJDb3JlOjpDbGlwUmVjdHNDYWNoZTo6Q2xpcFJlY3RzQ2FjaGUpOgorICAg ICAgICAoV2ViQ29yZTo6Q2xpcFJlY3RzQ2FjaGU6OmdldENsaXBSZWN0cyk6CisgICAgICAgIChX ZWJDb3JlOjpDbGlwUmVjdHNDYWNoZTo6c2V0Q2xpcFJlY3RzKToKKyAgICAgICAgKFdlYkNvcmU6 OkNsaXBSZWN0c0NhY2hlOjpnZXRJbmRleCk6CisgICAgICAgICAgR2V0IGFuZCBzZXQgdGhlIGNh Y2hlZCBjbGlwIHJlY3RzIHVzaW5nIHRoZSBjb250ZXh0IHJhdGhlciB0aGFuCisgICAgICAgICAg dHlwZS4KKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckxheWVyOjpjbGlwUmVjdHMpOgorICAgICAg ICAgIFdlIG5vdyBjYWNoZSB0d2ljZSBhcyBtYW55IGNsaXAgcmVjdHMuCisgICAgICAgICogcmVu ZGVyaW5nL1JlbmRlckxheWVyQmFja2luZy5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJM YXllckJhY2tpbmc6OnVwZGF0ZUdyYXBoaWNzTGF5ZXJHZW9tZXRyeSk6CisgICAgICAgICAgU2hv dWxkUmVzcGVjdE92ZXJmbG93Q2xpcCB3YXMgbW92ZWQgb3V0IG9mIFJlbmRlckxheWVyLgorCiAy MDEzLTAzLTAxICBEYXZpZCBLaWx6ZXIgIDxkZGtpbHplckBhcHBsZS5jb20+CiAKICAgICAgICAg QlVJTEQgRklYIChyMTQ0MzU4KTogQWRkIFVOVVNFRF9QQVJBTSgpIG1hY3JvcyB0byBXZWJDb3Jl OjpFeHRlbnNpb25zM0RPcGVuR0w6OmRyYXdCdWZmZXJzRVhUKCkKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5k ZXJpbmcvUmVuZGVyTGF5ZXIuY3BwCmluZGV4IDdkM2Q4ZDcwMzYzMmI0NjAwMGRiNDcyZGYzZTk2 ZWU3YTRhZTdjOGQuLjc3NmYxMzA3ZGJhMDZlNTNiNzBhNzE3NDE1NTNhYmE5MDA0MjlmYTEgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllci5jcHAKKysrIGIv U291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyLmNwcApAQCAtNDg2NSw5ICs0ODY1 LDggQEAgdm9pZCBSZW5kZXJMYXllcjo6dXBkYXRlQ2xpcFJlY3RzKGNvbnN0IENsaXBSZWN0c0Nv bnRleHQmIGNsaXBSZWN0c0NvbnRleHQpCiB7CiAgICAgQ2xpcFJlY3RzVHlwZSBjbGlwUmVjdHNU eXBlID0gY2xpcFJlY3RzQ29udGV4dC5jbGlwUmVjdHNUeXBlOwogICAgIEFTU0VSVChjbGlwUmVj dHNUeXBlIDwgTnVtQ2FjaGVkQ2xpcFJlY3RzVHlwZXMpOwotICAgIGlmIChtX2NsaXBSZWN0c0Nh Y2hlICYmIG1fY2xpcFJlY3RzQ2FjaGUtPm1fY2xpcFJlY3RzW2NsaXBSZWN0c1R5cGVdKSB7Cisg ICAgaWYgKG1fY2xpcFJlY3RzQ2FjaGUgJiYgbV9jbGlwUmVjdHNDYWNoZS0+Z2V0Q2xpcFJlY3Rz KGNsaXBSZWN0c1R5cGUsIGNsaXBSZWN0c0NvbnRleHQucmVzcGVjdE92ZXJmbG93Q2xpcCkpIHsK ICAgICAgICAgQVNTRVJUKGNsaXBSZWN0c0NvbnRleHQucm9vdExheWVyID09IG1fY2xpcFJlY3Rz Q2FjaGUtPm1fY2xpcFJlY3RzUm9vdFtjbGlwUmVjdHNUeXBlXSk7Ci0gICAgICAgIEFTU0VSVCht X2NsaXBSZWN0c0NhY2hlLT5tX3Jlc3BlY3RpbmdPdmVyZmxvd0NsaXBbY2xpcFJlY3RzVHlwZV0g PT0gKGNsaXBSZWN0c0NvbnRleHQucmVzcGVjdE92ZXJmbG93Q2xpcCA9PSBSZXNwZWN0T3ZlcmZs b3dDbGlwKSk7CiAgICAgICAgIEFTU0VSVChtX2NsaXBSZWN0c0NhY2hlLT5tX3Njcm9sbGJhclJl bGV2YW5jeVtjbGlwUmVjdHNUeXBlXSA9PSBjbGlwUmVjdHNDb250ZXh0Lm92ZXJsYXlTY3JvbGxi YXJTaXplUmVsZXZhbmN5KTsKICAgICAgICAgCiAjaWZkZWYgQ0hFQ0tfQ0FDSEVEX0NMSVBfUkVD VFMKQEAgLTQ4NzYsNyArNDg3NSw3IEBAIHZvaWQgUmVuZGVyTGF5ZXI6OnVwZGF0ZUNsaXBSZWN0 cyhjb25zdCBDbGlwUmVjdHNDb250ZXh0JiBjbGlwUmVjdHNDb250ZXh0KQogICAgICAgICB0ZW1w Q29udGV4dC5jbGlwUmVjdHNUeXBlID0gVGVtcG9yYXJ5Q2xpcFJlY3RzOwogICAgICAgICBDbGlw UmVjdHMgY2xpcFJlY3RzOwogICAgICAgICBjYWxjdWxhdGVDbGlwUmVjdHModGVtcENvbnRleHQs IGNsaXBSZWN0cyk7Ci0gICAgICAgIEFTU0VSVChjbGlwUmVjdHMgPT0gKm1fY2xpcFJlY3RzQ2Fj aGUtPm1fY2xpcFJlY3RzW2NsaXBSZWN0c1R5cGVdLmdldCgpKTsKKyAgICAgICAgQVNTRVJUKGNs aXBSZWN0cyA9PSAqbV9jbGlwUmVjdHNDYWNoZS0+Z2V0Q2xpcFJlY3RzKGNsaXBSZWN0c1R5cGUs IGNsaXBSZWN0c0NvbnRleHQucmVzcGVjdE92ZXJmbG93Q2xpcCkuZ2V0KCkpOwogI2VuZGlmCiAg ICAgICAgIHJldHVybjsgLy8gV2UgaGF2ZSB0aGUgY29ycmVjdCBjYWNoZWQgdmFsdWUuCiAgICAg fQpAQCAtNDg5MywxNCArNDg5MiwxMyBAQCB2b2lkIFJlbmRlckxheWVyOjp1cGRhdGVDbGlwUmVj dHMoY29uc3QgQ2xpcFJlY3RzQ29udGV4dCYgY2xpcFJlY3RzQ29udGV4dCkKICAgICBpZiAoIW1f Y2xpcFJlY3RzQ2FjaGUpCiAgICAgICAgIG1fY2xpcFJlY3RzQ2FjaGUgPSBhZG9wdFB0cihuZXcg Q2xpcFJlY3RzQ2FjaGUpOwogCi0gICAgaWYgKHBhcmVudExheWVyICYmIHBhcmVudExheWVyLT5j bGlwUmVjdHMoY2xpcFJlY3RzVHlwZSkgJiYgY2xpcFJlY3RzID09ICpwYXJlbnRMYXllci0+Y2xp cFJlY3RzKGNsaXBSZWN0c1R5cGUpKQotICAgICAgICBtX2NsaXBSZWN0c0NhY2hlLT5tX2NsaXBS ZWN0c1tjbGlwUmVjdHNUeXBlXSA9IHBhcmVudExheWVyLT5jbGlwUmVjdHMoY2xpcFJlY3RzVHlw ZSk7CisgICAgaWYgKHBhcmVudExheWVyICYmIHBhcmVudExheWVyLT5jbGlwUmVjdHMoY2xpcFJl Y3RzQ29udGV4dCkgJiYgY2xpcFJlY3RzID09ICpwYXJlbnRMYXllci0+Y2xpcFJlY3RzKGNsaXBS ZWN0c0NvbnRleHQpKQorICAgICAgICBtX2NsaXBSZWN0c0NhY2hlLT5zZXRDbGlwUmVjdHMoY2xp cFJlY3RzVHlwZSwgY2xpcFJlY3RzQ29udGV4dC5yZXNwZWN0T3ZlcmZsb3dDbGlwLCBwYXJlbnRM YXllci0+Y2xpcFJlY3RzKGNsaXBSZWN0c0NvbnRleHQpKTsKICAgICBlbHNlCi0gICAgICAgIG1f Y2xpcFJlY3RzQ2FjaGUtPm1fY2xpcFJlY3RzW2NsaXBSZWN0c1R5cGVdID0gQ2xpcFJlY3RzOjpj cmVhdGUoY2xpcFJlY3RzKTsKKyAgICAgICAgbV9jbGlwUmVjdHNDYWNoZS0+c2V0Q2xpcFJlY3Rz KGNsaXBSZWN0c1R5cGUsIGNsaXBSZWN0c0NvbnRleHQucmVzcGVjdE92ZXJmbG93Q2xpcCwgQ2xp cFJlY3RzOjpjcmVhdGUoY2xpcFJlY3RzKSk7CiAKICNpZm5kZWYgTkRFQlVHCiAgICAgbV9jbGlw UmVjdHNDYWNoZS0+bV9jbGlwUmVjdHNSb290W2NsaXBSZWN0c1R5cGVdID0gY2xpcFJlY3RzQ29u dGV4dC5yb290TGF5ZXI7Ci0gICAgbV9jbGlwUmVjdHNDYWNoZS0+bV9yZXNwZWN0aW5nT3ZlcmZs b3dDbGlwW2NsaXBSZWN0c1R5cGVdID0gY2xpcFJlY3RzQ29udGV4dC5yZXNwZWN0T3ZlcmZsb3dD bGlwID09IFJlc3BlY3RPdmVyZmxvd0NsaXA7CiAgICAgbV9jbGlwUmVjdHNDYWNoZS0+bV9zY3Jv bGxiYXJSZWxldmFuY3lbY2xpcFJlY3RzVHlwZV0gPSBjbGlwUmVjdHNDb250ZXh0Lm92ZXJsYXlT Y3JvbGxiYXJTaXplUmVsZXZhbmN5OwogI2VuZGlmCiB9CkBAIC00OTIyLDggKzQ5MjAsOCBAQCB2 b2lkIFJlbmRlckxheWVyOjpjYWxjdWxhdGVDbGlwUmVjdHMoY29uc3QgQ2xpcFJlY3RzQ29udGV4 dCYgY2xpcFJlY3RzQ29udGV4dCwgQwogICAgIAogICAgIC8vIEVuc3VyZSB0aGF0IG91ciBwYXJl bnQncyBjbGlwIGhhcyBiZWVuIGNhbGN1bGF0ZWQgc28gdGhhdCB3ZSBjYW4gZXhhbWluZSB0aGUg dmFsdWVzLgogICAgIGlmIChwYXJlbnRMYXllcikgewotICAgICAgICBpZiAodXNlQ2FjaGVkICYm IHBhcmVudExheWVyLT5jbGlwUmVjdHMoY2xpcFJlY3RzVHlwZSkpCi0gICAgICAgICAgICBjbGlw UmVjdHMgPSAqcGFyZW50TGF5ZXItPmNsaXBSZWN0cyhjbGlwUmVjdHNUeXBlKTsKKyAgICAgICAg aWYgKHVzZUNhY2hlZCAmJiBwYXJlbnRMYXllci0+Y2xpcFJlY3RzKGNsaXBSZWN0c0NvbnRleHQp KQorICAgICAgICAgICAgY2xpcFJlY3RzID0gKnBhcmVudExheWVyLT5jbGlwUmVjdHMoY2xpcFJl Y3RzQ29udGV4dCk7CiAgICAgICAgIGVsc2UgewogICAgICAgICAgICAgQ2xpcFJlY3RzQ29udGV4 dCBwYXJlbnRDb250ZXh0KGNsaXBSZWN0c0NvbnRleHQpOwogICAgICAgICAgICAgcGFyZW50Q29u dGV4dC5vdmVybGF5U2Nyb2xsYmFyU2l6ZVJlbGV2YW5jeSA9IElnbm9yZU92ZXJsYXlTY3JvbGxi YXJTaXplOyAvLyBGSVhNRTogd2h5PwpAQCAtNDk4NCw3ICs0OTgyLDcgQEAgdm9pZCBSZW5kZXJM YXllcjo6cGFyZW50Q2xpcFJlY3RzKGNvbnN0IENsaXBSZWN0c0NvbnRleHQmIGNsaXBSZWN0c0Nv bnRleHQsIENsaXAKICAgICB9CiAKICAgICBwYXJlbnQoKS0+dXBkYXRlQ2xpcFJlY3RzKGNsaXBS ZWN0c0NvbnRleHQpOwotICAgIGNsaXBSZWN0cyA9ICpwYXJlbnQoKS0+Y2xpcFJlY3RzKGNsaXBS ZWN0c0NvbnRleHQuY2xpcFJlY3RzVHlwZSk7CisgICAgY2xpcFJlY3RzID0gKnBhcmVudCgpLT5j bGlwUmVjdHMoY2xpcFJlY3RzQ29udGV4dCk7CiB9CiAKIHN0YXRpYyBpbmxpbmUgQ2xpcFJlY3Qg YmFja2dyb3VuZENsaXBSZWN0Rm9yUG9zaXRpb24oY29uc3QgQ2xpcFJlY3RzJiBwYXJlbnRSZWN0 cywgRVBvc2l0aW9uIHBvc2l0aW9uKQpAQCAtNTQxNyw3ICs1NDE1LDkgQEAgdm9pZCBSZW5kZXJM YXllcjo6Y2xlYXJDbGlwUmVjdHMoQ2xpcFJlY3RzVHlwZSB0eXBlVG9DbGVhcikKICAgICAgICAg bV9jbGlwUmVjdHNDYWNoZSA9IG51bGxwdHI7CiAgICAgZWxzZSB7CiAgICAgICAgIEFTU0VSVCh0 eXBlVG9DbGVhciA8IE51bUNhY2hlZENsaXBSZWN0c1R5cGVzKTsKLSAgICAgICAgbV9jbGlwUmVj dHNDYWNoZS0+bV9jbGlwUmVjdHNbdHlwZVRvQ2xlYXJdID0gbnVsbHB0cjsKKyAgICAgICAgUmVm UHRyPENsaXBSZWN0cz4gZHVtbXk7CisgICAgICAgIG1fY2xpcFJlY3RzQ2FjaGUtPnNldENsaXBS ZWN0cyh0eXBlVG9DbGVhciwgUmVzcGVjdE92ZXJmbG93Q2xpcCwgZHVtbXkpOworICAgICAgICBt X2NsaXBSZWN0c0NhY2hlLT5zZXRDbGlwUmVjdHModHlwZVRvQ2xlYXIsIElnbm9yZU92ZXJmbG93 Q2xpcCwgZHVtbXkpOwogICAgIH0KIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVu ZGVyaW5nL1JlbmRlckxheWVyLmggYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5 ZXIuaAppbmRleCAzOWYxMGMzMDhjNjk3ZDMzYzEwZDIzNmQwZTVkOTdlZmQ4NDk1ZDliLi43MGJm YzU1MmVjNmEzODMwMTk4YTM5MDgzODFjMmYwYzU3MDk3NDM3IDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXIuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5k ZXJpbmcvUmVuZGVyTGF5ZXIuaApAQCAtMjMxLDYgKzIzMSwxMSBAQCBlbnVtIENsaXBSZWN0c1R5 cGUgewogICAgIFRlbXBvcmFyeUNsaXBSZWN0cwogfTsKIAorZW51bSBTaG91bGRSZXNwZWN0T3Zl cmZsb3dDbGlwIHsKKyAgICBJZ25vcmVPdmVyZmxvd0NsaXAsCisgICAgUmVzcGVjdE92ZXJmbG93 Q2xpcAorfTsKKwogc3RydWN0IENsaXBSZWN0c0NhY2hlIHsKICAgICBXVEZfTUFLRV9GQVNUX0FM TE9DQVRFRDsKIHB1YmxpYzoKQEAgLTIzOSwxOCArMjQ0LDI5IEBAIHB1YmxpYzoKICNpZm5kZWYg TkRFQlVHCiAgICAgICAgIGZvciAoaW50IGkgPSAwOyBpIDwgTnVtQ2FjaGVkQ2xpcFJlY3RzVHlw ZXM7ICsraSkgewogICAgICAgICAgICAgbV9jbGlwUmVjdHNSb290W2ldID0gMDsKLSAgICAgICAg ICAgIG1fcmVzcGVjdGluZ092ZXJmbG93Q2xpcFtpXSA9IGZhbHNlOwogICAgICAgICAgICAgbV9z Y3JvbGxiYXJSZWxldmFuY3lbaV0gPSBJZ25vcmVPdmVybGF5U2Nyb2xsYmFyU2l6ZTsKICAgICAg ICAgfQogI2VuZGlmCiAgICAgfQogCi0gICAgUmVmUHRyPENsaXBSZWN0cz4gbV9jbGlwUmVjdHNb TnVtQ2FjaGVkQ2xpcFJlY3RzVHlwZXNdOworICAgIFBhc3NSZWZQdHI8Q2xpcFJlY3RzPiBnZXRD bGlwUmVjdHMoQ2xpcFJlY3RzVHlwZSBjbGlwUmVjdHNUeXBlLCBTaG91bGRSZXNwZWN0T3ZlcmZs b3dDbGlwIHJlc3BlY3RPdmVyZmxvdykgeyByZXR1cm4gbV9jbGlwUmVjdHNbZ2V0SW5kZXgoY2xp cFJlY3RzVHlwZSwgcmVzcGVjdE92ZXJmbG93KV07IH0KKyAgICB2b2lkIHNldENsaXBSZWN0cyhD bGlwUmVjdHNUeXBlIGNsaXBSZWN0c1R5cGUsIFNob3VsZFJlc3BlY3RPdmVyZmxvd0NsaXAgcmVz cGVjdE92ZXJmbG93LCBQYXNzUmVmUHRyPENsaXBSZWN0cz4gY2xpcFJlY3RzKSB7IG1fY2xpcFJl Y3RzW2dldEluZGV4KGNsaXBSZWN0c1R5cGUsIHJlc3BlY3RPdmVyZmxvdyldID0gY2xpcFJlY3Rz OyB9CisKICNpZm5kZWYgTkRFQlVHCiAgICAgY29uc3QgUmVuZGVyTGF5ZXIqIG1fY2xpcFJlY3Rz Um9vdFtOdW1DYWNoZWRDbGlwUmVjdHNUeXBlc107Ci0gICAgYm9vbCBtX3Jlc3BlY3RpbmdPdmVy Zmxvd0NsaXBbTnVtQ2FjaGVkQ2xpcFJlY3RzVHlwZXNdOwogICAgIE92ZXJsYXlTY3JvbGxiYXJT aXplUmVsZXZhbmN5IG1fc2Nyb2xsYmFyUmVsZXZhbmN5W051bUNhY2hlZENsaXBSZWN0c1R5cGVz XTsKICNlbmRpZgorCitwcml2YXRlOgorICAgIGludCBnZXRJbmRleChDbGlwUmVjdHNUeXBlIGNs aXBSZWN0c1R5cGUsIFNob3VsZFJlc3BlY3RPdmVyZmxvd0NsaXAgcmVzcGVjdE92ZXJmbG93KQor ICAgIHsKKyAgICAgICAgaW50IGluZGV4ID0gc3RhdGljX2Nhc3Q8aW50PihjbGlwUmVjdHNUeXBl KTsKKyAgICAgICAgaWYgKHJlc3BlY3RPdmVyZmxvdyA9PSBSZXNwZWN0T3ZlcmZsb3dDbGlwKQor ICAgICAgICAgICAgaW5kZXggKz0gc3RhdGljX2Nhc3Q8aW50PihOdW1DYWNoZWRDbGlwUmVjdHNU eXBlcyk7CisgICAgICAgIHJldHVybiBpbmRleDsKKyAgICB9CisKKyAgICBSZWZQdHI8Q2xpcFJl Y3RzPiBtX2NsaXBSZWN0c1tOdW1DYWNoZWRDbGlwUmVjdHNUeXBlcyAqIDJdOwogfTsKIAogc3Ry dWN0IExheWVyRnJhZ21lbnQgewpAQCAtNjIxLDggKzYzNyw2IEBAIHB1YmxpYzoKICAgICBib29s IGhpdFRlc3QoY29uc3QgSGl0VGVzdFJlcXVlc3QmLCBjb25zdCBIaXRUZXN0TG9jYXRpb24mLCBI aXRUZXN0UmVzdWx0Jik7CiAgICAgdm9pZCBwYWludE92ZXJsYXlTY3JvbGxiYXJzKEdyYXBoaWNz Q29udGV4dCosIGNvbnN0IExheW91dFJlY3QmIGRhbWFnZVJlY3QsIFBhaW50QmVoYXZpb3IsIFJl bmRlck9iamVjdCogcGFpbnRpbmdSb290ID0gMCk7CiAKLSAgICBlbnVtIFNob3VsZFJlc3BlY3RP dmVyZmxvd0NsaXAgeyBJZ25vcmVPdmVyZmxvd0NsaXAsIFJlc3BlY3RPdmVyZmxvd0NsaXAgfTsK LQogICAgIHN0cnVjdCBDbGlwUmVjdHNDb250ZXh0IHsKICAgICAgICAgQ2xpcFJlY3RzQ29udGV4 dChjb25zdCBSZW5kZXJMYXllciogaW5Sb290TGF5ZXIsIFJlbmRlclJlZ2lvbiogaW5SZWdpb24s IENsaXBSZWN0c1R5cGUgaW5DbGlwUmVjdHNUeXBlLCBPdmVybGF5U2Nyb2xsYmFyU2l6ZVJlbGV2 YW5jeSBpbk92ZXJsYXlTY3JvbGxiYXJTaXplUmVsZXZhbmN5ID0gSWdub3JlT3ZlcmxheVNjcm9s bGJhclNpemUsIFNob3VsZFJlc3BlY3RPdmVyZmxvd0NsaXAgaW5SZXNwZWN0T3ZlcmZsb3dDbGlw ID0gUmVzcGVjdE92ZXJmbG93Q2xpcCkKICAgICAgICAgICAgIDogcm9vdExheWVyKGluUm9vdExh eWVyKQpAQCAtNjUxLDEwICs2NjUsMTAgQEAgcHVibGljOgogICAgIC8vIChyYXRoZXIgdGhhbiBj b21wdXRpbmcgdGhlbSBhbGwgZnJvbSBzY3JhdGNoIHVwIHRoZSBwYXJlbnQgY2hhaW4pLgogICAg IHZvaWQgY2FsY3VsYXRlQ2xpcFJlY3RzKGNvbnN0IENsaXBSZWN0c0NvbnRleHQmLCBDbGlwUmVj dHMmKSBjb25zdDsKIAotICAgIENsaXBSZWN0cyogY2xpcFJlY3RzKENsaXBSZWN0c1R5cGUgdHlw ZSkgY29uc3QKKyAgICBDbGlwUmVjdHMqIGNsaXBSZWN0cyhjb25zdCBDbGlwUmVjdHNDb250ZXh0 JiBjb250ZXh0KSBjb25zdAogICAgIHsKLSAgICAgICAgQVNTRVJUKHR5cGUgPCBOdW1DYWNoZWRD bGlwUmVjdHNUeXBlcyk7Ci0gICAgICAgIHJldHVybiBtX2NsaXBSZWN0c0NhY2hlID8gbV9jbGlw UmVjdHNDYWNoZS0+bV9jbGlwUmVjdHNbdHlwZV0uZ2V0KCkgOiAwOworICAgICAgICBBU1NFUlQo Y29udGV4dC5jbGlwUmVjdHNUeXBlIDwgTnVtQ2FjaGVkQ2xpcFJlY3RzVHlwZXMpOworICAgICAg ICByZXR1cm4gbV9jbGlwUmVjdHNDYWNoZSA/IG1fY2xpcFJlY3RzQ2FjaGUtPmdldENsaXBSZWN0 cyhjb250ZXh0LmNsaXBSZWN0c1R5cGUsIGNvbnRleHQucmVzcGVjdE92ZXJmbG93Q2xpcCkuZ2V0 KCkgOiAwOwogICAgIH0KIAogICAgIExheW91dFJlY3QgY2hpbGRyZW5DbGlwUmVjdCgpIGNvbnN0 OyAvLyBSZXR1cm5zIHRoZSBmb3JlZ3JvdW5kIGNsaXAgcmVjdCBvZiB0aGUgbGF5ZXIgaW4gdGhl IGRvY3VtZW50J3MgY29vcmRpbmF0ZSBzcGFjZS4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L3JlbmRlcmluZy9SZW5kZXJMYXllckJhY2tpbmcuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVy aW5nL1JlbmRlckxheWVyQmFja2luZy5jcHAKaW5kZXggOTE3ZWIxZTc4ZGYxOWY4ZTQ0ZTJiNTI3 NWI2Zjc0NTk1ZjI3OTY2Mi4uMGVlYTgzOTZiMzc3MDhjYjllNDNmNTQ2NmZmZTc0MDc0MGFhNzY1 OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyQmFja2lu Zy5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyQmFja2luZy5j cHAKQEAgLTY0MCw3ICs2NDAsNyBAQCB2b2lkIFJlbmRlckxheWVyQmFja2luZzo6dXBkYXRlR3Jh cGhpY3NMYXllckdlb21ldHJ5KCkKICAgICAgICAgLy8gQ2FsbCBjYWxjdWxhdGVSZWN0cyB0byBn ZXQgdGhlIGJhY2tncm91bmRSZWN0IHdoaWNoIGlzIHdoYXQgaXMgdXNlZCB0byBjbGlwIHRoZSBj b250ZW50cyBvZiB0aGlzCiAgICAgICAgIC8vIGxheWVyLiBOb3RlIHRoYXQgd2UgY2FsbCBpdCB3 aXRoIHRlbXBvcmFyeUNsaXBSZWN0cyA9IHRydWUgYmVjYXVzZSBub3JtYWxseSB3aGVuIGNvbXB1 dGluZyBjbGlwIHJlY3RzCiAgICAgICAgIC8vIGZvciBhIGNvbXBvc2l0aW5nIGxheWVyLCByb290 TGF5ZXIgaXMgdGhlIGxheWVyIGl0c2VsZi4KLSAgICAgICAgUmVuZGVyTGF5ZXI6OkNsaXBSZWN0 c0NvbnRleHQgY2xpcFJlY3RzQ29udGV4dChjb21wQW5jZXN0b3IsIDAsIFRlbXBvcmFyeUNsaXBS ZWN0cywgSWdub3JlT3ZlcmxheVNjcm9sbGJhclNpemUsIFJlbmRlckxheWVyOjpJZ25vcmVPdmVy Zmxvd0NsaXApOworICAgICAgICBSZW5kZXJMYXllcjo6Q2xpcFJlY3RzQ29udGV4dCBjbGlwUmVj dHNDb250ZXh0KGNvbXBBbmNlc3RvciwgMCwgVGVtcG9yYXJ5Q2xpcFJlY3RzLCBJZ25vcmVPdmVy bGF5U2Nyb2xsYmFyU2l6ZSwgSWdub3JlT3ZlcmZsb3dDbGlwKTsKICAgICAgICAgSW50UmVjdCBw YXJlbnRDbGlwUmVjdCA9IHBpeGVsU25hcHBlZEludFJlY3QobV9vd25pbmdMYXllci0+YmFja2dy b3VuZENsaXBSZWN0KGNsaXBSZWN0c0NvbnRleHQpLnJlY3QoKSk7IC8vIEZJWE1FOiBJbmNvcnJl Y3QgZm9yIENTUyByZWdpb25zLgogICAgICAgICBBU1NFUlQocGFyZW50Q2xpcFJlY3QgIT0gUGFp bnRJbmZvOjppbmZpbml0ZVJlY3QoKSk7CiAgICAgICAgIG1fYW5jZXN0b3JDbGlwcGluZ0xheWVy LT5zZXRQb3NpdGlvbihGbG9hdFBvaW50KHBhcmVudENsaXBSZWN0LmxvY2F0aW9uKCkgLSBncmFw aGljc0xheWVyUGFyZW50TG9jYXRpb24pKTsK 191031 2013-03-01 13:57:31 -0800 2013-03-04 09:31:21 -0800 Updated test expectations bug-108257-20130301165341.patch text/plain 15832 vollick U3VidmVyc2lvbiBSZXZpc2lvbjogMTQ0NDU5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYTk1OWY5MmFiODMzYmQ2 ZGVmYTgzYzIzZDIzYjMwNzc0YjUzNGI2MC4uOGJkMThiNDBmMDMyYmRmMzk2OTc3MDQ5ZGY1YWZk MzM1YTI0ZDAzMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDU1IEBACisyMDEzLTAzLTAxICBJYW4g Vm9sbGljayAgPHZvbGxpY2tAY2hyb21pdW0ub3JnPgorCisgICAgICAgIEFTU0VSVElPTiBGQUlM RUQ6IG1fY2xpcFJlY3RzQ2FjaGUtPm1fcmVzcGVjdGluZ092ZXJmbG93Q2xpcFtjbGlwUmVjdHNU eXBlXSA9PSAoY2xpcFJlY3RzQ29udGV4dC5yZXNwZWN0T3ZlcmZsb3dDbGlwID09IFJlc3BlY3RP dmVyZmxvd0NsaXApIGluIFJlbmRlckxheWVyLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTA4MjU3CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgV2l0aCBjb21wb3NpdGVkIHNjcm9sbGluZyB3ZSBwYWludCBi b3RoIHdpdGggYW5kIHdpdGhvdXQgcmVzcGVjdGluZworICAgICAgICBvdmVyZmxvdyBjbGlwLiBU byBwcmV2ZW50IGNvbGxpc2lvbnMgaW4gdGhlIGNsaXAgY2FjaGUsIGFuZCB0byBwcmV2ZW50Cisg ICAgICAgIHRocm93aW5nIGF3YXkgY2FjaGVkIGNsaXBzIHVubmVjZXNzYXJpbHksIHdlIGtlZXAg dHdvIGNvcGllcyBvZiB0aGUKKyAgICAgICAgY2xpcCBjYWNoZSAtLSBvbmUgZm9yIHdoZW4gb3Zl cmZsb3cgY2xpcCBpcyByZXNwZWN0ZWQsIGFuZCBvbmUgZm9yCisgICAgICAgIHdoZW4gaXQgaXNu J3QuCisKKyAgICAgICAgTm8gbmV3IHRlc3RzLiBDb3ZlcmVkIGJ5IGV4aXN0aW5nIHRlc3RzIChp biBkZWJ1Zyk6CisgICAgICAgICAgY29tcG9zaXRpbmcvb3ZlcmZsb3cvYXV0b21hdGljYWxseS1v cHQtaW50by1jb21wb3NpdGVkLXNjcm9sbGluZy5odG1sCisgICAgICAgICAgY29tcG9zaXRpbmcv b3ZlcmZsb3cvY29tcG9zaXRlZC1zY3JvbGxpbmctY3JlYXRlcy1hLXN0YWNraW5nLWNvbnRhaW5l ci5odG1sCisKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyTGF5ZXIuY3BwOgorICAgICAgICAo V2ViQ29yZTo6UmVuZGVyTGF5ZXI6OnVwZGF0ZUNsaXBSZWN0cyk6CisgICAgICAgICAgTm8gbG9u Z2VyIGFzc2VydHMgdGhhdCBvdXIgJ3Jlc3BlY3Qgb3ZlcmZsb3cgY2xpcCcgc3RhdHVzIGlzCisg ICAgICAgICAgY29uc2lzdGVudC4gSXQgYWxzbyBnZXRzIGFuZCBzZXRzIHRoZSBjbGlwIGNhY2hl IHVzaW5nIHRoZSBjbGlwIHJlY3QKKyAgICAgICAgICBjb250ZXh0IHJhdGhlciB0aGFuIGp1c3Qg dGhlIGNsaXAgcmVjdCB0eXBlLgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyTGF5ZXI6OmNhbGN1 bGF0ZUNsaXBSZWN0cyk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJMYXllcjo6cGFyZW50Q2xp cFJlY3RzKToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckxheWVyOjpjbGVhckNsaXBSZWN0cyk6 CisgICAgICAgIChXZWJDb3JlOjpDbGlwUmVjdHNDYWNoZTo6Q2xpcFJlY3RzQ2FjaGUpOgorICAg ICAgICAoV2ViQ29yZTo6Q2xpcFJlY3RzQ2FjaGU6OmdldENsaXBSZWN0cyk6CisgICAgICAgIChX ZWJDb3JlOjpDbGlwUmVjdHNDYWNoZTo6c2V0Q2xpcFJlY3RzKToKKyAgICAgICAgKFdlYkNvcmU6 OkNsaXBSZWN0c0NhY2hlOjpnZXRJbmRleCk6CisgICAgICAgICAgR2V0IGFuZCBzZXQgdGhlIGNh Y2hlZCBjbGlwIHJlY3RzIHVzaW5nIHRoZSBjb250ZXh0IHJhdGhlciB0aGFuCisgICAgICAgICAg dHlwZS4KKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckxheWVyOjpjbGlwUmVjdHMpOgorICAgICAg ICAgIFdlIG5vdyBjYWNoZSB0d2ljZSBhcyBtYW55IGNsaXAgcmVjdHMuCisgICAgICAgICogcmVu ZGVyaW5nL1JlbmRlckxheWVyQmFja2luZy5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJM YXllckJhY2tpbmc6OnVwZGF0ZUdyYXBoaWNzTGF5ZXJHZW9tZXRyeSk6CisgICAgICAgICAgU2hv dWxkUmVzcGVjdE92ZXJmbG93Q2xpcCB3YXMgbW92ZWQgb3V0IG9mIFJlbmRlckxheWVyLgorCisg ICAgICAgICogcmVuZGVyaW5nL1JlbmRlckxheWVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJl bmRlckxheWVyOjp1cGRhdGVDbGlwUmVjdHMpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyTGF5 ZXI6OmNhbGN1bGF0ZUNsaXBSZWN0cyk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJMYXllcjo6 cGFyZW50Q2xpcFJlY3RzKToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckxheWVyOjpjbGVhckNs aXBSZWN0cyk6CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckxheWVyLmg6CisgICAgICAgIChX ZWJDb3JlOjpDbGlwUmVjdHNDYWNoZTo6Q2xpcFJlY3RzQ2FjaGUpOgorICAgICAgICAoV2ViQ29y ZTo6Q2xpcFJlY3RzQ2FjaGU6OmdldENsaXBSZWN0cyk6CisgICAgICAgIChXZWJDb3JlOjpDbGlw UmVjdHNDYWNoZTo6c2V0Q2xpcFJlY3RzKToKKyAgICAgICAgKENsaXBSZWN0c0NhY2hlKToKKyAg ICAgICAgKFdlYkNvcmU6OkNsaXBSZWN0c0NhY2hlOjpnZXRJbmRleCk6CisgICAgICAgIChXZWJD b3JlOjpSZW5kZXJMYXllcjo6Y2xpcFJlY3RzKToKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVy TGF5ZXJCYWNraW5nLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckxheWVyQmFja2luZzo6 dXBkYXRlR3JhcGhpY3NMYXllckdlb21ldHJ5KToKKwogMjAxMy0wMy0wMSAgRGF2aWQgS2lsemVy ICA8ZGRraWx6ZXJAYXBwbGUuY29tPgogCiAgICAgICAgIEJVSUxEIEZJWCAocjE0NDM1OCk6IEFk ZCBVTlVTRURfUEFSQU0oKSBtYWNyb3MgdG8gV2ViQ29yZTo6RXh0ZW5zaW9uczNET3BlbkdMOjpk cmF3QnVmZmVyc0VYVCgpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVu ZGVyTGF5ZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyLmNwcApp bmRleCA3ZDNkOGQ3MDM2MzJiNDYwMDBkYjQ3MmRmM2U5NmVlN2E0YWU3YzhkLi43NzZmMTMwN2Ri YTA2ZTUzYjcwYTcxNzQxNTUzYWJhOTAwNDI5ZmExIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmlu Zy9SZW5kZXJMYXllci5jcHAKQEAgLTQ4NjUsOSArNDg2NSw4IEBAIHZvaWQgUmVuZGVyTGF5ZXI6 OnVwZGF0ZUNsaXBSZWN0cyhjb25zdCBDbGlwUmVjdHNDb250ZXh0JiBjbGlwUmVjdHNDb250ZXh0 KQogewogICAgIENsaXBSZWN0c1R5cGUgY2xpcFJlY3RzVHlwZSA9IGNsaXBSZWN0c0NvbnRleHQu Y2xpcFJlY3RzVHlwZTsKICAgICBBU1NFUlQoY2xpcFJlY3RzVHlwZSA8IE51bUNhY2hlZENsaXBS ZWN0c1R5cGVzKTsKLSAgICBpZiAobV9jbGlwUmVjdHNDYWNoZSAmJiBtX2NsaXBSZWN0c0NhY2hl LT5tX2NsaXBSZWN0c1tjbGlwUmVjdHNUeXBlXSkgeworICAgIGlmIChtX2NsaXBSZWN0c0NhY2hl ICYmIG1fY2xpcFJlY3RzQ2FjaGUtPmdldENsaXBSZWN0cyhjbGlwUmVjdHNUeXBlLCBjbGlwUmVj dHNDb250ZXh0LnJlc3BlY3RPdmVyZmxvd0NsaXApKSB7CiAgICAgICAgIEFTU0VSVChjbGlwUmVj dHNDb250ZXh0LnJvb3RMYXllciA9PSBtX2NsaXBSZWN0c0NhY2hlLT5tX2NsaXBSZWN0c1Jvb3Rb Y2xpcFJlY3RzVHlwZV0pOwotICAgICAgICBBU1NFUlQobV9jbGlwUmVjdHNDYWNoZS0+bV9yZXNw ZWN0aW5nT3ZlcmZsb3dDbGlwW2NsaXBSZWN0c1R5cGVdID09IChjbGlwUmVjdHNDb250ZXh0LnJl c3BlY3RPdmVyZmxvd0NsaXAgPT0gUmVzcGVjdE92ZXJmbG93Q2xpcCkpOwogICAgICAgICBBU1NF UlQobV9jbGlwUmVjdHNDYWNoZS0+bV9zY3JvbGxiYXJSZWxldmFuY3lbY2xpcFJlY3RzVHlwZV0g PT0gY2xpcFJlY3RzQ29udGV4dC5vdmVybGF5U2Nyb2xsYmFyU2l6ZVJlbGV2YW5jeSk7CiAgICAg ICAgIAogI2lmZGVmIENIRUNLX0NBQ0hFRF9DTElQX1JFQ1RTCkBAIC00ODc2LDcgKzQ4NzUsNyBA QCB2b2lkIFJlbmRlckxheWVyOjp1cGRhdGVDbGlwUmVjdHMoY29uc3QgQ2xpcFJlY3RzQ29udGV4 dCYgY2xpcFJlY3RzQ29udGV4dCkKICAgICAgICAgdGVtcENvbnRleHQuY2xpcFJlY3RzVHlwZSA9 IFRlbXBvcmFyeUNsaXBSZWN0czsKICAgICAgICAgQ2xpcFJlY3RzIGNsaXBSZWN0czsKICAgICAg ICAgY2FsY3VsYXRlQ2xpcFJlY3RzKHRlbXBDb250ZXh0LCBjbGlwUmVjdHMpOwotICAgICAgICBB U1NFUlQoY2xpcFJlY3RzID09ICptX2NsaXBSZWN0c0NhY2hlLT5tX2NsaXBSZWN0c1tjbGlwUmVj dHNUeXBlXS5nZXQoKSk7CisgICAgICAgIEFTU0VSVChjbGlwUmVjdHMgPT0gKm1fY2xpcFJlY3Rz Q2FjaGUtPmdldENsaXBSZWN0cyhjbGlwUmVjdHNUeXBlLCBjbGlwUmVjdHNDb250ZXh0LnJlc3Bl Y3RPdmVyZmxvd0NsaXApLmdldCgpKTsKICNlbmRpZgogICAgICAgICByZXR1cm47IC8vIFdlIGhh dmUgdGhlIGNvcnJlY3QgY2FjaGVkIHZhbHVlLgogICAgIH0KQEAgLTQ4OTMsMTQgKzQ4OTIsMTMg QEAgdm9pZCBSZW5kZXJMYXllcjo6dXBkYXRlQ2xpcFJlY3RzKGNvbnN0IENsaXBSZWN0c0NvbnRl eHQmIGNsaXBSZWN0c0NvbnRleHQpCiAgICAgaWYgKCFtX2NsaXBSZWN0c0NhY2hlKQogICAgICAg ICBtX2NsaXBSZWN0c0NhY2hlID0gYWRvcHRQdHIobmV3IENsaXBSZWN0c0NhY2hlKTsKIAotICAg IGlmIChwYXJlbnRMYXllciAmJiBwYXJlbnRMYXllci0+Y2xpcFJlY3RzKGNsaXBSZWN0c1R5cGUp ICYmIGNsaXBSZWN0cyA9PSAqcGFyZW50TGF5ZXItPmNsaXBSZWN0cyhjbGlwUmVjdHNUeXBlKSkK LSAgICAgICAgbV9jbGlwUmVjdHNDYWNoZS0+bV9jbGlwUmVjdHNbY2xpcFJlY3RzVHlwZV0gPSBw YXJlbnRMYXllci0+Y2xpcFJlY3RzKGNsaXBSZWN0c1R5cGUpOworICAgIGlmIChwYXJlbnRMYXll ciAmJiBwYXJlbnRMYXllci0+Y2xpcFJlY3RzKGNsaXBSZWN0c0NvbnRleHQpICYmIGNsaXBSZWN0 cyA9PSAqcGFyZW50TGF5ZXItPmNsaXBSZWN0cyhjbGlwUmVjdHNDb250ZXh0KSkKKyAgICAgICAg bV9jbGlwUmVjdHNDYWNoZS0+c2V0Q2xpcFJlY3RzKGNsaXBSZWN0c1R5cGUsIGNsaXBSZWN0c0Nv bnRleHQucmVzcGVjdE92ZXJmbG93Q2xpcCwgcGFyZW50TGF5ZXItPmNsaXBSZWN0cyhjbGlwUmVj dHNDb250ZXh0KSk7CiAgICAgZWxzZQotICAgICAgICBtX2NsaXBSZWN0c0NhY2hlLT5tX2NsaXBS ZWN0c1tjbGlwUmVjdHNUeXBlXSA9IENsaXBSZWN0czo6Y3JlYXRlKGNsaXBSZWN0cyk7CisgICAg ICAgIG1fY2xpcFJlY3RzQ2FjaGUtPnNldENsaXBSZWN0cyhjbGlwUmVjdHNUeXBlLCBjbGlwUmVj dHNDb250ZXh0LnJlc3BlY3RPdmVyZmxvd0NsaXAsIENsaXBSZWN0czo6Y3JlYXRlKGNsaXBSZWN0 cykpOwogCiAjaWZuZGVmIE5ERUJVRwogICAgIG1fY2xpcFJlY3RzQ2FjaGUtPm1fY2xpcFJlY3Rz Um9vdFtjbGlwUmVjdHNUeXBlXSA9IGNsaXBSZWN0c0NvbnRleHQucm9vdExheWVyOwotICAgIG1f Y2xpcFJlY3RzQ2FjaGUtPm1fcmVzcGVjdGluZ092ZXJmbG93Q2xpcFtjbGlwUmVjdHNUeXBlXSA9 IGNsaXBSZWN0c0NvbnRleHQucmVzcGVjdE92ZXJmbG93Q2xpcCA9PSBSZXNwZWN0T3ZlcmZsb3dD bGlwOwogICAgIG1fY2xpcFJlY3RzQ2FjaGUtPm1fc2Nyb2xsYmFyUmVsZXZhbmN5W2NsaXBSZWN0 c1R5cGVdID0gY2xpcFJlY3RzQ29udGV4dC5vdmVybGF5U2Nyb2xsYmFyU2l6ZVJlbGV2YW5jeTsK ICNlbmRpZgogfQpAQCAtNDkyMiw4ICs0OTIwLDggQEAgdm9pZCBSZW5kZXJMYXllcjo6Y2FsY3Vs YXRlQ2xpcFJlY3RzKGNvbnN0IENsaXBSZWN0c0NvbnRleHQmIGNsaXBSZWN0c0NvbnRleHQsIEMK ICAgICAKICAgICAvLyBFbnN1cmUgdGhhdCBvdXIgcGFyZW50J3MgY2xpcCBoYXMgYmVlbiBjYWxj dWxhdGVkIHNvIHRoYXQgd2UgY2FuIGV4YW1pbmUgdGhlIHZhbHVlcy4KICAgICBpZiAocGFyZW50 TGF5ZXIpIHsKLSAgICAgICAgaWYgKHVzZUNhY2hlZCAmJiBwYXJlbnRMYXllci0+Y2xpcFJlY3Rz KGNsaXBSZWN0c1R5cGUpKQotICAgICAgICAgICAgY2xpcFJlY3RzID0gKnBhcmVudExheWVyLT5j bGlwUmVjdHMoY2xpcFJlY3RzVHlwZSk7CisgICAgICAgIGlmICh1c2VDYWNoZWQgJiYgcGFyZW50 TGF5ZXItPmNsaXBSZWN0cyhjbGlwUmVjdHNDb250ZXh0KSkKKyAgICAgICAgICAgIGNsaXBSZWN0 cyA9ICpwYXJlbnRMYXllci0+Y2xpcFJlY3RzKGNsaXBSZWN0c0NvbnRleHQpOwogICAgICAgICBl bHNlIHsKICAgICAgICAgICAgIENsaXBSZWN0c0NvbnRleHQgcGFyZW50Q29udGV4dChjbGlwUmVj dHNDb250ZXh0KTsKICAgICAgICAgICAgIHBhcmVudENvbnRleHQub3ZlcmxheVNjcm9sbGJhclNp emVSZWxldmFuY3kgPSBJZ25vcmVPdmVybGF5U2Nyb2xsYmFyU2l6ZTsgLy8gRklYTUU6IHdoeT8K QEAgLTQ5ODQsNyArNDk4Miw3IEBAIHZvaWQgUmVuZGVyTGF5ZXI6OnBhcmVudENsaXBSZWN0cyhj b25zdCBDbGlwUmVjdHNDb250ZXh0JiBjbGlwUmVjdHNDb250ZXh0LCBDbGlwCiAgICAgfQogCiAg ICAgcGFyZW50KCktPnVwZGF0ZUNsaXBSZWN0cyhjbGlwUmVjdHNDb250ZXh0KTsKLSAgICBjbGlw UmVjdHMgPSAqcGFyZW50KCktPmNsaXBSZWN0cyhjbGlwUmVjdHNDb250ZXh0LmNsaXBSZWN0c1R5 cGUpOworICAgIGNsaXBSZWN0cyA9ICpwYXJlbnQoKS0+Y2xpcFJlY3RzKGNsaXBSZWN0c0NvbnRl eHQpOwogfQogCiBzdGF0aWMgaW5saW5lIENsaXBSZWN0IGJhY2tncm91bmRDbGlwUmVjdEZvclBv c2l0aW9uKGNvbnN0IENsaXBSZWN0cyYgcGFyZW50UmVjdHMsIEVQb3NpdGlvbiBwb3NpdGlvbikK QEAgLTU0MTcsNyArNTQxNSw5IEBAIHZvaWQgUmVuZGVyTGF5ZXI6OmNsZWFyQ2xpcFJlY3RzKENs aXBSZWN0c1R5cGUgdHlwZVRvQ2xlYXIpCiAgICAgICAgIG1fY2xpcFJlY3RzQ2FjaGUgPSBudWxs cHRyOwogICAgIGVsc2UgewogICAgICAgICBBU1NFUlQodHlwZVRvQ2xlYXIgPCBOdW1DYWNoZWRD bGlwUmVjdHNUeXBlcyk7Ci0gICAgICAgIG1fY2xpcFJlY3RzQ2FjaGUtPm1fY2xpcFJlY3RzW3R5 cGVUb0NsZWFyXSA9IG51bGxwdHI7CisgICAgICAgIFJlZlB0cjxDbGlwUmVjdHM+IGR1bW15Owor ICAgICAgICBtX2NsaXBSZWN0c0NhY2hlLT5zZXRDbGlwUmVjdHModHlwZVRvQ2xlYXIsIFJlc3Bl Y3RPdmVyZmxvd0NsaXAsIGR1bW15KTsKKyAgICAgICAgbV9jbGlwUmVjdHNDYWNoZS0+c2V0Q2xp cFJlY3RzKHR5cGVUb0NsZWFyLCBJZ25vcmVPdmVyZmxvd0NsaXAsIGR1bW15KTsKICAgICB9CiB9 CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllci5oIGIv U291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyLmgKaW5kZXggMzlmMTBjMzA4YzY5 N2QzM2MxMGQyMzZkMGU1ZDk3ZWZkODQ5NWQ5Yi4uNzBiZmM1NTJlYzZhMzgzMDE5OGEzOTA4Mzgx YzJmMGM1NzA5NzQzNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRl ckxheWVyLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyLmgKQEAg LTIzMSw2ICsyMzEsMTEgQEAgZW51bSBDbGlwUmVjdHNUeXBlIHsKICAgICBUZW1wb3JhcnlDbGlw UmVjdHMKIH07CiAKK2VudW0gU2hvdWxkUmVzcGVjdE92ZXJmbG93Q2xpcCB7CisgICAgSWdub3Jl T3ZlcmZsb3dDbGlwLAorICAgIFJlc3BlY3RPdmVyZmxvd0NsaXAKK307CisKIHN0cnVjdCBDbGlw UmVjdHNDYWNoZSB7CiAgICAgV1RGX01BS0VfRkFTVF9BTExPQ0FURUQ7CiBwdWJsaWM6CkBAIC0y MzksMTggKzI0NCwyOSBAQCBwdWJsaWM6CiAjaWZuZGVmIE5ERUJVRwogICAgICAgICBmb3IgKGlu dCBpID0gMDsgaSA8IE51bUNhY2hlZENsaXBSZWN0c1R5cGVzOyArK2kpIHsKICAgICAgICAgICAg IG1fY2xpcFJlY3RzUm9vdFtpXSA9IDA7Ci0gICAgICAgICAgICBtX3Jlc3BlY3RpbmdPdmVyZmxv d0NsaXBbaV0gPSBmYWxzZTsKICAgICAgICAgICAgIG1fc2Nyb2xsYmFyUmVsZXZhbmN5W2ldID0g SWdub3JlT3ZlcmxheVNjcm9sbGJhclNpemU7CiAgICAgICAgIH0KICNlbmRpZgogICAgIH0KIAot ICAgIFJlZlB0cjxDbGlwUmVjdHM+IG1fY2xpcFJlY3RzW051bUNhY2hlZENsaXBSZWN0c1R5cGVz XTsKKyAgICBQYXNzUmVmUHRyPENsaXBSZWN0cz4gZ2V0Q2xpcFJlY3RzKENsaXBSZWN0c1R5cGUg Y2xpcFJlY3RzVHlwZSwgU2hvdWxkUmVzcGVjdE92ZXJmbG93Q2xpcCByZXNwZWN0T3ZlcmZsb3cp IHsgcmV0dXJuIG1fY2xpcFJlY3RzW2dldEluZGV4KGNsaXBSZWN0c1R5cGUsIHJlc3BlY3RPdmVy ZmxvdyldOyB9CisgICAgdm9pZCBzZXRDbGlwUmVjdHMoQ2xpcFJlY3RzVHlwZSBjbGlwUmVjdHNU eXBlLCBTaG91bGRSZXNwZWN0T3ZlcmZsb3dDbGlwIHJlc3BlY3RPdmVyZmxvdywgUGFzc1JlZlB0 cjxDbGlwUmVjdHM+IGNsaXBSZWN0cykgeyBtX2NsaXBSZWN0c1tnZXRJbmRleChjbGlwUmVjdHNU eXBlLCByZXNwZWN0T3ZlcmZsb3cpXSA9IGNsaXBSZWN0czsgfQorCiAjaWZuZGVmIE5ERUJVRwog ICAgIGNvbnN0IFJlbmRlckxheWVyKiBtX2NsaXBSZWN0c1Jvb3RbTnVtQ2FjaGVkQ2xpcFJlY3Rz VHlwZXNdOwotICAgIGJvb2wgbV9yZXNwZWN0aW5nT3ZlcmZsb3dDbGlwW051bUNhY2hlZENsaXBS ZWN0c1R5cGVzXTsKICAgICBPdmVybGF5U2Nyb2xsYmFyU2l6ZVJlbGV2YW5jeSBtX3Njcm9sbGJh clJlbGV2YW5jeVtOdW1DYWNoZWRDbGlwUmVjdHNUeXBlc107CiAjZW5kaWYKKworcHJpdmF0ZToK KyAgICBpbnQgZ2V0SW5kZXgoQ2xpcFJlY3RzVHlwZSBjbGlwUmVjdHNUeXBlLCBTaG91bGRSZXNw ZWN0T3ZlcmZsb3dDbGlwIHJlc3BlY3RPdmVyZmxvdykKKyAgICB7CisgICAgICAgIGludCBpbmRl eCA9IHN0YXRpY19jYXN0PGludD4oY2xpcFJlY3RzVHlwZSk7CisgICAgICAgIGlmIChyZXNwZWN0 T3ZlcmZsb3cgPT0gUmVzcGVjdE92ZXJmbG93Q2xpcCkKKyAgICAgICAgICAgIGluZGV4ICs9IHN0 YXRpY19jYXN0PGludD4oTnVtQ2FjaGVkQ2xpcFJlY3RzVHlwZXMpOworICAgICAgICByZXR1cm4g aW5kZXg7CisgICAgfQorCisgICAgUmVmUHRyPENsaXBSZWN0cz4gbV9jbGlwUmVjdHNbTnVtQ2Fj aGVkQ2xpcFJlY3RzVHlwZXMgKiAyXTsKIH07CiAKIHN0cnVjdCBMYXllckZyYWdtZW50IHsKQEAg LTYyMSw4ICs2MzcsNiBAQCBwdWJsaWM6CiAgICAgYm9vbCBoaXRUZXN0KGNvbnN0IEhpdFRlc3RS ZXF1ZXN0JiwgY29uc3QgSGl0VGVzdExvY2F0aW9uJiwgSGl0VGVzdFJlc3VsdCYpOwogICAgIHZv aWQgcGFpbnRPdmVybGF5U2Nyb2xsYmFycyhHcmFwaGljc0NvbnRleHQqLCBjb25zdCBMYXlvdXRS ZWN0JiBkYW1hZ2VSZWN0LCBQYWludEJlaGF2aW9yLCBSZW5kZXJPYmplY3QqIHBhaW50aW5nUm9v dCA9IDApOwogCi0gICAgZW51bSBTaG91bGRSZXNwZWN0T3ZlcmZsb3dDbGlwIHsgSWdub3JlT3Zl cmZsb3dDbGlwLCBSZXNwZWN0T3ZlcmZsb3dDbGlwIH07Ci0KICAgICBzdHJ1Y3QgQ2xpcFJlY3Rz Q29udGV4dCB7CiAgICAgICAgIENsaXBSZWN0c0NvbnRleHQoY29uc3QgUmVuZGVyTGF5ZXIqIGlu Um9vdExheWVyLCBSZW5kZXJSZWdpb24qIGluUmVnaW9uLCBDbGlwUmVjdHNUeXBlIGluQ2xpcFJl Y3RzVHlwZSwgT3ZlcmxheVNjcm9sbGJhclNpemVSZWxldmFuY3kgaW5PdmVybGF5U2Nyb2xsYmFy U2l6ZVJlbGV2YW5jeSA9IElnbm9yZU92ZXJsYXlTY3JvbGxiYXJTaXplLCBTaG91bGRSZXNwZWN0 T3ZlcmZsb3dDbGlwIGluUmVzcGVjdE92ZXJmbG93Q2xpcCA9IFJlc3BlY3RPdmVyZmxvd0NsaXAp CiAgICAgICAgICAgICA6IHJvb3RMYXllcihpblJvb3RMYXllcikKQEAgLTY1MSwxMCArNjY1LDEw IEBAIHB1YmxpYzoKICAgICAvLyAocmF0aGVyIHRoYW4gY29tcHV0aW5nIHRoZW0gYWxsIGZyb20g c2NyYXRjaCB1cCB0aGUgcGFyZW50IGNoYWluKS4KICAgICB2b2lkIGNhbGN1bGF0ZUNsaXBSZWN0 cyhjb25zdCBDbGlwUmVjdHNDb250ZXh0JiwgQ2xpcFJlY3RzJikgY29uc3Q7CiAKLSAgICBDbGlw UmVjdHMqIGNsaXBSZWN0cyhDbGlwUmVjdHNUeXBlIHR5cGUpIGNvbnN0CisgICAgQ2xpcFJlY3Rz KiBjbGlwUmVjdHMoY29uc3QgQ2xpcFJlY3RzQ29udGV4dCYgY29udGV4dCkgY29uc3QKICAgICB7 Ci0gICAgICAgIEFTU0VSVCh0eXBlIDwgTnVtQ2FjaGVkQ2xpcFJlY3RzVHlwZXMpOwotICAgICAg ICByZXR1cm4gbV9jbGlwUmVjdHNDYWNoZSA/IG1fY2xpcFJlY3RzQ2FjaGUtPm1fY2xpcFJlY3Rz W3R5cGVdLmdldCgpIDogMDsKKyAgICAgICAgQVNTRVJUKGNvbnRleHQuY2xpcFJlY3RzVHlwZSA8 IE51bUNhY2hlZENsaXBSZWN0c1R5cGVzKTsKKyAgICAgICAgcmV0dXJuIG1fY2xpcFJlY3RzQ2Fj aGUgPyBtX2NsaXBSZWN0c0NhY2hlLT5nZXRDbGlwUmVjdHMoY29udGV4dC5jbGlwUmVjdHNUeXBl LCBjb250ZXh0LnJlc3BlY3RPdmVyZmxvd0NsaXApLmdldCgpIDogMDsKICAgICB9CiAKICAgICBM YXlvdXRSZWN0IGNoaWxkcmVuQ2xpcFJlY3QoKSBjb25zdDsgLy8gUmV0dXJucyB0aGUgZm9yZWdy b3VuZCBjbGlwIHJlY3Qgb2YgdGhlIGxheWVyIGluIHRoZSBkb2N1bWVudCdzIGNvb3JkaW5hdGUg c3BhY2UuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJC YWNraW5nLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllckJhY2tpbmcu Y3BwCmluZGV4IDkxN2ViMWU3OGRmMTlmOGU0NGUyYjUyNzViNmY3NDU5NWYyNzk2NjIuLjBlZWE4 Mzk2YjM3NzA4Y2I5ZTQzZjU0NjZmZmU3NDA3NDBhYTc2NTkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllckJhY2tpbmcuY3BwCisrKyBiL1NvdXJjZS9XZWJD b3JlL3JlbmRlcmluZy9SZW5kZXJMYXllckJhY2tpbmcuY3BwCkBAIC02NDAsNyArNjQwLDcgQEAg dm9pZCBSZW5kZXJMYXllckJhY2tpbmc6OnVwZGF0ZUdyYXBoaWNzTGF5ZXJHZW9tZXRyeSgpCiAg ICAgICAgIC8vIENhbGwgY2FsY3VsYXRlUmVjdHMgdG8gZ2V0IHRoZSBiYWNrZ3JvdW5kUmVjdCB3 aGljaCBpcyB3aGF0IGlzIHVzZWQgdG8gY2xpcCB0aGUgY29udGVudHMgb2YgdGhpcwogICAgICAg ICAvLyBsYXllci4gTm90ZSB0aGF0IHdlIGNhbGwgaXQgd2l0aCB0ZW1wb3JhcnlDbGlwUmVjdHMg PSB0cnVlIGJlY2F1c2Ugbm9ybWFsbHkgd2hlbiBjb21wdXRpbmcgY2xpcCByZWN0cwogICAgICAg ICAvLyBmb3IgYSBjb21wb3NpdGluZyBsYXllciwgcm9vdExheWVyIGlzIHRoZSBsYXllciBpdHNl bGYuCi0gICAgICAgIFJlbmRlckxheWVyOjpDbGlwUmVjdHNDb250ZXh0IGNsaXBSZWN0c0NvbnRl eHQoY29tcEFuY2VzdG9yLCAwLCBUZW1wb3JhcnlDbGlwUmVjdHMsIElnbm9yZU92ZXJsYXlTY3Jv bGxiYXJTaXplLCBSZW5kZXJMYXllcjo6SWdub3JlT3ZlcmZsb3dDbGlwKTsKKyAgICAgICAgUmVu ZGVyTGF5ZXI6OkNsaXBSZWN0c0NvbnRleHQgY2xpcFJlY3RzQ29udGV4dChjb21wQW5jZXN0b3Is IDAsIFRlbXBvcmFyeUNsaXBSZWN0cywgSWdub3JlT3ZlcmxheVNjcm9sbGJhclNpemUsIElnbm9y ZU92ZXJmbG93Q2xpcCk7CiAgICAgICAgIEludFJlY3QgcGFyZW50Q2xpcFJlY3QgPSBwaXhlbFNu YXBwZWRJbnRSZWN0KG1fb3duaW5nTGF5ZXItPmJhY2tncm91bmRDbGlwUmVjdChjbGlwUmVjdHND b250ZXh0KS5yZWN0KCkpOyAvLyBGSVhNRTogSW5jb3JyZWN0IGZvciBDU1MgcmVnaW9ucy4KICAg ICAgICAgQVNTRVJUKHBhcmVudENsaXBSZWN0ICE9IFBhaW50SW5mbzo6aW5maW5pdGVSZWN0KCkp OwogICAgICAgICBtX2FuY2VzdG9yQ2xpcHBpbmdMYXllci0+c2V0UG9zaXRpb24oRmxvYXRQb2lu dChwYXJlbnRDbGlwUmVjdC5sb2NhdGlvbigpIC0gZ3JhcGhpY3NMYXllclBhcmVudExvY2F0aW9u KSk7CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFu Z2VMb2cKaW5kZXggZTNjMTg5MDg2NzY5MTEzOGFiN2M0ZmViYThkNDk0MGQ1YzRlNGVlYi4uNTc1 MTc2MWY0NThiOTVmYWYwMmZiMWU4MDkxOTYyNmQ3YjcxMjRmZSAxMDA2NDQKLS0tIGEvTGF5b3V0 VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE0 IEBACisyMDEzLTAzLTAxICBJYW4gVm9sbGljayAgPHZvbGxpY2tAY2hyb21pdW0ub3JnPgorCisg ICAgICAgIEFTU0VSVElPTiBGQUlMRUQ6IG1fY2xpcFJlY3RzQ2FjaGUtPm1fcmVzcGVjdGluZ092 ZXJmbG93Q2xpcFtjbGlwUmVjdHNUeXBlXSA9PSAoY2xpcFJlY3RzQ29udGV4dC5yZXNwZWN0T3Zl cmZsb3dDbGlwID09IFJlc3BlY3RPdmVyZmxvd0NsaXApIGluIFJlbmRlckxheWVyLgorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTA4MjU3CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9lZmwt d2syL1Rlc3RFeHBlY3RhdGlvbnM6CisgICAgICAgICogcGxhdGZvcm0vbWFjL1Rlc3RFeHBlY3Rh dGlvbnM6CisgICAgICAgICogcGxhdGZvcm0vcXQtNS4wLXdrMi9UZXN0RXhwZWN0YXRpb25zOgor CiAyMDEzLTAzLTAxICDDgWTDoW0gS2FsbGFpICA8a2FkYW1AaW5mLnUtc3plZ2VkLmh1PgogCiAg ICAgICAgIFtRdF0gVW5yZXZpZXdlZCBnYXJkZW5pbmcuCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0 cy9wbGF0Zm9ybS9lZmwtd2syL1Rlc3RFeHBlY3RhdGlvbnMgYi9MYXlvdXRUZXN0cy9wbGF0Zm9y bS9lZmwtd2syL1Rlc3RFeHBlY3RhdGlvbnMKaW5kZXggYzg2ZWI0ZWNhZTZiOGZmZjA0Y2FkMzM1 NzdmZDVmMWVhZGY0N2IxMC4uOTM3ZWQ4ODAxMWQ2ZTg4NGI1MzMyZGY1NTk5NzkyNDNjYjkxYzk3 ZCAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvcGxhdGZvcm0vZWZsLXdrMi9UZXN0RXhwZWN0YXRp b25zCisrKyBiL0xheW91dFRlc3RzL3BsYXRmb3JtL2VmbC13azIvVGVzdEV4cGVjdGF0aW9ucwpA QCAtMjI0LDkgKzIyNCw4IEBAIHdlYmtpdC5vcmcvYi8xMDM4ODMgY3NzMy9zZWxlY3RvcnMzL3ht bC9jc3MzLW1vZHNlbC0xLnhtbCBbIEZhaWx1cmUgUGFzcyBdCiB3ZWJraXQub3JnL2IvMTAzODgz IGNzczMvc2VsZWN0b3JzMy94aHRtbC9jc3MzLW1vZHNlbC0xLnhtbCBbIEZhaWx1cmUgUGFzcyBd CiAKICMgQXNzZXJ0aW9uIGZhaWx1cmUgYW5kIGluY29ycmVjdCByZXN1bHRzIG9uIG91ciBwb3J0 IGFmdGVyIHIxNDA5OTkgKHdlYmtpdC5vcmcvYi8xMDYxNDIpCi13ZWJraXQub3JnL2IvMTA4MjU3 IGNvbXBvc2l0aW5nL292ZXJmbG93L2F1dG9tYXRpY2FsbHktb3B0LWludG8tY29tcG9zaXRlZC1z Y3JvbGxpbmcuaHRtbCBbIENyYXNoIEZhaWx1cmUgXQotd2Via2l0Lm9yZy9iLzEwODI1NyBjb21w b3NpdGluZy9vdmVyZmxvdy9jb21wb3NpdGVkLXNjcm9sbGluZy1jcmVhdGVzLWEtc3RhY2tpbmct Y29udGFpbmVyLmh0bWwgWyBDcmFzaCBGYWlsdXJlIF0KLXdlYmtpdC5vcmcvYi8xMDgyNTcgY29t cG9zaXRpbmcvb3ZlcmZsb3cvY2xpcC1jb250ZW50LXVuZGVyLW92ZXJmbG93LWNvbnRyb2xzLmh0 bWwgWyBDcmFzaCBQYXNzIF0KK3dlYmtpdC5vcmcvYi8xMDgyNTcgY29tcG9zaXRpbmcvb3ZlcmZs b3cvYXV0b21hdGljYWxseS1vcHQtaW50by1jb21wb3NpdGVkLXNjcm9sbGluZy5odG1sIFsgRmFp bHVyZSBdCit3ZWJraXQub3JnL2IvMTA4MjU3IGNvbXBvc2l0aW5nL292ZXJmbG93L2NvbXBvc2l0 ZWQtc2Nyb2xsaW5nLWNyZWF0ZXMtYS1zdGFja2luZy1jb250YWluZXIuaHRtbCBbIEZhaWx1cmUg XQogCiAjIEFzc2VydHMgd2hlbiBkZXN0cm95aW5nIFdlYkNvcmU6OkRhdGFiYXNlIChwb3NzaWJs eSBiZWNhdXNlIHIxNDEyMDcpCiB3ZWJraXQub3JnL2IvMTA4MzU1IGZhc3QvanMvY2FsbGVyLXBy b3BlcnR5Lmh0bWwgWyBDcmFzaCBQYXNzIF0KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL3BsYXRm b3JtL21hYy9UZXN0RXhwZWN0YXRpb25zIGIvTGF5b3V0VGVzdHMvcGxhdGZvcm0vbWFjL1Rlc3RF eHBlY3RhdGlvbnMKaW5kZXggMWJlZmFmZDRjOGI0ZDI4ODQzZDNmMWJjMDA3ZDVlNGE3MmRmOTQz OC4uNzVmMGI4ODlkOTFjYzhjNGI5MTExYjRkNjkxMTQ3MzdkODkwYTFiZiAxMDA2NDQKLS0tIGEv TGF5b3V0VGVzdHMvcGxhdGZvcm0vbWFjL1Rlc3RFeHBlY3RhdGlvbnMKKysrIGIvTGF5b3V0VGVz dHMvcGxhdGZvcm0vbWFjL1Rlc3RFeHBlY3RhdGlvbnMKQEAgLTE0MjQsOSArMTQyNCw2IEBAIHdl YmtpdC5vcmcvYi8xMDgzNzAgZWRpdGluZy9zcGVsbGluZy9zcGVsbGluZy13aXRoLXVuZGVyc2Nv cmUtc2VsZWN0aW9uLmh0bWwgWyBTCiB3ZWJraXQub3JnL2IvMTA4MzcwIGVkaXRpbmcvc3BlbGxp bmcvc3BlbGxpbmctd2l0aC13aGl0ZXNwYWNlLXNlbGVjdGlvbi5odG1sIFsgU2tpcCBdCiB3ZWJr aXQub3JnL2IvMTA4MzcwIGVkaXRpbmcvc3BlbGxpbmcvc3BlbGxpbmctY2hhbmdlZC10ZXh0Lmh0 bWwgWyBTa2lwIF0KIAotd2Via2l0Lm9yZy9iLzEwODI1NyBbIERlYnVnIF0gY29tcG9zaXRpbmcv b3ZlcmZsb3cvY29tcG9zaXRlZC1zY3JvbGxpbmctY3JlYXRlcy1hLXN0YWNraW5nLWNvbnRhaW5l ci5odG1sIFsgQ3Jhc2ggXQotd2Via2l0Lm9yZy9iLzEwODI1NyBbIERlYnVnIF0gY29tcG9zaXRp bmcvb3ZlcmZsb3cvYXV0b21hdGljYWxseS1vcHQtaW50by1jb21wb3NpdGVkLXNjcm9sbGluZy5o dG1sIFsgQ3Jhc2ggXQotCiAjIFJlYmFzZWxpbmUgcmVxdWlyZWQgYWZ0ZXIgaHR0cHM6Ly93ZWJr aXQub3JnL2IvOTU3NzIKIHdlYmtpdC5vcmcvYi8xMDkyMDkgZmFzdC90ZXh0L2ludGVybmF0aW9u YWwvYmlkaS1pZ25vcmVkLWZvci1maXJzdC1jaGlsZC1pbmxpbmUuaHRtbCBbIEZhaWx1cmUgXQog CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9xdC01LjAtd2syL1Rlc3RFeHBlY3Rh dGlvbnMgYi9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9xdC01LjAtd2syL1Rlc3RFeHBlY3RhdGlvbnMK aW5kZXggMjFkMTQxZTJkMDE5NjcyNTIyYjJmYmEzNzkxOTQyNWVkNzAyMzk0OS4uMmU2NWU0ZGFj MTM1OTlhN2EyMjc5ZjQ3MTRhNWVmZTI2YjgwNTVjMyAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMv cGxhdGZvcm0vcXQtNS4wLXdrMi9UZXN0RXhwZWN0YXRpb25zCisrKyBiL0xheW91dFRlc3RzL3Bs YXRmb3JtL3F0LTUuMC13azIvVGVzdEV4cGVjdGF0aW9ucwpAQCAtNzMwLDkgKzczMCw2IEBAIHdl YmtpdC5vcmcvYi8xMDMxMjIgZmFzdC9ldmVudHMvbW91c2UtY3Vyc29yLmh0bWwKICMgW1F0XVtX SzJdIG5ldyBmYXN0L2RvbS9HZW9sb2NhdGlvbi9jYWNoZWQtcG9zaXRpb24taWZyYW1lLmh0bWwg ZmFpbHMgc2luY2UgaXQgd2FzIGludHJvZHVjZWQgaW4gcjEzNjE2NAogd2Via2l0Lm9yZy9iLzEw Mzg3NiBmYXN0L2RvbS9HZW9sb2NhdGlvbi9jYWNoZWQtcG9zaXRpb24taWZyYW1lLmh0bWwKIAot IyBbUXRdW1dLMl0gY29tcG9zaXRpbmcvb3ZlcmZsb3cvYXV0b21hdGljYWxseS1vcHQtaW50by1j b21wb3NpdGVkLXNjcm9sbGluZy5odG1sIG1ha2VzIG90aGVyIHRlc3RzIGZhaWwKLXdlYmtpdC5v cmcvYi8xMDUxNzMgY29tcG9zaXRpbmcvb3ZlcmZsb3cvYXV0b21hdGljYWxseS1vcHQtaW50by1j b21wb3NpdGVkLXNjcm9sbGluZy5odG1sCi0KICMgW1F0XVtXSzJdIFRoZSBuZXcgY29tcG9zaXRp bmcvcmVwYWludC9yZXNpemUtcmVwYWludC5odG1sIGZhaWxzCiB3ZWJraXQub3JnL2IvMTA1MTgy IGNvbXBvc2l0aW5nL3JlcGFpbnQvcmVzaXplLXJlcGFpbnQuaHRtbAogCg==