82807 2012-03-30 16:54:52 -0700 styleForElement() should use enums instead of bools so we can all understand what it's doing 2012-03-30 19:46:31 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 45950 1 eric eric abarth hyatt macpherson menard simon.fraser webkit.review.bot oldest_to_newest 592658 0 eric 2012-03-30 16:54:52 -0700 styleForElement() should use enums instead of bools so we can all understand what it's doing 592662 1 134915 eric 2012-03-30 17:01:12 -0700 Created attachment 134915 Patch 592663 2 134915 abarth 2012-03-30 17:03:46 -0700 Comment on attachment 134915 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=134915&action=review > Source/WebCore/rendering/RenderObject.cpp:2548 > + /// FIXME: This "find nearest element parent" should be a helper function. /////////////////// 592665 3 webkit.review.bot 2012-03-30 17:04:47 -0700 Attachment 134915 did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Source/WebCore/ChangeLog', u'Source/WebCor..." exit_code: 1 Source/WebCore/css/CSSStyleSelector.cpp:1570: Local variables should never be PassRefPtr (see http://webkit.org/coding/RefPtr.html). [readability/pass_ptr] [5] Total errors found: 1 in 9 files If any of these errors are false positives, please file a bug against check-webkit-style. 592666 4 134916 eric 2012-03-30 17:05:25 -0700 Created attachment 134916 Patch for landing 592694 5 134916 webkit.review.bot 2012-03-30 17:54:16 -0700 Comment on attachment 134916 Patch for landing Rejecting attachment 134916 from commit-queue. Failed to run "['/mnt/git/webkit-commit-queue/Tools/Scripts/webkit-patch', '--status-host=queues.webkit.org', '-..." exit_code: 2 Last 500 characters of output: eSelector.h patching file Source/WebCore/css/MediaQueryMatcher.cpp patching file Source/WebCore/css/StyleMedia.cpp patching file Source/WebCore/dom/Element.cpp patching file Source/WebCore/rendering/RenderObject.cpp Hunk #1 succeeded at 2560 (offset 15 lines). patching file Source/WebCore/rendering/RenderRegion.cpp patching file Source/WebCore/svg/SVGElement.cpp Failed to run "[u'/mnt/git/webkit-commit-queue/Tools/Scripts/svn-apply', u'--force']" exit_code: 1 cwd: /mnt/git/webkit-commit-queue/ Full output: http://queues.webkit.org/results/12267531 592727 6 134928 eric 2012-03-30 18:55:25 -0700 Created attachment 134928 Patch for landing 592728 7 webkit.review.bot 2012-03-30 18:57:06 -0700 Attachment 134928 did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Source/WebCore/ChangeLog', u'Source/WebCor..." exit_code: 1 Source/WebCore/css/CSSStyleSelector.cpp:1570: Local variables should never be PassRefPtr (see http://webkit.org/coding/RefPtr.html). [readability/pass_ptr] [5] Total errors found: 1 in 9 files If any of these errors are false positives, please file a bug against check-webkit-style. 592753 8 134928 webkit.review.bot 2012-03-30 19:46:26 -0700 Comment on attachment 134928 Patch for landing Clearing flags on attachment: 134928 Committed r112765: <http://trac.webkit.org/changeset/112765> 592754 9 webkit.review.bot 2012-03-30 19:46:31 -0700 All reviewed patches have been landed. Closing bug. 134915 2012-03-30 17:01:12 -0700 2012-03-30 17:05:20 -0700 Patch bug-82807-20120330170110.patch text/plain 12521 eric U3VidmVyc2lvbiBSZXZpc2lvbjogMTEyNzM3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOWRmNmNhZTc4MjUyNDY3 NzE2ZGNkODU5OWRlNGI5ZmY4M2U5NWVlMC4uMjg5NTE3N2E1MmExZjZjNmQ4MTE5NDIzMTMzYTg3 ZDczZDhkMWVmMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDQ1IEBACiAyMDEyLTAzLTMwICBFcmlj IFNlaWRlbCAgPGVyaWNAd2Via2l0Lm9yZz4KIAorICAgICAgICBzdHlsZUZvckVsZW1lbnQoKSBz aG91bGQgdXNlIGVudW1zIGluc3RlYWQgb2YgYm9vbHMgc28gd2UgY2FuIGFsbCB1bmRlcnN0YW5k IHdoYXQgaXQncyBkb2luZworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9ODI4MDcKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICBObyBjaGFuZ2UgaW4gYmVoYXZpb3IsIHRodXMgbm8gdGVzdHMuCisKKyAgICAgICAg TW9zdGx5IHRoaXMgaXMganVzdCByZXBsYWNpbmcgdHJ1ZS9mYWxzZSB3aXRoIHRoZSBjb3JyZWN0 IG5ldyBlbnVtIHZhbHVlCisgICAgICAgIG9yIHJlbW92aW5nIHRydWUvZmFsc2UgZnJvbSB0aGUg Y2FsbHNpdGVzIHdoZW4gdGhleSB3b3VsZCBoYXZlIGJlZW4gZGVmYXVsdCBhbnl3YXkuCisgICAg ICAgIEkgdGhpbmsgdGhpcyBtYWtlcyB0aGUgY29kZSAqd2F5KiBtb3JlIGNsZWFyLgorCisgICAg ICAgIFRoZSBvbGQgY29kZSB3YXMgZXh0cmEgY29uZnVzaW5nIGJlY2F1c2UgdGhlIGRlZmF1bHRz IHdlcmUgInRydWUsIGZhbHNlIi4gOikKKyAgICAgICAgVGhlIG5ldyBkZWZhdWx0cyBhcmUgQWxs b3dTdHlsZVNoYXJpbmcsIE1hdGNoQWxsUnVsZXMuCisgICAgICAgIEl0J3MgdmVyeSB1bmNvbW1v biBmb3IgY2FsbGVycyB0byB3YW50IHRvIG92ZXJyaWRlIGVpdGhlciBvZiB0aGVzZSBiZWhhdmlv cnMuCisgICAgICAgIEkgdGhpbmsgbW9zdCBjYWxsZXJzIHdoaWNoIHNwZWNpZnkgRGlzYWxsb3dT dHlsZVNoYXJpbmcgbGlrZWx5IGRvbid0IGFjdHVhbGx5IG5lZWQgdG8KKyAgICAgICAgKG91ciBz dHlsZS1zaGFyaW5nIGNvZGUgc2hvdWxkIGJlIHNtYXJ0IGVub3VnaCB0byBvbmx5IHNoYXJlIHdo ZW4gc2FmZSBhbnl3YXkpLgorCisgICAgICAgICogY3NzL0NTU1N0eWxlU2VsZWN0b3IuY3BwOgor ICAgICAgICAoV2ViQ29yZTo6Q1NTU3R5bGVTZWxlY3Rvcjo6Q1NTU3R5bGVTZWxlY3Rvcik6Cisg ICAgICAgICAtIFVzZSBlbnVtcyBhbmQgcmVtb3ZlIGJvZ3VzIGNvbW1lbnQgKG1fcm9vdERlZmF1 bHRTdHlsZSBpcyBhIFJlZlB0ciEpCisgICAgICAgIChXZWJDb3JlOjpDU1NTdHlsZVNlbGVjdG9y Ojpjb2xsZWN0TWF0Y2hpbmdSdWxlc0Zvckxpc3QpOgorICAgICAgICAqIGNzcy9DU1NTdHlsZVNl bGVjdG9yLmg6CisgICAgICAgIChDU1NTdHlsZVNlbGVjdG9yKToKKyAgICAgICAgKiBjc3MvTWVk aWFRdWVyeU1hdGNoZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6TWVkaWFRdWVyeU1hdGNoZXI6 OnByZXBhcmVFdmFsdWF0b3IpOgorICAgICAgICAqIGNzcy9TdHlsZU1lZGlhLmNwcDoKKyAgICAg ICAgKFdlYkNvcmU6OlN0eWxlTWVkaWE6Om1hdGNoTWVkaXVtKToKKyAgICAgICAgKiBkb20vRWxl bWVudC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpFbGVtZW50OjpzdHlsZUZvclJlbmRlcmVyKToK KyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyT2JqZWN0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6 OlJlbmRlck9iamVjdDo6Z2V0VW5jYWNoZWRQc2V1ZG9TdHlsZSk6CisgICAgICAgICAtIFVwZGF0 ZWQgdG8gdXNlIGVudW1zCisgICAgICAgICAtIEFsc28gZml4ZWQgdGhpcyB0byB1c2UgdG9FbGVt ZW50IGFuZCBtb2Rlcm4gZWFybHktcmV0dXJuIHN0eWxlcy4KKyAgICAgICAgKiByZW5kZXJpbmcv UmVuZGVyUmVnaW9uLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclJlZ2lvbjo6Y29tcHV0 ZVN0eWxlSW5SZWdpb24pOgorICAgICAgICAqIHN2Zy9TVkdFbGVtZW50LmNwcDoKKyAgICAgICAg KFdlYkNvcmU6OlNWR0VsZW1lbnQ6OmN1c3RvbVN0eWxlRm9yUmVuZGVyZXIpOgorCisyMDEyLTAz LTMwICBFcmljIFNlaWRlbCAgPGVyaWNAd2Via2l0Lm9yZz4KKwogICAgICAgICBBZGQgdGVzdHMg Zm9yIGlmcmFtZSBzZWFtbGVzcyBhbmQgc3VwcG9ydCBmb3IgcGFyc2luZyB3ZWJraXRzZWFtbGVz cyBhdHRyaWJ1dGUKICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTgyNzk1CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NTdHlsZVNlbGVj dG9yLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NTdHlsZVNlbGVjdG9yLmNwcAppbmRleCAx Y2ZjZWUyMGNkNDdlNTVmNmFlMDQzMTAzNTFmY2VmNDkxNjU2OGZhLi5kYmIzYzYzMjc4NGU0ZDRj NmVlMjRmOTRhZjQ1ZTYwODU5NTJhNjg1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9jc3Mv Q1NTU3R5bGVTZWxlY3Rvci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvY3NzL0NTU1N0eWxlU2Vs ZWN0b3IuY3BwCkBAIC0zNzUsNyArMzc1LDcgQEAgQ1NTU3R5bGVTZWxlY3Rvcjo6Q1NTU3R5bGVT ZWxlY3RvcihEb2N1bWVudCogZG9jdW1lbnQsIGJvb2wgbWF0Y2hBdXRob3JBbmRVc2VyU3QKICAg ICAgICAgbV9tZWRpdW0gPSBhZG9wdFB0cihuZXcgTWVkaWFRdWVyeUV2YWx1YXRvcigiYWxsIikp OwogCiAgICAgaWYgKHJvb3QpCi0gICAgICAgIG1fcm9vdERlZmF1bHRTdHlsZSA9IHN0eWxlRm9y RWxlbWVudChyb290LCAwLCBmYWxzZSwgdHJ1ZSk7IC8vIGRvbid0IHJlZiwgYmVjYXVzZSB0aGUg UmVuZGVyU3R5bGUgaXMgYWxsb2NhdGVkIGZyb20gZ2xvYmFsIGhlYXAKKyAgICAgICAgbV9yb290 RGVmYXVsdFN0eWxlID0gc3R5bGVGb3JFbGVtZW50KHJvb3QsIDAsIERpc2FsbG93U3R5bGVTaGFy aW5nLCBNYXRjaE9ubHlVc2VyQWdlbnRSdWxlcyk7CiAKICAgICBpZiAobV9yb290RGVmYXVsdFN0 eWxlICYmIHZpZXcpCiAgICAgICAgIG1fbWVkaXVtID0gYWRvcHRQdHIobmV3IE1lZGlhUXVlcnlF dmFsdWF0b3Iodmlldy0+bWVkaWFUeXBlKCksIHZpZXctPmZyYW1lKCksIG1fcm9vdERlZmF1bHRT dHlsZS5nZXQoKSkpOwpAQCAtMTU2NywxNCArMTU2NywxMiBAQCBzdGF0aWMgaW5saW5lIGJvb2wg aXNBdFNoYWRvd0JvdW5kYXJ5KEVsZW1lbnQqIGVsZW1lbnQpCiAgICAgcmV0dXJuIHBhcmVudE5v ZGUgJiYgcGFyZW50Tm9kZS0+aXNTaGFkb3dSb290KCk7CiB9CiAKLS8vIElmIHJlc29sdmVGb3JS b290RGVmYXVsdCBpcyB0cnVlLCBzdHlsZSBiYXNlZCBvbiB1c2VyIGFnZW50IHN0eWxlIHNoZWV0 IG9ubHkuIFRoaXMgaXMgdXNlZCBpbiBtZWRpYSBxdWVyaWVzLCB3aGVyZQotLy8gcmVsYXRpdmUg dW5pdHMgYXJlIGludGVycHJldGVkIGFjY29yZGluZyB0byBkb2N1bWVudCByb290IGVsZW1lbnQg c3R5bGUsIHN0eWxlZCBvbmx5IHdpdGggVUEgc3R5bGVzaGVldAotCi1QYXNzUmVmUHRyPFJlbmRl clN0eWxlPiBDU1NTdHlsZVNlbGVjdG9yOjpzdHlsZUZvckVsZW1lbnQoRWxlbWVudCogZWxlbWVu dCwgUmVuZGVyU3R5bGUqIGRlZmF1bHRQYXJlbnQsIGJvb2wgYWxsb3dTaGFyaW5nLCBib29sIHJl c29sdmVGb3JSb290RGVmYXVsdCwgUmVuZGVyUmVnaW9uKiByZWdpb25Gb3JTdHlsaW5nKQorUGFz c1JlZlB0cjxSZW5kZXJTdHlsZT4gQ1NTU3R5bGVTZWxlY3Rvcjo6c3R5bGVGb3JFbGVtZW50KEVs ZW1lbnQqIGVsZW1lbnQsIFJlbmRlclN0eWxlKiBkZWZhdWx0UGFyZW50LAorICAgIFN0eWxlU2hh cmluZ0JlaGF2aW9yIHNoYXJpbmdCZWhhdmlvciwgUnVsZU1hdGNoaW5nQmVoYXZpb3IgbWF0Y2hp bmdCZWhhdmlvciwgUmVuZGVyUmVnaW9uKiByZWdpb25Gb3JTdHlsaW5nKQogewogICAgIC8vIE9u Y2UgYW4gZWxlbWVudCBoYXMgYSByZW5kZXJlciwgd2UgZG9uJ3QgdHJ5IHRvIGRlc3Ryb3kgaXQs IHNpbmNlIG90aGVyd2lzZSB0aGUgcmVuZGVyZXIKICAgICAvLyB3aWxsIHZhbmlzaCBpZiBhIHN0 eWxlIHJlY2FsYyBoYXBwZW5zIGR1cmluZyBsb2FkaW5nLgotICAgIGlmIChhbGxvd1NoYXJpbmcg JiYgIWVsZW1lbnQtPmRvY3VtZW50KCktPmhhdmVTdHlsZXNoZWV0c0xvYWRlZCgpICYmICFlbGVt ZW50LT5yZW5kZXJlcigpKSB7CisgICAgaWYgKHNoYXJpbmdCZWhhdmlvciA9PSBBbGxvd1N0eWxl U2hhcmluZyAmJiAhZWxlbWVudC0+ZG9jdW1lbnQoKS0+aGF2ZVN0eWxlc2hlZXRzTG9hZGVkKCkg JiYgIWVsZW1lbnQtPnJlbmRlcmVyKCkpIHsKICAgICAgICAgaWYgKCFzX3N0eWxlTm90WWV0QXZh aWxhYmxlKSB7CiAgICAgICAgICAgICBzX3N0eWxlTm90WWV0QXZhaWxhYmxlID0gUmVuZGVyU3R5 bGU6OmNyZWF0ZSgpLmxlYWtSZWYoKTsKICAgICAgICAgICAgIHNfc3R5bGVOb3RZZXRBdmFpbGFi bGUtPnNldERpc3BsYXkoTk9ORSk7CkBAIC0xNTg3LDcgKzE1ODUsNyBAQCBQYXNzUmVmUHRyPFJl bmRlclN0eWxlPiBDU1NTdHlsZVNlbGVjdG9yOjpzdHlsZUZvckVsZW1lbnQoRWxlbWVudCogZWxl bWVudCwgUmVuZAogICAgIGluaXRFbGVtZW50KGVsZW1lbnQpOwogICAgIGluaXRGb3JTdHlsZVJl c29sdmUoZWxlbWVudCwgZGVmYXVsdFBhcmVudCk7CiAgICAgbV9yZWdpb25Gb3JTdHlsaW5nID0g cmVnaW9uRm9yU3R5bGluZzsKLSAgICBpZiAoYWxsb3dTaGFyaW5nKSB7CisgICAgaWYgKHNoYXJp bmdCZWhhdmlvciA9PSBBbGxvd1N0eWxlU2hhcmluZykgewogICAgICAgICBSZW5kZXJTdHlsZSog c2hhcmVkU3R5bGUgPSBsb2NhdGVTaGFyZWRTdHlsZSgpOwogICAgICAgICBpZiAoc2hhcmVkU3R5 bGUpCiAgICAgICAgICAgICByZXR1cm4gc2hhcmVkU3R5bGU7CkBAIC0xNjE1LDcgKzE2MTMsNyBA QCBQYXNzUmVmUHRyPFJlbmRlclN0eWxlPiBDU1NTdHlsZVNlbGVjdG9yOjpzdHlsZUZvckVsZW1l bnQoRWxlbWVudCogZWxlbWVudCwgUmVuZAogICAgIGVuc3VyZURlZmF1bHRTdHlsZVNoZWV0c0Zv ckVsZW1lbnQoZWxlbWVudCk7CiAKICAgICBNYXRjaFJlc3VsdCBtYXRjaFJlc3VsdDsKLSAgICBp ZiAocmVzb2x2ZUZvclJvb3REZWZhdWx0KQorICAgIGlmIChtYXRjaGluZ0JlaGF2aW9yID09IE1h dGNoT25seVVzZXJBZ2VudFJ1bGVzKQogICAgICAgICBtYXRjaFVBUnVsZXMobWF0Y2hSZXN1bHQp OwogICAgIGVsc2UKICAgICAgICAgbWF0Y2hBbGxSdWxlcyhtYXRjaFJlc3VsdCk7CmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTU3R5bGVTZWxlY3Rvci5oIGIvU291cmNlL1dlYkNv cmUvY3NzL0NTU1N0eWxlU2VsZWN0b3IuaAppbmRleCAxZGI5MDQwNDNlYWNhMjEzODZmODI4OWQ3 OTIyOTUxMWNlNjQ5ZTU5Li41ODE4MzY3NGE5MjJiMmY2MWMzMzc5YTc3ZmNkMmMwZDFiMDAwNDg0 IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTU3R5bGVTZWxlY3Rvci5oCisrKyBi L1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NTdHlsZVNlbGVjdG9yLmgKQEAgLTEwMCw2ICsxMDAsMjAg QEAgcHVibGljOgogICAgIGJvb2wgbV9yZXN1bHQ7CiB9OwogCitlbnVtIFN0eWxlU2hhcmluZ0Jl aGF2aW9yIHsKKyAgICBBbGxvd1N0eWxlU2hhcmluZywKKyAgICBEaXNhbGxvd1N0eWxlU2hhcmlu ZywKK307CisKKy8vIE1hdGNoT25seVVzZXJBZ2VudFJ1bGVzIGlzIHVzZWQgaW4gbWVkaWEgcXVl cmllcywgd2hlcmUgcmVsYXRpdmUgdW5pdHMKKy8vIGFyZSBpbnRlcnByZXRlZCBhY2NvcmRpbmcg dG8gdGhlIGRvY3VtZW50IHJvb3QgZWxlbWVudCBzdHlsZSwgYW5kIHN0eWxlZCBvbmx5CisvLyBm cm9tIHRoZSBVc2VyIEFnZW50IFN0eWxlc2hlZXQgcnVsZXMuCisKK2VudW0gUnVsZU1hdGNoaW5n QmVoYXZpb3IgeworICAgIE1hdGNoQWxsUnVsZXMsCisgICAgTWF0Y2hPbmx5VXNlckFnZW50UnVs ZXMsCit9OworCiAvLyBUaGlzIGNsYXNzIHNlbGVjdHMgYSBSZW5kZXJTdHlsZSBmb3IgYSBnaXZl biBlbGVtZW50IGJhc2VkIG9uIGEgY29sbGVjdGlvbiBvZiBzdHlsZXNoZWV0cy4KIGNsYXNzIENT U1N0eWxlU2VsZWN0b3IgewogICAgIFdURl9NQUtFX05PTkNPUFlBQkxFKENTU1N0eWxlU2VsZWN0 b3IpOyBXVEZfTUFLRV9GQVNUX0FMTE9DQVRFRDsKQEAgLTExMyw3ICsxMjcsOCBAQCBwdWJsaWM6 CiAgICAgdm9pZCBwdXNoUGFyZW50U2hhZG93Um9vdChjb25zdCBTaGFkb3dSb290Kik7CiAgICAg dm9pZCBwb3BQYXJlbnRTaGFkb3dSb290KGNvbnN0IFNoYWRvd1Jvb3QqKTsKIAotICAgIFBhc3NS ZWZQdHI8UmVuZGVyU3R5bGU+IHN0eWxlRm9yRWxlbWVudChFbGVtZW50KiwgUmVuZGVyU3R5bGUq IHBhcmVudFN0eWxlID0gMCwgYm9vbCBhbGxvd1NoYXJpbmcgPSB0cnVlLCBib29sIHJlc29sdmVG b3JSb290RGVmYXVsdCA9IGZhbHNlLCBSZW5kZXJSZWdpb24qIHJlZ2lvbkZvclN0eWxpbmcgPSAw KTsKKyAgICBQYXNzUmVmUHRyPFJlbmRlclN0eWxlPiBzdHlsZUZvckVsZW1lbnQoRWxlbWVudCos IFJlbmRlclN0eWxlKiBwYXJlbnRTdHlsZSA9IDAsIFN0eWxlU2hhcmluZ0JlaGF2aW9yID0gQWxs b3dTdHlsZVNoYXJpbmcsCisgICAgICAgIFJ1bGVNYXRjaGluZ0JlaGF2aW9yID0gTWF0Y2hBbGxS dWxlcywgUmVuZGVyUmVnaW9uKiByZWdpb25Gb3JTdHlsaW5nID0gMCk7CiAKICAgICB2b2lkIGtl eWZyYW1lU3R5bGVzRm9yQW5pbWF0aW9uKEVsZW1lbnQqLCBjb25zdCBSZW5kZXJTdHlsZSosIEtl eWZyYW1lTGlzdCYpOwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9jc3MvTWVkaWFRdWVy eU1hdGNoZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvY3NzL01lZGlhUXVlcnlNYXRjaGVyLmNwcApp bmRleCBmN2IyM2I3YTllZDMxMDE0ZWMyMDM2ZWJlNWIzN2FiNzQ1ZDI5ODEyLi4zNjNiYTIxYmQx ZWRjMjJmNzc3YmFhNjAwMDhlMGI4MGRlZTRlNzE2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9jc3MvTWVkaWFRdWVyeU1hdGNoZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9NZWRp YVF1ZXJ5TWF0Y2hlci5jcHAKQEAgLTg4LDcgKzg4LDcgQEAgUGFzc093blB0cjxNZWRpYVF1ZXJ5 RXZhbHVhdG9yPiBNZWRpYVF1ZXJ5TWF0Y2hlcjo6cHJlcGFyZUV2YWx1YXRvcigpIGNvbnN0CiAg ICAgaWYgKCFzdHlsZVNlbGVjdG9yKQogICAgICAgICByZXR1cm4gbnVsbHB0cjsKIAotICAgIFJl ZlB0cjxSZW5kZXJTdHlsZT4gcm9vdFN0eWxlID0gc3R5bGVTZWxlY3Rvci0+c3R5bGVGb3JFbGVt ZW50KGRvY3VtZW50RWxlbWVudCwgMCAvKmRlZmF1bHRQYXJlbnQqLywgZmFsc2UgLyphbGxvd1No YXJpbmcqLywgdHJ1ZSAvKnJlc29sdmVGb3JSb290RGVmYXVsdCovKTsKKyAgICBSZWZQdHI8UmVu ZGVyU3R5bGU+IHJvb3RTdHlsZSA9IHN0eWxlU2VsZWN0b3ItPnN0eWxlRm9yRWxlbWVudChkb2N1 bWVudEVsZW1lbnQsIDAgLypkZWZhdWx0UGFyZW50Ki8sIERpc2FsbG93U3R5bGVTaGFyaW5nLCBN YXRjaE9ubHlVc2VyQWdlbnRSdWxlcyk7CiAKICAgICByZXR1cm4gYWRvcHRQdHIobmV3IE1lZGlh UXVlcnlFdmFsdWF0b3IobWVkaWFUeXBlKCksIG1fZG9jdW1lbnQtPmZyYW1lKCksIHJvb3RTdHls ZS5nZXQoKSkpOwogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvY3NzL1N0eWxlTWVkaWEu Y3BwIGIvU291cmNlL1dlYkNvcmUvY3NzL1N0eWxlTWVkaWEuY3BwCmluZGV4IDQ2MWI5Y2QyYzU2 NDlmYzFhNzIzMTliZWNjMWU0OTA0ODI5N2E5MTIuLmJhMjY2NGRkMWNkNDEzNTllYTJlM2YyOTE1 MjFjMzFkYzFjMTkxMmIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9TdHlsZU1lZGlh LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9jc3MvU3R5bGVNZWRpYS5jcHAKQEAgLTY0LDcgKzY0 LDcgQEAgYm9vbCBTdHlsZU1lZGlhOjptYXRjaE1lZGl1bShjb25zdCBTdHJpbmcmIHF1ZXJ5KSBj b25zdAogICAgIGlmICghc3R5bGVTZWxlY3RvcikKICAgICAgICAgcmV0dXJuIGZhbHNlOwogCi0g ICAgUmVmUHRyPFJlbmRlclN0eWxlPiByb290U3R5bGUgPSBzdHlsZVNlbGVjdG9yLT5zdHlsZUZv ckVsZW1lbnQoZG9jdW1lbnRFbGVtZW50LCAwIC8qZGVmYXVsdFBhcmVudCovLCBmYWxzZSAvKmFs bG93U2hhcmluZyovLCB0cnVlIC8qcmVzb2x2ZUZvclJvb3REZWZhdWx0Ki8pOworICAgIFJlZlB0 cjxSZW5kZXJTdHlsZT4gcm9vdFN0eWxlID0gc3R5bGVTZWxlY3Rvci0+c3R5bGVGb3JFbGVtZW50 KGRvY3VtZW50RWxlbWVudCwgMCAvKmRlZmF1bHRQYXJlbnQqLywgRGlzYWxsb3dTdHlsZVNoYXJp bmcsIE1hdGNoT25seVVzZXJBZ2VudFJ1bGVzKTsKIAogICAgIFJlZlB0cjxNZWRpYVF1ZXJ5U2V0 PiBtZWRpYSA9IE1lZGlhUXVlcnlTZXQ6OmNyZWF0ZSgpOwogICAgIGlmICghbWVkaWEtPnBhcnNl KHF1ZXJ5KSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2RvbS9FbGVtZW50LmNwcCBiL1Nv dXJjZS9XZWJDb3JlL2RvbS9FbGVtZW50LmNwcAppbmRleCAzY2RiZGYxMTFhM2RiNDBhNTQ2YTc4 NTBlODZkYTA3ODAyNDEwZDM4Li5jYTJhN2UwMjUzOGVlZjA0N2ZiOGRmOTdkMTMxODI2NTViNzAz N2UzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9kb20vRWxlbWVudC5jcHAKKysrIGIvU291 cmNlL1dlYkNvcmUvZG9tL0VsZW1lbnQuY3BwCkBAIC0xMDM4LDcgKzEwMzgsNyBAQCBQYXNzUmVm UHRyPFJlbmRlclN0eWxlPiBFbGVtZW50OjpzdHlsZUZvclJlbmRlcmVyKCkKIHsKICAgICBpZiAo aGFzQ3VzdG9tU3R5bGVGb3JSZW5kZXJlcigpKQogICAgICAgICByZXR1cm4gY3VzdG9tU3R5bGVG b3JSZW5kZXJlcigpOwotICAgIHJldHVybiBkb2N1bWVudCgpLT5zdHlsZVNlbGVjdG9yKCktPnN0 eWxlRm9yRWxlbWVudChzdGF0aWNfY2FzdDxFbGVtZW50Kj4odGhpcyksIDAsIHRydWUvKmFsbG93 U2hhcmluZyovKTsKKyAgICByZXR1cm4gZG9jdW1lbnQoKS0+c3R5bGVTZWxlY3RvcigpLT5zdHls ZUZvckVsZW1lbnQoc3RhdGljX2Nhc3Q8RWxlbWVudCo+KHRoaXMpKTsKIH0KIAogdm9pZCBFbGVt ZW50OjpyZWNhbGNTdHlsZShTdHlsZUNoYW5nZSBjaGFuZ2UpCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyT2JqZWN0LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRl cmluZy9SZW5kZXJPYmplY3QuY3BwCmluZGV4IDJiYWI3MWFjYTBmYzY1YjNkYzE5MDE4ZjE1MjRj NGM5ZGE1YjMyMGIuLjBhNjhjNWZiYjRmYTQzNWY2ODU0Yzk0MzgxN2Y4ZWYyNmQyMTE4ZmQgMTAw NzU1Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJPYmplY3QuY3BwCisrKyBi L1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJPYmplY3QuY3BwCkBAIC0yNTQ1LDE5ICsy NTQ1LDIwIEBAIFBhc3NSZWZQdHI8UmVuZGVyU3R5bGU+IFJlbmRlck9iamVjdDo6Z2V0VW5jYWNo ZWRQc2V1ZG9TdHlsZShQc2V1ZG9JZCBwc2V1ZG8sIFJlCiAgICAgICAgIHBhcmVudFN0eWxlID0g c3R5bGUoKTsKICAgICB9CiAKKyAgICAvLy8gRklYTUU6IFRoaXMgImZpbmQgbmVhcmVzdCBlbGVt ZW50IHBhcmVudCIgc2hvdWxkIGJlIGEgaGVscGVyIGZ1bmN0aW9uLgogICAgIE5vZGUqIG4gPSBu b2RlKCk7CiAgICAgd2hpbGUgKG4gJiYgIW4tPmlzRWxlbWVudE5vZGUoKSkKICAgICAgICAgbiA9 IG4tPnBhcmVudE5vZGUoKTsKICAgICBpZiAoIW4pCiAgICAgICAgIHJldHVybiAwOworICAgIEVs ZW1lbnQqIGVsZW1lbnQgPSB0b0VsZW1lbnQobik7CiAKLSAgICBSZWZQdHI8UmVuZGVyU3R5bGU+ IHJlc3VsdDsKICAgICBpZiAocHNldWRvID09IEZJUlNUX0xJTkVfSU5IRVJJVEVEKSB7Ci0gICAg ICAgIHJlc3VsdCA9IGRvY3VtZW50KCktPnN0eWxlU2VsZWN0b3IoKS0+c3R5bGVGb3JFbGVtZW50 KHN0YXRpY19jYXN0PEVsZW1lbnQqPihuKSwgcGFyZW50U3R5bGUsIGZhbHNlKTsKKyAgICAgICAg UmVmUHRyPFJlbmRlclN0eWxlPiByZXN1bHQgPSBkb2N1bWVudCgpLT5zdHlsZVNlbGVjdG9yKCkt PnN0eWxlRm9yRWxlbWVudChlbGVtZW50LCBwYXJlbnRTdHlsZSwgRGlzYWxsb3dTdHlsZVNoYXJp bmcpOwogICAgICAgICByZXN1bHQtPnNldFN0eWxlVHlwZShGSVJTVF9MSU5FX0lOSEVSSVRFRCk7 Ci0gICAgfSBlbHNlCi0gICAgICAgIHJlc3VsdCA9IGRvY3VtZW50KCktPnN0eWxlU2VsZWN0b3Io KS0+cHNldWRvU3R5bGVGb3JFbGVtZW50KHBzZXVkbywgc3RhdGljX2Nhc3Q8RWxlbWVudCo+KG4p LCBwYXJlbnRTdHlsZSk7Ci0gICAgcmV0dXJuIHJlc3VsdC5yZWxlYXNlKCk7CisgICAgICAgIHJl dHVybiByZXN1bHQucmVsZWFzZSgpOworICAgIH0KKyAgICByZXR1cm4gZG9jdW1lbnQoKS0+c3R5 bGVTZWxlY3RvcigpLT5wc2V1ZG9TdHlsZUZvckVsZW1lbnQocHNldWRvLCBlbGVtZW50LCBwYXJl bnRTdHlsZSk7CiB9CiAKIHN0YXRpYyBDb2xvciBkZWNvcmF0aW9uQ29sb3IoUmVuZGVyT2JqZWN0 KiByZW5kZXJlcikKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJS ZWdpb24uY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclJlZ2lvbi5jcHAKaW5k ZXggZGU5OGZmODkxODg0NTQ0MTg2YTY4NzY0NTVkOTM3MzJmZWQwMTUyYi4uMTYxZTUwOWFiZTNl NjUxMTFlMDBhMTkwZWY3ZmU4YzJkYTdkZTZjNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv cmVuZGVyaW5nL1JlbmRlclJlZ2lvbi5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n L1JlbmRlclJlZ2lvbi5jcHAKQEAgLTMwMCw3ICszMDAsNyBAQCBQYXNzUmVmUHRyPFJlbmRlclN0 eWxlPiBSZW5kZXJSZWdpb246OmNvbXB1dGVTdHlsZUluUmVnaW9uKGNvbnN0IFJlbmRlckJveCog Ym94KQogICAgIEFTU0VSVChib3gtPm5vZGUoKSAmJiBib3gtPm5vZGUoKS0+aXNFbGVtZW50Tm9k ZSgpKTsKIAogICAgIEVsZW1lbnQqIGVsZW1lbnQgPSB0b0VsZW1lbnQoYm94LT5ub2RlKCkpOwot ICAgIFJlZlB0cjxSZW5kZXJTdHlsZT4gcmVuZGVyQm94UmVnaW9uU3R5bGUgPSBib3gtPnZpZXco KS0+ZG9jdW1lbnQoKS0+c3R5bGVTZWxlY3RvcigpLT5zdHlsZUZvckVsZW1lbnQoZWxlbWVudCwg MCwgZmFsc2UsIGZhbHNlLCB0aGlzKTsKKyAgICBSZWZQdHI8UmVuZGVyU3R5bGU+IHJlbmRlckJv eFJlZ2lvblN0eWxlID0gYm94LT52aWV3KCktPmRvY3VtZW50KCktPnN0eWxlU2VsZWN0b3IoKS0+ c3R5bGVGb3JFbGVtZW50KGVsZW1lbnQsIDAsIERpc2FsbG93U3R5bGVTaGFyaW5nLCBNYXRjaEFs bFJ1bGVzLCB0aGlzKTsKICAgICBtX3JlbmRlckJveFJlZ2lvblN0eWxlLmFkZChib3gsIHJlbmRl ckJveFJlZ2lvblN0eWxlKTsKIAogICAgIGlmICghYm94LT5oYXNCb3hEZWNvcmF0aW9ucygpKSB7 CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9zdmcvU1ZHRWxlbWVudC5jcHAgYi9Tb3VyY2Uv V2ViQ29yZS9zdmcvU1ZHRWxlbWVudC5jcHAKaW5kZXggZjA0ODZhOGEyNDgwZmExYzMyZTI4Zjhl ZmVlOTY5OGJjNjUwMzEyYi4uMTc1M2VjZTY2Yzk5OTI5ZjZkNmM3OTM2NzcwMjRkZTNhOWM3MjNl MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvc3ZnL1NWR0VsZW1lbnQuY3BwCisrKyBiL1Nv dXJjZS9XZWJDb3JlL3N2Zy9TVkdFbGVtZW50LmNwcApAQCAtNDc4LDcgKzQ3OCw3IEBAIHZvaWQg U1ZHRWxlbWVudDo6c3luY2hyb25pemVTeXN0ZW1MYW5ndWFnZSh2b2lkKiBjb250ZXh0RWxlbWVu dCkKIFBhc3NSZWZQdHI8UmVuZGVyU3R5bGU+IFNWR0VsZW1lbnQ6OmN1c3RvbVN0eWxlRm9yUmVu ZGVyZXIoKQogewogICAgIGlmICghY29ycmVzcG9uZGluZ0VsZW1lbnQoKSkKLSAgICAgICAgcmV0 dXJuIGRvY3VtZW50KCktPnN0eWxlU2VsZWN0b3IoKS0+c3R5bGVGb3JFbGVtZW50KHN0YXRpY19j YXN0PEVsZW1lbnQqPih0aGlzKSwgMCwgdHJ1ZSk7CisgICAgICAgIHJldHVybiBkb2N1bWVudCgp LT5zdHlsZVNlbGVjdG9yKCktPnN0eWxlRm9yRWxlbWVudCh0aGlzKTsKIAogICAgIFJlbmRlclN0 eWxlKiBzdHlsZSA9IDA7CiAgICAgaWYgKEVsZW1lbnQqIHBhcmVudCA9IHBhcmVudE9ySG9zdEVs ZW1lbnQoKSkgewpAQCAtNDg2LDcgKzQ4Niw3IEBAIFBhc3NSZWZQdHI8UmVuZGVyU3R5bGU+IFNW R0VsZW1lbnQ6OmN1c3RvbVN0eWxlRm9yUmVuZGVyZXIoKQogICAgICAgICAgICAgc3R5bGUgPSBy ZW5kZXJlci0+c3R5bGUoKTsKICAgICB9CiAKLSAgICByZXR1cm4gZG9jdW1lbnQoKS0+c3R5bGVT ZWxlY3RvcigpLT5zdHlsZUZvckVsZW1lbnQoY29ycmVzcG9uZGluZ0VsZW1lbnQoKSwgc3R5bGUs IGZhbHNlIC8qYWxsb3dTaGFyaW5nKi8pOworICAgIHJldHVybiBkb2N1bWVudCgpLT5zdHlsZVNl bGVjdG9yKCktPnN0eWxlRm9yRWxlbWVudChjb3JyZXNwb25kaW5nRWxlbWVudCgpLCBzdHlsZSwg RGlzYWxsb3dTdHlsZVNoYXJpbmcpOwogfQogCiBTdHlsZVByb3BlcnR5U2V0KiBTVkdFbGVtZW50 OjphbmltYXRlZFNNSUxTdHlsZVByb3BlcnRpZXMoKSBjb25zdAo= 134916 2012-03-30 17:05:25 -0700 2012-03-30 18:55:20 -0700 Patch for landing bug-82807-20120330170524.patch text/plain 12752 eric U3VidmVyc2lvbiBSZXZpc2lvbjogMTEyNzM3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOWRmNmNhZTc4MjUyNDY3 NzE2ZGNkODU5OWRlNGI5ZmY4M2U5NWVlMC4uZDhjNWM1YmJjMzlmZmFkYjA4OTgxYTRhYzgxNzlk YTAyMzM3MThmMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw5ICsxLDQ5IEBACiAyMDEyLTAzLTMwICBFcmlj IFNlaWRlbCAgPGVyaWNAd2Via2l0Lm9yZz4KIAorICAgICAgICBzdHlsZUZvckVsZW1lbnQoKSBz aG91bGQgdXNlIGVudW1zIGluc3RlYWQgb2YgYm9vbHMgc28gd2UgY2FuIGFsbCB1bmRlcnN0YW5k IHdoYXQgaXQncyBkb2luZworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9ODI4MDcKKworICAgICAgICBSZXZpZXdlZCBieSBBZGFtIEJhcnRoLgorCisgICAg ICAgIE5vIGNoYW5nZSBpbiBiZWhhdmlvciwgdGh1cyBubyB0ZXN0cy4KKworICAgICAgICBNb3N0 bHkgdGhpcyBpcyBqdXN0IHJlcGxhY2luZyB0cnVlL2ZhbHNlIHdpdGggdGhlIGNvcnJlY3QgbmV3 IGVudW0gdmFsdWUKKyAgICAgICAgb3IgcmVtb3ZpbmcgdHJ1ZS9mYWxzZSBmcm9tIHRoZSBjYWxs c2l0ZXMgd2hlbiB0aGV5IHdvdWxkIGhhdmUgYmVlbiBkZWZhdWx0IGFueXdheS4KKyAgICAgICAg SSB0aGluayB0aGlzIG1ha2VzIHRoZSBjb2RlICp3YXkqIG1vcmUgY2xlYXIuCisKKyAgICAgICAg VGhlIG9sZCBjb2RlIHdhcyBleHRyYSBjb25mdXNpbmcgYmVjYXVzZSB0aGUgZGVmYXVsdHMgd2Vy ZSAidHJ1ZSwgZmFsc2UiLiA6KQorICAgICAgICBUaGUgbmV3IGRlZmF1bHRzIGFyZSBBbGxvd1N0 eWxlU2hhcmluZywgTWF0Y2hBbGxSdWxlcy4KKyAgICAgICAgSXQncyB2ZXJ5IHVuY29tbW9uIGZv ciBjYWxsZXJzIHRvIHdhbnQgdG8gb3ZlcnJpZGUgZWl0aGVyIG9mIHRoZXNlIGJlaGF2aW9ycy4K KyAgICAgICAgSSB0aGluayBtb3N0IGNhbGxlcnMgd2hpY2ggc3BlY2lmeSBEaXNhbGxvd1N0eWxl U2hhcmluZyBsaWtlbHkgZG9uJ3QgYWN0dWFsbHkgbmVlZCB0bworICAgICAgICAob3VyIHN0eWxl LXNoYXJpbmcgY29kZSBzaG91bGQgYmUgc21hcnQgZW5vdWdoIHRvIG9ubHkgc2hhcmUgd2hlbiBz YWZlIGFueXdheSkuCisKKyAgICAgICAgKiBjc3MvQ1NTU3R5bGVTZWxlY3Rvci5jcHA6CisgICAg ICAgIChXZWJDb3JlOjpDU1NTdHlsZVNlbGVjdG9yOjpDU1NTdHlsZVNlbGVjdG9yKToKKyAgICAg ICAgIC0gVXNlIGVudW1zIGFuZCByZW1vdmUgYm9ndXMgY29tbWVudCAobV9yb290RGVmYXVsdFN0 eWxlIGlzIGEgUmVmUHRyISkKKyAgICAgICAgKFdlYkNvcmU6OkNTU1N0eWxlU2VsZWN0b3I6OmNv bGxlY3RNYXRjaGluZ1J1bGVzRm9yTGlzdCk6CisgICAgICAgICogY3NzL0NTU1N0eWxlU2VsZWN0 b3IuaDoKKyAgICAgICAgKENTU1N0eWxlU2VsZWN0b3IpOgorICAgICAgICAqIGNzcy9NZWRpYVF1 ZXJ5TWF0Y2hlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpNZWRpYVF1ZXJ5TWF0Y2hlcjo6cHJl cGFyZUV2YWx1YXRvcik6CisgICAgICAgICogY3NzL1N0eWxlTWVkaWEuY3BwOgorICAgICAgICAo V2ViQ29yZTo6U3R5bGVNZWRpYTo6bWF0Y2hNZWRpdW0pOgorICAgICAgICAqIGRvbS9FbGVtZW50 LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkVsZW1lbnQ6OnN0eWxlRm9yUmVuZGVyZXIpOgorICAg ICAgICAqIHJlbmRlcmluZy9SZW5kZXJPYmplY3QuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVu ZGVyT2JqZWN0OjpnZXRVbmNhY2hlZFBzZXVkb1N0eWxlKToKKyAgICAgICAgIC0gVXBkYXRlZCB0 byB1c2UgZW51bXMKKyAgICAgICAgIC0gQWxzbyBmaXhlZCB0aGlzIHRvIHVzZSB0b0VsZW1lbnQg YW5kIG1vZGVybiBlYXJseS1yZXR1cm4gc3R5bGVzLgorICAgICAgICAqIHJlbmRlcmluZy9SZW5k ZXJSZWdpb24uY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyUmVnaW9uOjpjb21wdXRlU3R5 bGVJblJlZ2lvbik6CisgICAgICAgICogc3ZnL1NWR0VsZW1lbnQuY3BwOgorICAgICAgICAoV2Vi Q29yZTo6U1ZHRWxlbWVudDo6Y3VzdG9tU3R5bGVGb3JSZW5kZXJlcik6CisKKzIwMTItMDMtMzAg IEVyaWMgU2VpZGVsICA8ZXJpY0B3ZWJraXQub3JnPgorCiAgICAgICAgIEFkZCB0ZXN0cyBmb3Ig aWZyYW1lIHNlYW1sZXNzIGFuZCBzdXBwb3J0IGZvciBwYXJzaW5nIHdlYmtpdHNlYW1sZXNzIGF0 dHJpYnV0ZQogICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 ODI3OTUKIAotICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKyAgICAgICAgUmV2 aWV3ZWQgYnkgQWRhbSBCYXJ0aC4KIAogICAgICAgICBUaGlzIGp1c3QgYWRkcyBzdXBwb3J0IGZv ciBwYXJzaW5nL3JlZmxlY3RpbmcgdGhlICJ3ZWJraXRzZWFtZXNzIiBhdHRyaWJ1dGUuCiAgICAg ICAgIEknbGwgYWRkIHRoZSBhY3R1YWwgQ1NTLCBuYXZpZ2F0aW9uLCBzZWN1cml0eSwgYW5kIGxh eW91dCBjaGFuZ2VzIGluCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTU3R5bGVT ZWxlY3Rvci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTU3R5bGVTZWxlY3Rvci5jcHAKaW5k ZXggMWNmY2VlMjBjZDQ3ZTU1ZjZhZTA0MzEwMzUxZmNlZjQ5MTY1NjhmYS4uZGJiM2M2MzI3ODRl NGQ0YzZlZTI0Zjk0YWY0NWU2MDg1OTUyYTY4NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv Y3NzL0NTU1N0eWxlU2VsZWN0b3IuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NTdHls ZVNlbGVjdG9yLmNwcApAQCAtMzc1LDcgKzM3NSw3IEBAIENTU1N0eWxlU2VsZWN0b3I6OkNTU1N0 eWxlU2VsZWN0b3IoRG9jdW1lbnQqIGRvY3VtZW50LCBib29sIG1hdGNoQXV0aG9yQW5kVXNlclN0 CiAgICAgICAgIG1fbWVkaXVtID0gYWRvcHRQdHIobmV3IE1lZGlhUXVlcnlFdmFsdWF0b3IoImFs bCIpKTsKIAogICAgIGlmIChyb290KQotICAgICAgICBtX3Jvb3REZWZhdWx0U3R5bGUgPSBzdHls ZUZvckVsZW1lbnQocm9vdCwgMCwgZmFsc2UsIHRydWUpOyAvLyBkb24ndCByZWYsIGJlY2F1c2Ug dGhlIFJlbmRlclN0eWxlIGlzIGFsbG9jYXRlZCBmcm9tIGdsb2JhbCBoZWFwCisgICAgICAgIG1f cm9vdERlZmF1bHRTdHlsZSA9IHN0eWxlRm9yRWxlbWVudChyb290LCAwLCBEaXNhbGxvd1N0eWxl U2hhcmluZywgTWF0Y2hPbmx5VXNlckFnZW50UnVsZXMpOwogCiAgICAgaWYgKG1fcm9vdERlZmF1 bHRTdHlsZSAmJiB2aWV3KQogICAgICAgICBtX21lZGl1bSA9IGFkb3B0UHRyKG5ldyBNZWRpYVF1 ZXJ5RXZhbHVhdG9yKHZpZXctPm1lZGlhVHlwZSgpLCB2aWV3LT5mcmFtZSgpLCBtX3Jvb3REZWZh dWx0U3R5bGUuZ2V0KCkpKTsKQEAgLTE1NjcsMTQgKzE1NjcsMTIgQEAgc3RhdGljIGlubGluZSBi b29sIGlzQXRTaGFkb3dCb3VuZGFyeShFbGVtZW50KiBlbGVtZW50KQogICAgIHJldHVybiBwYXJl bnROb2RlICYmIHBhcmVudE5vZGUtPmlzU2hhZG93Um9vdCgpOwogfQogCi0vLyBJZiByZXNvbHZl Rm9yUm9vdERlZmF1bHQgaXMgdHJ1ZSwgc3R5bGUgYmFzZWQgb24gdXNlciBhZ2VudCBzdHlsZSBz aGVldCBvbmx5LiBUaGlzIGlzIHVzZWQgaW4gbWVkaWEgcXVlcmllcywgd2hlcmUKLS8vIHJlbGF0 aXZlIHVuaXRzIGFyZSBpbnRlcnByZXRlZCBhY2NvcmRpbmcgdG8gZG9jdW1lbnQgcm9vdCBlbGVt ZW50IHN0eWxlLCBzdHlsZWQgb25seSB3aXRoIFVBIHN0eWxlc2hlZXQKLQotUGFzc1JlZlB0cjxS ZW5kZXJTdHlsZT4gQ1NTU3R5bGVTZWxlY3Rvcjo6c3R5bGVGb3JFbGVtZW50KEVsZW1lbnQqIGVs ZW1lbnQsIFJlbmRlclN0eWxlKiBkZWZhdWx0UGFyZW50LCBib29sIGFsbG93U2hhcmluZywgYm9v bCByZXNvbHZlRm9yUm9vdERlZmF1bHQsIFJlbmRlclJlZ2lvbiogcmVnaW9uRm9yU3R5bGluZykK K1Bhc3NSZWZQdHI8UmVuZGVyU3R5bGU+IENTU1N0eWxlU2VsZWN0b3I6OnN0eWxlRm9yRWxlbWVu dChFbGVtZW50KiBlbGVtZW50LCBSZW5kZXJTdHlsZSogZGVmYXVsdFBhcmVudCwKKyAgICBTdHls ZVNoYXJpbmdCZWhhdmlvciBzaGFyaW5nQmVoYXZpb3IsIFJ1bGVNYXRjaGluZ0JlaGF2aW9yIG1h dGNoaW5nQmVoYXZpb3IsIFJlbmRlclJlZ2lvbiogcmVnaW9uRm9yU3R5bGluZykKIHsKICAgICAv LyBPbmNlIGFuIGVsZW1lbnQgaGFzIGEgcmVuZGVyZXIsIHdlIGRvbid0IHRyeSB0byBkZXN0cm95 IGl0LCBzaW5jZSBvdGhlcndpc2UgdGhlIHJlbmRlcmVyCiAgICAgLy8gd2lsbCB2YW5pc2ggaWYg YSBzdHlsZSByZWNhbGMgaGFwcGVucyBkdXJpbmcgbG9hZGluZy4KLSAgICBpZiAoYWxsb3dTaGFy aW5nICYmICFlbGVtZW50LT5kb2N1bWVudCgpLT5oYXZlU3R5bGVzaGVldHNMb2FkZWQoKSAmJiAh ZWxlbWVudC0+cmVuZGVyZXIoKSkgeworICAgIGlmIChzaGFyaW5nQmVoYXZpb3IgPT0gQWxsb3dT dHlsZVNoYXJpbmcgJiYgIWVsZW1lbnQtPmRvY3VtZW50KCktPmhhdmVTdHlsZXNoZWV0c0xvYWRl ZCgpICYmICFlbGVtZW50LT5yZW5kZXJlcigpKSB7CiAgICAgICAgIGlmICghc19zdHlsZU5vdFll dEF2YWlsYWJsZSkgewogICAgICAgICAgICAgc19zdHlsZU5vdFlldEF2YWlsYWJsZSA9IFJlbmRl clN0eWxlOjpjcmVhdGUoKS5sZWFrUmVmKCk7CiAgICAgICAgICAgICBzX3N0eWxlTm90WWV0QXZh aWxhYmxlLT5zZXREaXNwbGF5KE5PTkUpOwpAQCAtMTU4Nyw3ICsxNTg1LDcgQEAgUGFzc1JlZlB0 cjxSZW5kZXJTdHlsZT4gQ1NTU3R5bGVTZWxlY3Rvcjo6c3R5bGVGb3JFbGVtZW50KEVsZW1lbnQq IGVsZW1lbnQsIFJlbmQKICAgICBpbml0RWxlbWVudChlbGVtZW50KTsKICAgICBpbml0Rm9yU3R5 bGVSZXNvbHZlKGVsZW1lbnQsIGRlZmF1bHRQYXJlbnQpOwogICAgIG1fcmVnaW9uRm9yU3R5bGlu ZyA9IHJlZ2lvbkZvclN0eWxpbmc7Ci0gICAgaWYgKGFsbG93U2hhcmluZykgeworICAgIGlmIChz aGFyaW5nQmVoYXZpb3IgPT0gQWxsb3dTdHlsZVNoYXJpbmcpIHsKICAgICAgICAgUmVuZGVyU3R5 bGUqIHNoYXJlZFN0eWxlID0gbG9jYXRlU2hhcmVkU3R5bGUoKTsKICAgICAgICAgaWYgKHNoYXJl ZFN0eWxlKQogICAgICAgICAgICAgcmV0dXJuIHNoYXJlZFN0eWxlOwpAQCAtMTYxNSw3ICsxNjEz LDcgQEAgUGFzc1JlZlB0cjxSZW5kZXJTdHlsZT4gQ1NTU3R5bGVTZWxlY3Rvcjo6c3R5bGVGb3JF bGVtZW50KEVsZW1lbnQqIGVsZW1lbnQsIFJlbmQKICAgICBlbnN1cmVEZWZhdWx0U3R5bGVTaGVl dHNGb3JFbGVtZW50KGVsZW1lbnQpOwogCiAgICAgTWF0Y2hSZXN1bHQgbWF0Y2hSZXN1bHQ7Ci0g ICAgaWYgKHJlc29sdmVGb3JSb290RGVmYXVsdCkKKyAgICBpZiAobWF0Y2hpbmdCZWhhdmlvciA9 PSBNYXRjaE9ubHlVc2VyQWdlbnRSdWxlcykKICAgICAgICAgbWF0Y2hVQVJ1bGVzKG1hdGNoUmVz dWx0KTsKICAgICBlbHNlCiAgICAgICAgIG1hdGNoQWxsUnVsZXMobWF0Y2hSZXN1bHQpOwpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvY3NzL0NTU1N0eWxlU2VsZWN0b3IuaCBiL1NvdXJjZS9X ZWJDb3JlL2Nzcy9DU1NTdHlsZVNlbGVjdG9yLmgKaW5kZXggMWRiOTA0MDQzZWFjYTIxMzg2Zjgy ODlkNzkyMjk1MTFjZTY0OWU1OS4uNTgxODM2NzRhOTIyYjJmNjFjMzM3OWE3N2ZjZDJjMGQxYjAw MDQ4NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvY3NzL0NTU1N0eWxlU2VsZWN0b3IuaAor KysgYi9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTU3R5bGVTZWxlY3Rvci5oCkBAIC0xMDAsNiArMTAw LDIwIEBAIHB1YmxpYzoKICAgICBib29sIG1fcmVzdWx0OwogfTsKIAorZW51bSBTdHlsZVNoYXJp bmdCZWhhdmlvciB7CisgICAgQWxsb3dTdHlsZVNoYXJpbmcsCisgICAgRGlzYWxsb3dTdHlsZVNo YXJpbmcsCit9OworCisvLyBNYXRjaE9ubHlVc2VyQWdlbnRSdWxlcyBpcyB1c2VkIGluIG1lZGlh IHF1ZXJpZXMsIHdoZXJlIHJlbGF0aXZlIHVuaXRzCisvLyBhcmUgaW50ZXJwcmV0ZWQgYWNjb3Jk aW5nIHRvIHRoZSBkb2N1bWVudCByb290IGVsZW1lbnQgc3R5bGUsIGFuZCBzdHlsZWQgb25seQor Ly8gZnJvbSB0aGUgVXNlciBBZ2VudCBTdHlsZXNoZWV0IHJ1bGVzLgorCitlbnVtIFJ1bGVNYXRj aGluZ0JlaGF2aW9yIHsKKyAgICBNYXRjaEFsbFJ1bGVzLAorICAgIE1hdGNoT25seVVzZXJBZ2Vu dFJ1bGVzLAorfTsKKwogLy8gVGhpcyBjbGFzcyBzZWxlY3RzIGEgUmVuZGVyU3R5bGUgZm9yIGEg Z2l2ZW4gZWxlbWVudCBiYXNlZCBvbiBhIGNvbGxlY3Rpb24gb2Ygc3R5bGVzaGVldHMuCiBjbGFz cyBDU1NTdHlsZVNlbGVjdG9yIHsKICAgICBXVEZfTUFLRV9OT05DT1BZQUJMRShDU1NTdHlsZVNl bGVjdG9yKTsgV1RGX01BS0VfRkFTVF9BTExPQ0FURUQ7CkBAIC0xMTMsNyArMTI3LDggQEAgcHVi bGljOgogICAgIHZvaWQgcHVzaFBhcmVudFNoYWRvd1Jvb3QoY29uc3QgU2hhZG93Um9vdCopOwog ICAgIHZvaWQgcG9wUGFyZW50U2hhZG93Um9vdChjb25zdCBTaGFkb3dSb290Kik7CiAKLSAgICBQ YXNzUmVmUHRyPFJlbmRlclN0eWxlPiBzdHlsZUZvckVsZW1lbnQoRWxlbWVudCosIFJlbmRlclN0 eWxlKiBwYXJlbnRTdHlsZSA9IDAsIGJvb2wgYWxsb3dTaGFyaW5nID0gdHJ1ZSwgYm9vbCByZXNv bHZlRm9yUm9vdERlZmF1bHQgPSBmYWxzZSwgUmVuZGVyUmVnaW9uKiByZWdpb25Gb3JTdHlsaW5n ID0gMCk7CisgICAgUGFzc1JlZlB0cjxSZW5kZXJTdHlsZT4gc3R5bGVGb3JFbGVtZW50KEVsZW1l bnQqLCBSZW5kZXJTdHlsZSogcGFyZW50U3R5bGUgPSAwLCBTdHlsZVNoYXJpbmdCZWhhdmlvciA9 IEFsbG93U3R5bGVTaGFyaW5nLAorICAgICAgICBSdWxlTWF0Y2hpbmdCZWhhdmlvciA9IE1hdGNo QWxsUnVsZXMsIFJlbmRlclJlZ2lvbiogcmVnaW9uRm9yU3R5bGluZyA9IDApOwogCiAgICAgdm9p ZCBrZXlmcmFtZVN0eWxlc0ZvckFuaW1hdGlvbihFbGVtZW50KiwgY29uc3QgUmVuZGVyU3R5bGUq LCBLZXlmcmFtZUxpc3QmKTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvY3NzL01lZGlh UXVlcnlNYXRjaGVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9NZWRpYVF1ZXJ5TWF0Y2hlci5j cHAKaW5kZXggZjdiMjNiN2E5ZWQzMTAxNGVjMjAzNmViZTViMzdhYjc0NWQyOTgxMi4uMzYzYmEy MWJkMWVkYzIyZjc3N2JhYTYwMDA4ZTBiODBkZWU0ZTcxNiAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvY3NzL01lZGlhUXVlcnlNYXRjaGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9jc3Mv TWVkaWFRdWVyeU1hdGNoZXIuY3BwCkBAIC04OCw3ICs4OCw3IEBAIFBhc3NPd25QdHI8TWVkaWFR dWVyeUV2YWx1YXRvcj4gTWVkaWFRdWVyeU1hdGNoZXI6OnByZXBhcmVFdmFsdWF0b3IoKSBjb25z dAogICAgIGlmICghc3R5bGVTZWxlY3RvcikKICAgICAgICAgcmV0dXJuIG51bGxwdHI7CiAKLSAg ICBSZWZQdHI8UmVuZGVyU3R5bGU+IHJvb3RTdHlsZSA9IHN0eWxlU2VsZWN0b3ItPnN0eWxlRm9y RWxlbWVudChkb2N1bWVudEVsZW1lbnQsIDAgLypkZWZhdWx0UGFyZW50Ki8sIGZhbHNlIC8qYWxs b3dTaGFyaW5nKi8sIHRydWUgLypyZXNvbHZlRm9yUm9vdERlZmF1bHQqLyk7CisgICAgUmVmUHRy PFJlbmRlclN0eWxlPiByb290U3R5bGUgPSBzdHlsZVNlbGVjdG9yLT5zdHlsZUZvckVsZW1lbnQo ZG9jdW1lbnRFbGVtZW50LCAwIC8qZGVmYXVsdFBhcmVudCovLCBEaXNhbGxvd1N0eWxlU2hhcmlu ZywgTWF0Y2hPbmx5VXNlckFnZW50UnVsZXMpOwogCiAgICAgcmV0dXJuIGFkb3B0UHRyKG5ldyBN ZWRpYVF1ZXJ5RXZhbHVhdG9yKG1lZGlhVHlwZSgpLCBtX2RvY3VtZW50LT5mcmFtZSgpLCByb290 U3R5bGUuZ2V0KCkpKTsKIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9TdHlsZU1l ZGlhLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9TdHlsZU1lZGlhLmNwcAppbmRleCA0NjFiOWNk MmM1NjQ5ZmMxYTcyMzE5YmVjYzFlNDkwNDgyOTdhOTEyLi5iYTI2NjRkZDFjZDQxMzU5ZWEyZTNm MjkxNTIxYzMxZGMxYzE5MTJiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9jc3MvU3R5bGVN ZWRpYS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvY3NzL1N0eWxlTWVkaWEuY3BwCkBAIC02NCw3 ICs2NCw3IEBAIGJvb2wgU3R5bGVNZWRpYTo6bWF0Y2hNZWRpdW0oY29uc3QgU3RyaW5nJiBxdWVy eSkgY29uc3QKICAgICBpZiAoIXN0eWxlU2VsZWN0b3IpCiAgICAgICAgIHJldHVybiBmYWxzZTsK IAotICAgIFJlZlB0cjxSZW5kZXJTdHlsZT4gcm9vdFN0eWxlID0gc3R5bGVTZWxlY3Rvci0+c3R5 bGVGb3JFbGVtZW50KGRvY3VtZW50RWxlbWVudCwgMCAvKmRlZmF1bHRQYXJlbnQqLywgZmFsc2Ug LyphbGxvd1NoYXJpbmcqLywgdHJ1ZSAvKnJlc29sdmVGb3JSb290RGVmYXVsdCovKTsKKyAgICBS ZWZQdHI8UmVuZGVyU3R5bGU+IHJvb3RTdHlsZSA9IHN0eWxlU2VsZWN0b3ItPnN0eWxlRm9yRWxl bWVudChkb2N1bWVudEVsZW1lbnQsIDAgLypkZWZhdWx0UGFyZW50Ki8sIERpc2FsbG93U3R5bGVT aGFyaW5nLCBNYXRjaE9ubHlVc2VyQWdlbnRSdWxlcyk7CiAKICAgICBSZWZQdHI8TWVkaWFRdWVy eVNldD4gbWVkaWEgPSBNZWRpYVF1ZXJ5U2V0OjpjcmVhdGUoKTsKICAgICBpZiAoIW1lZGlhLT5w YXJzZShxdWVyeSkpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9kb20vRWxlbWVudC5jcHAg Yi9Tb3VyY2UvV2ViQ29yZS9kb20vRWxlbWVudC5jcHAKaW5kZXggM2NkYmRmMTExYTNkYjQwYTU0 NmE3ODUwZTg2ZGEwNzgwMjQxMGQzOC4uY2EyYTdlMDI1MzhlZWYwNDdmYjhkZjk3ZDEzMTgyNjU1 YjcwMzdlMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvZG9tL0VsZW1lbnQuY3BwCisrKyBi L1NvdXJjZS9XZWJDb3JlL2RvbS9FbGVtZW50LmNwcApAQCAtMTAzOCw3ICsxMDM4LDcgQEAgUGFz c1JlZlB0cjxSZW5kZXJTdHlsZT4gRWxlbWVudDo6c3R5bGVGb3JSZW5kZXJlcigpCiB7CiAgICAg aWYgKGhhc0N1c3RvbVN0eWxlRm9yUmVuZGVyZXIoKSkKICAgICAgICAgcmV0dXJuIGN1c3RvbVN0 eWxlRm9yUmVuZGVyZXIoKTsKLSAgICByZXR1cm4gZG9jdW1lbnQoKS0+c3R5bGVTZWxlY3Rvcigp LT5zdHlsZUZvckVsZW1lbnQoc3RhdGljX2Nhc3Q8RWxlbWVudCo+KHRoaXMpLCAwLCB0cnVlLyph bGxvd1NoYXJpbmcqLyk7CisgICAgcmV0dXJuIGRvY3VtZW50KCktPnN0eWxlU2VsZWN0b3IoKS0+ c3R5bGVGb3JFbGVtZW50KHN0YXRpY19jYXN0PEVsZW1lbnQqPih0aGlzKSk7CiB9CiAKIHZvaWQg RWxlbWVudDo6cmVjYWxjU3R5bGUoU3R5bGVDaGFuZ2UgY2hhbmdlKQpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlck9iamVjdC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9y ZW5kZXJpbmcvUmVuZGVyT2JqZWN0LmNwcAppbmRleCAyYmFiNzFhY2EwZmM2NWIzZGMxOTAxOGYx NTI0YzRjOWRhNWIzMjBiLi40MjBhMjNmMGEzNWUwNGYxNTgzMjAyMjliNzM5MjE4M2Y1NTUyNzE4 IDEwMDc1NQotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyT2JqZWN0LmNwcAor KysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyT2JqZWN0LmNwcApAQCAtMjU0NSwx OSArMjU0NSwyMCBAQCBQYXNzUmVmUHRyPFJlbmRlclN0eWxlPiBSZW5kZXJPYmplY3Q6OmdldFVu Y2FjaGVkUHNldWRvU3R5bGUoUHNldWRvSWQgcHNldWRvLCBSZQogICAgICAgICBwYXJlbnRTdHls ZSA9IHN0eWxlKCk7CiAgICAgfQogCisgICAgLy8gRklYTUU6IFRoaXMgImZpbmQgbmVhcmVzdCBl bGVtZW50IHBhcmVudCIgc2hvdWxkIGJlIGEgaGVscGVyIGZ1bmN0aW9uLgogICAgIE5vZGUqIG4g PSBub2RlKCk7CiAgICAgd2hpbGUgKG4gJiYgIW4tPmlzRWxlbWVudE5vZGUoKSkKICAgICAgICAg biA9IG4tPnBhcmVudE5vZGUoKTsKICAgICBpZiAoIW4pCiAgICAgICAgIHJldHVybiAwOworICAg IEVsZW1lbnQqIGVsZW1lbnQgPSB0b0VsZW1lbnQobik7CiAKLSAgICBSZWZQdHI8UmVuZGVyU3R5 bGU+IHJlc3VsdDsKICAgICBpZiAocHNldWRvID09IEZJUlNUX0xJTkVfSU5IRVJJVEVEKSB7Ci0g ICAgICAgIHJlc3VsdCA9IGRvY3VtZW50KCktPnN0eWxlU2VsZWN0b3IoKS0+c3R5bGVGb3JFbGVt ZW50KHN0YXRpY19jYXN0PEVsZW1lbnQqPihuKSwgcGFyZW50U3R5bGUsIGZhbHNlKTsKKyAgICAg ICAgUmVmUHRyPFJlbmRlclN0eWxlPiByZXN1bHQgPSBkb2N1bWVudCgpLT5zdHlsZVNlbGVjdG9y KCktPnN0eWxlRm9yRWxlbWVudChlbGVtZW50LCBwYXJlbnRTdHlsZSwgRGlzYWxsb3dTdHlsZVNo YXJpbmcpOwogICAgICAgICByZXN1bHQtPnNldFN0eWxlVHlwZShGSVJTVF9MSU5FX0lOSEVSSVRF RCk7Ci0gICAgfSBlbHNlCi0gICAgICAgIHJlc3VsdCA9IGRvY3VtZW50KCktPnN0eWxlU2VsZWN0 b3IoKS0+cHNldWRvU3R5bGVGb3JFbGVtZW50KHBzZXVkbywgc3RhdGljX2Nhc3Q8RWxlbWVudCo+ KG4pLCBwYXJlbnRTdHlsZSk7Ci0gICAgcmV0dXJuIHJlc3VsdC5yZWxlYXNlKCk7CisgICAgICAg IHJldHVybiByZXN1bHQucmVsZWFzZSgpOworICAgIH0KKyAgICByZXR1cm4gZG9jdW1lbnQoKS0+ c3R5bGVTZWxlY3RvcigpLT5wc2V1ZG9TdHlsZUZvckVsZW1lbnQocHNldWRvLCBlbGVtZW50LCBw YXJlbnRTdHlsZSk7CiB9CiAKIHN0YXRpYyBDb2xvciBkZWNvcmF0aW9uQ29sb3IoUmVuZGVyT2Jq ZWN0KiByZW5kZXJlcikKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5k ZXJSZWdpb24uY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclJlZ2lvbi5jcHAK aW5kZXggZGU5OGZmODkxODg0NTQ0MTg2YTY4NzY0NTVkOTM3MzJmZWQwMTUyYi4uMTYxZTUwOWFi ZTNlNjUxMTFlMDBhMTkwZWY3ZmU4YzJkYTdkZTZjNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvcmVuZGVyaW5nL1JlbmRlclJlZ2lvbi5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVy aW5nL1JlbmRlclJlZ2lvbi5jcHAKQEAgLTMwMCw3ICszMDAsNyBAQCBQYXNzUmVmUHRyPFJlbmRl clN0eWxlPiBSZW5kZXJSZWdpb246OmNvbXB1dGVTdHlsZUluUmVnaW9uKGNvbnN0IFJlbmRlckJv eCogYm94KQogICAgIEFTU0VSVChib3gtPm5vZGUoKSAmJiBib3gtPm5vZGUoKS0+aXNFbGVtZW50 Tm9kZSgpKTsKIAogICAgIEVsZW1lbnQqIGVsZW1lbnQgPSB0b0VsZW1lbnQoYm94LT5ub2RlKCkp OwotICAgIFJlZlB0cjxSZW5kZXJTdHlsZT4gcmVuZGVyQm94UmVnaW9uU3R5bGUgPSBib3gtPnZp ZXcoKS0+ZG9jdW1lbnQoKS0+c3R5bGVTZWxlY3RvcigpLT5zdHlsZUZvckVsZW1lbnQoZWxlbWVu dCwgMCwgZmFsc2UsIGZhbHNlLCB0aGlzKTsKKyAgICBSZWZQdHI8UmVuZGVyU3R5bGU+IHJlbmRl ckJveFJlZ2lvblN0eWxlID0gYm94LT52aWV3KCktPmRvY3VtZW50KCktPnN0eWxlU2VsZWN0b3Io KS0+c3R5bGVGb3JFbGVtZW50KGVsZW1lbnQsIDAsIERpc2FsbG93U3R5bGVTaGFyaW5nLCBNYXRj aEFsbFJ1bGVzLCB0aGlzKTsKICAgICBtX3JlbmRlckJveFJlZ2lvblN0eWxlLmFkZChib3gsIHJl bmRlckJveFJlZ2lvblN0eWxlKTsKIAogICAgIGlmICghYm94LT5oYXNCb3hEZWNvcmF0aW9ucygp KSB7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9zdmcvU1ZHRWxlbWVudC5jcHAgYi9Tb3Vy Y2UvV2ViQ29yZS9zdmcvU1ZHRWxlbWVudC5jcHAKaW5kZXggZjA0ODZhOGEyNDgwZmExYzMyZTI4 ZjhlZmVlOTY5OGJjNjUwMzEyYi4uMTc1M2VjZTY2Yzk5OTI5ZjZkNmM3OTM2NzcwMjRkZTNhOWM3 MjNlMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvc3ZnL1NWR0VsZW1lbnQuY3BwCisrKyBi L1NvdXJjZS9XZWJDb3JlL3N2Zy9TVkdFbGVtZW50LmNwcApAQCAtNDc4LDcgKzQ3OCw3IEBAIHZv aWQgU1ZHRWxlbWVudDo6c3luY2hyb25pemVTeXN0ZW1MYW5ndWFnZSh2b2lkKiBjb250ZXh0RWxl bWVudCkKIFBhc3NSZWZQdHI8UmVuZGVyU3R5bGU+IFNWR0VsZW1lbnQ6OmN1c3RvbVN0eWxlRm9y UmVuZGVyZXIoKQogewogICAgIGlmICghY29ycmVzcG9uZGluZ0VsZW1lbnQoKSkKLSAgICAgICAg cmV0dXJuIGRvY3VtZW50KCktPnN0eWxlU2VsZWN0b3IoKS0+c3R5bGVGb3JFbGVtZW50KHN0YXRp Y19jYXN0PEVsZW1lbnQqPih0aGlzKSwgMCwgdHJ1ZSk7CisgICAgICAgIHJldHVybiBkb2N1bWVu dCgpLT5zdHlsZVNlbGVjdG9yKCktPnN0eWxlRm9yRWxlbWVudCh0aGlzKTsKIAogICAgIFJlbmRl clN0eWxlKiBzdHlsZSA9IDA7CiAgICAgaWYgKEVsZW1lbnQqIHBhcmVudCA9IHBhcmVudE9ySG9z dEVsZW1lbnQoKSkgewpAQCAtNDg2LDcgKzQ4Niw3IEBAIFBhc3NSZWZQdHI8UmVuZGVyU3R5bGU+ IFNWR0VsZW1lbnQ6OmN1c3RvbVN0eWxlRm9yUmVuZGVyZXIoKQogICAgICAgICAgICAgc3R5bGUg PSByZW5kZXJlci0+c3R5bGUoKTsKICAgICB9CiAKLSAgICByZXR1cm4gZG9jdW1lbnQoKS0+c3R5 bGVTZWxlY3RvcigpLT5zdHlsZUZvckVsZW1lbnQoY29ycmVzcG9uZGluZ0VsZW1lbnQoKSwgc3R5 bGUsIGZhbHNlIC8qYWxsb3dTaGFyaW5nKi8pOworICAgIHJldHVybiBkb2N1bWVudCgpLT5zdHls ZVNlbGVjdG9yKCktPnN0eWxlRm9yRWxlbWVudChjb3JyZXNwb25kaW5nRWxlbWVudCgpLCBzdHls ZSwgRGlzYWxsb3dTdHlsZVNoYXJpbmcpOwogfQogCiBTdHlsZVByb3BlcnR5U2V0KiBTVkdFbGVt ZW50OjphbmltYXRlZFNNSUxTdHlsZVByb3BlcnRpZXMoKSBjb25zdAo= 134928 2012-03-30 18:55:25 -0700 2012-03-30 19:46:26 -0700 Patch for landing bug-82807-20120330185523.patch text/plain 12512 eric U3VidmVyc2lvbiBSZXZpc2lvbjogMTEyNzYwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYjIxNDllMmJhMjliNzM4 MzgyY2Y1ZWM5ZWMyYWJkMDBkODU5M2ZhMC4uNzliMDc1MmNlN2M1ZWNmNzRhYWI5MDRhZjEzNzAw ODVlM2Q1NDY4YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw0ICsxLDQzIEBACiAyMDEyLTAzLTMwICBFcmlj IFNlaWRlbCAgPGVyaWNAd2Via2l0Lm9yZz4KKyAgICAgICAgc3R5bGVGb3JFbGVtZW50KCkgc2hv dWxkIHVzZSBlbnVtcyBpbnN0ZWFkIG9mIGJvb2xzIHNvIHdlIGNhbiBhbGwgdW5kZXJzdGFuZCB3 aGF0IGl0J3MgZG9pbmcKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTgyODA3CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgQWRhbSBCYXJ0aC4KKworICAgICAg ICBObyBjaGFuZ2UgaW4gYmVoYXZpb3IsIHRodXMgbm8gdGVzdHMuCisKKyAgICAgICAgTW9zdGx5 IHRoaXMgaXMganVzdCByZXBsYWNpbmcgdHJ1ZS9mYWxzZSB3aXRoIHRoZSBjb3JyZWN0IG5ldyBl bnVtIHZhbHVlCisgICAgICAgIG9yIHJlbW92aW5nIHRydWUvZmFsc2UgZnJvbSB0aGUgY2FsbHNp dGVzIHdoZW4gdGhleSB3b3VsZCBoYXZlIGJlZW4gZGVmYXVsdCBhbnl3YXkuCisgICAgICAgIEkg dGhpbmsgdGhpcyBtYWtlcyB0aGUgY29kZSAqd2F5KiBtb3JlIGNsZWFyLgorCisgICAgICAgIFRo ZSBvbGQgY29kZSB3YXMgZXh0cmEgY29uZnVzaW5nIGJlY2F1c2UgdGhlIGRlZmF1bHRzIHdlcmUg InRydWUsIGZhbHNlIi4gOikKKyAgICAgICAgVGhlIG5ldyBkZWZhdWx0cyBhcmUgQWxsb3dTdHls ZVNoYXJpbmcsIE1hdGNoQWxsUnVsZXMuCisgICAgICAgIEl0J3MgdmVyeSB1bmNvbW1vbiBmb3Ig Y2FsbGVycyB0byB3YW50IHRvIG92ZXJyaWRlIGVpdGhlciBvZiB0aGVzZSBiZWhhdmlvcnMuCisg ICAgICAgIEkgdGhpbmsgbW9zdCBjYWxsZXJzIHdoaWNoIHNwZWNpZnkgRGlzYWxsb3dTdHlsZVNo YXJpbmcgbGlrZWx5IGRvbid0IGFjdHVhbGx5IG5lZWQgdG8KKyAgICAgICAgKG91ciBzdHlsZS1z aGFyaW5nIGNvZGUgc2hvdWxkIGJlIHNtYXJ0IGVub3VnaCB0byBvbmx5IHNoYXJlIHdoZW4gc2Fm ZSBhbnl3YXkpLgorCisgICAgICAgICogY3NzL0NTU1N0eWxlU2VsZWN0b3IuY3BwOgorICAgICAg ICAoV2ViQ29yZTo6Q1NTU3R5bGVTZWxlY3Rvcjo6Q1NTU3R5bGVTZWxlY3Rvcik6CisgICAgICAg ICAtIFVzZSBlbnVtcyBhbmQgcmVtb3ZlIGJvZ3VzIGNvbW1lbnQgKG1fcm9vdERlZmF1bHRTdHls ZSBpcyBhIFJlZlB0ciEpCisgICAgICAgIChXZWJDb3JlOjpDU1NTdHlsZVNlbGVjdG9yOjpjb2xs ZWN0TWF0Y2hpbmdSdWxlc0Zvckxpc3QpOgorICAgICAgICAqIGNzcy9DU1NTdHlsZVNlbGVjdG9y Lmg6CisgICAgICAgIChDU1NTdHlsZVNlbGVjdG9yKToKKyAgICAgICAgKiBjc3MvTWVkaWFRdWVy eU1hdGNoZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6TWVkaWFRdWVyeU1hdGNoZXI6OnByZXBh cmVFdmFsdWF0b3IpOgorICAgICAgICAqIGNzcy9TdHlsZU1lZGlhLmNwcDoKKyAgICAgICAgKFdl YkNvcmU6OlN0eWxlTWVkaWE6Om1hdGNoTWVkaXVtKToKKyAgICAgICAgKiBkb20vRWxlbWVudC5j cHA6CisgICAgICAgIChXZWJDb3JlOjpFbGVtZW50OjpzdHlsZUZvclJlbmRlcmVyKToKKyAgICAg ICAgKiByZW5kZXJpbmcvUmVuZGVyT2JqZWN0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRl ck9iamVjdDo6Z2V0VW5jYWNoZWRQc2V1ZG9TdHlsZSk6CisgICAgICAgICAtIFVwZGF0ZWQgdG8g dXNlIGVudW1zCisgICAgICAgICAtIEFsc28gZml4ZWQgdGhpcyB0byB1c2UgdG9FbGVtZW50IGFu ZCBtb2Rlcm4gZWFybHktcmV0dXJuIHN0eWxlcy4KKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVy UmVnaW9uLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclJlZ2lvbjo6Y29tcHV0ZVN0eWxl SW5SZWdpb24pOgorICAgICAgICAqIHN2Zy9TVkdFbGVtZW50LmNwcDoKKyAgICAgICAgKFdlYkNv cmU6OlNWR0VsZW1lbnQ6OmN1c3RvbVN0eWxlRm9yUmVuZGVyZXIpOgorCisyMDEyLTAzLTMwICBF cmljIFNlaWRlbCAgPGVyaWNAd2Via2l0Lm9yZz4KIAogICAgICAgICBBZGQgdGVzdHMgZm9yIGlm cmFtZSBzZWFtbGVzcyBhbmQgc3VwcG9ydCBmb3IgcGFyc2luZyB3ZWJraXRzZWFtbGVzcyBhdHRy aWJ1dGUKICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTgy Nzk1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTU3R5bGVTZWxlY3Rvci5jcHAg Yi9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTU3R5bGVTZWxlY3Rvci5jcHAKaW5kZXggYTdiMmNjNjAy ZjQ4NmE5NDc2NWNiZTRmODFiMTc5NmRjNWE3ZDA4MC4uNzIyMzQ2NWU0MWIxOTA2ZDFjZWY5Yjg5 N2U2YzY4ODg4MjQ0NWJjMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvY3NzL0NTU1N0eWxl U2VsZWN0b3IuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NTdHlsZVNlbGVjdG9yLmNw cApAQCAtMzc1LDcgKzM3NSw3IEBAIENTU1N0eWxlU2VsZWN0b3I6OkNTU1N0eWxlU2VsZWN0b3Io RG9jdW1lbnQqIGRvY3VtZW50LCBib29sIG1hdGNoQXV0aG9yQW5kVXNlclN0CiAgICAgICAgIG1f bWVkaXVtID0gYWRvcHRQdHIobmV3IE1lZGlhUXVlcnlFdmFsdWF0b3IoImFsbCIpKTsKIAogICAg IGlmIChyb290KQotICAgICAgICBtX3Jvb3REZWZhdWx0U3R5bGUgPSBzdHlsZUZvckVsZW1lbnQo cm9vdCwgMCwgZmFsc2UsIHRydWUpOyAvLyBkb24ndCByZWYsIGJlY2F1c2UgdGhlIFJlbmRlclN0 eWxlIGlzIGFsbG9jYXRlZCBmcm9tIGdsb2JhbCBoZWFwCisgICAgICAgIG1fcm9vdERlZmF1bHRT dHlsZSA9IHN0eWxlRm9yRWxlbWVudChyb290LCAwLCBEaXNhbGxvd1N0eWxlU2hhcmluZywgTWF0 Y2hPbmx5VXNlckFnZW50UnVsZXMpOwogCiAgICAgaWYgKG1fcm9vdERlZmF1bHRTdHlsZSAmJiB2 aWV3KQogICAgICAgICBtX21lZGl1bSA9IGFkb3B0UHRyKG5ldyBNZWRpYVF1ZXJ5RXZhbHVhdG9y KHZpZXctPm1lZGlhVHlwZSgpLCB2aWV3LT5mcmFtZSgpLCBtX3Jvb3REZWZhdWx0U3R5bGUuZ2V0 KCkpKTsKQEAgLTE1NjcsMTQgKzE1NjcsMTIgQEAgc3RhdGljIGlubGluZSBib29sIGlzQXRTaGFk b3dCb3VuZGFyeShFbGVtZW50KiBlbGVtZW50KQogICAgIHJldHVybiBwYXJlbnROb2RlICYmIHBh cmVudE5vZGUtPmlzU2hhZG93Um9vdCgpOwogfQogCi0vLyBJZiByZXNvbHZlRm9yUm9vdERlZmF1 bHQgaXMgdHJ1ZSwgc3R5bGUgYmFzZWQgb24gdXNlciBhZ2VudCBzdHlsZSBzaGVldCBvbmx5LiBU aGlzIGlzIHVzZWQgaW4gbWVkaWEgcXVlcmllcywgd2hlcmUKLS8vIHJlbGF0aXZlIHVuaXRzIGFy ZSBpbnRlcnByZXRlZCBhY2NvcmRpbmcgdG8gZG9jdW1lbnQgcm9vdCBlbGVtZW50IHN0eWxlLCBz dHlsZWQgb25seSB3aXRoIFVBIHN0eWxlc2hlZXQKLQotUGFzc1JlZlB0cjxSZW5kZXJTdHlsZT4g Q1NTU3R5bGVTZWxlY3Rvcjo6c3R5bGVGb3JFbGVtZW50KEVsZW1lbnQqIGVsZW1lbnQsIFJlbmRl clN0eWxlKiBkZWZhdWx0UGFyZW50LCBib29sIGFsbG93U2hhcmluZywgYm9vbCByZXNvbHZlRm9y Um9vdERlZmF1bHQsIFJlbmRlclJlZ2lvbiogcmVnaW9uRm9yU3R5bGluZykKK1Bhc3NSZWZQdHI8 UmVuZGVyU3R5bGU+IENTU1N0eWxlU2VsZWN0b3I6OnN0eWxlRm9yRWxlbWVudChFbGVtZW50KiBl bGVtZW50LCBSZW5kZXJTdHlsZSogZGVmYXVsdFBhcmVudCwKKyAgICBTdHlsZVNoYXJpbmdCZWhh dmlvciBzaGFyaW5nQmVoYXZpb3IsIFJ1bGVNYXRjaGluZ0JlaGF2aW9yIG1hdGNoaW5nQmVoYXZp b3IsIFJlbmRlclJlZ2lvbiogcmVnaW9uRm9yU3R5bGluZykKIHsKICAgICAvLyBPbmNlIGFuIGVs ZW1lbnQgaGFzIGEgcmVuZGVyZXIsIHdlIGRvbid0IHRyeSB0byBkZXN0cm95IGl0LCBzaW5jZSBv dGhlcndpc2UgdGhlIHJlbmRlcmVyCiAgICAgLy8gd2lsbCB2YW5pc2ggaWYgYSBzdHlsZSByZWNh bGMgaGFwcGVucyBkdXJpbmcgbG9hZGluZy4KLSAgICBpZiAoYWxsb3dTaGFyaW5nICYmICFlbGVt ZW50LT5kb2N1bWVudCgpLT5oYXZlU3R5bGVzaGVldHNMb2FkZWQoKSAmJiAhZWxlbWVudC0+cmVu ZGVyZXIoKSkgeworICAgIGlmIChzaGFyaW5nQmVoYXZpb3IgPT0gQWxsb3dTdHlsZVNoYXJpbmcg JiYgIWVsZW1lbnQtPmRvY3VtZW50KCktPmhhdmVTdHlsZXNoZWV0c0xvYWRlZCgpICYmICFlbGVt ZW50LT5yZW5kZXJlcigpKSB7CiAgICAgICAgIGlmICghc19zdHlsZU5vdFlldEF2YWlsYWJsZSkg ewogICAgICAgICAgICAgc19zdHlsZU5vdFlldEF2YWlsYWJsZSA9IFJlbmRlclN0eWxlOjpjcmVh dGUoKS5sZWFrUmVmKCk7CiAgICAgICAgICAgICBzX3N0eWxlTm90WWV0QXZhaWxhYmxlLT5zZXRE aXNwbGF5KE5PTkUpOwpAQCAtMTU4Nyw3ICsxNTg1LDcgQEAgUGFzc1JlZlB0cjxSZW5kZXJTdHls ZT4gQ1NTU3R5bGVTZWxlY3Rvcjo6c3R5bGVGb3JFbGVtZW50KEVsZW1lbnQqIGVsZW1lbnQsIFJl bmQKICAgICBpbml0RWxlbWVudChlbGVtZW50KTsKICAgICBpbml0Rm9yU3R5bGVSZXNvbHZlKGVs ZW1lbnQsIGRlZmF1bHRQYXJlbnQpOwogICAgIG1fcmVnaW9uRm9yU3R5bGluZyA9IHJlZ2lvbkZv clN0eWxpbmc7Ci0gICAgaWYgKGFsbG93U2hhcmluZykgeworICAgIGlmIChzaGFyaW5nQmVoYXZp b3IgPT0gQWxsb3dTdHlsZVNoYXJpbmcpIHsKICAgICAgICAgUmVuZGVyU3R5bGUqIHNoYXJlZFN0 eWxlID0gbG9jYXRlU2hhcmVkU3R5bGUoKTsKICAgICAgICAgaWYgKHNoYXJlZFN0eWxlKQogICAg ICAgICAgICAgcmV0dXJuIHNoYXJlZFN0eWxlOwpAQCAtMTYxNSw3ICsxNjEzLDcgQEAgUGFzc1Jl ZlB0cjxSZW5kZXJTdHlsZT4gQ1NTU3R5bGVTZWxlY3Rvcjo6c3R5bGVGb3JFbGVtZW50KEVsZW1l bnQqIGVsZW1lbnQsIFJlbmQKICAgICBlbnN1cmVEZWZhdWx0U3R5bGVTaGVldHNGb3JFbGVtZW50 KGVsZW1lbnQpOwogCiAgICAgTWF0Y2hSZXN1bHQgbWF0Y2hSZXN1bHQ7Ci0gICAgaWYgKHJlc29s dmVGb3JSb290RGVmYXVsdCkKKyAgICBpZiAobWF0Y2hpbmdCZWhhdmlvciA9PSBNYXRjaE9ubHlV c2VyQWdlbnRSdWxlcykKICAgICAgICAgbWF0Y2hVQVJ1bGVzKG1hdGNoUmVzdWx0KTsKICAgICBl bHNlCiAgICAgICAgIG1hdGNoQWxsUnVsZXMobWF0Y2hSZXN1bHQpOwpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvY3NzL0NTU1N0eWxlU2VsZWN0b3IuaCBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9D U1NTdHlsZVNlbGVjdG9yLmgKaW5kZXggMWRiOTA0MDQzZWFjYTIxMzg2ZjgyODlkNzkyMjk1MTFj ZTY0OWU1OS4uNTgxODM2NzRhOTIyYjJmNjFjMzM3OWE3N2ZjZDJjMGQxYjAwMDQ4NCAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvY3NzL0NTU1N0eWxlU2VsZWN0b3IuaAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9jc3MvQ1NTU3R5bGVTZWxlY3Rvci5oCkBAIC0xMDAsNiArMTAwLDIwIEBAIHB1Ymxp YzoKICAgICBib29sIG1fcmVzdWx0OwogfTsKIAorZW51bSBTdHlsZVNoYXJpbmdCZWhhdmlvciB7 CisgICAgQWxsb3dTdHlsZVNoYXJpbmcsCisgICAgRGlzYWxsb3dTdHlsZVNoYXJpbmcsCit9Owor CisvLyBNYXRjaE9ubHlVc2VyQWdlbnRSdWxlcyBpcyB1c2VkIGluIG1lZGlhIHF1ZXJpZXMsIHdo ZXJlIHJlbGF0aXZlIHVuaXRzCisvLyBhcmUgaW50ZXJwcmV0ZWQgYWNjb3JkaW5nIHRvIHRoZSBk b2N1bWVudCByb290IGVsZW1lbnQgc3R5bGUsIGFuZCBzdHlsZWQgb25seQorLy8gZnJvbSB0aGUg VXNlciBBZ2VudCBTdHlsZXNoZWV0IHJ1bGVzLgorCitlbnVtIFJ1bGVNYXRjaGluZ0JlaGF2aW9y IHsKKyAgICBNYXRjaEFsbFJ1bGVzLAorICAgIE1hdGNoT25seVVzZXJBZ2VudFJ1bGVzLAorfTsK KwogLy8gVGhpcyBjbGFzcyBzZWxlY3RzIGEgUmVuZGVyU3R5bGUgZm9yIGEgZ2l2ZW4gZWxlbWVu dCBiYXNlZCBvbiBhIGNvbGxlY3Rpb24gb2Ygc3R5bGVzaGVldHMuCiBjbGFzcyBDU1NTdHlsZVNl bGVjdG9yIHsKICAgICBXVEZfTUFLRV9OT05DT1BZQUJMRShDU1NTdHlsZVNlbGVjdG9yKTsgV1RG X01BS0VfRkFTVF9BTExPQ0FURUQ7CkBAIC0xMTMsNyArMTI3LDggQEAgcHVibGljOgogICAgIHZv aWQgcHVzaFBhcmVudFNoYWRvd1Jvb3QoY29uc3QgU2hhZG93Um9vdCopOwogICAgIHZvaWQgcG9w UGFyZW50U2hhZG93Um9vdChjb25zdCBTaGFkb3dSb290Kik7CiAKLSAgICBQYXNzUmVmUHRyPFJl bmRlclN0eWxlPiBzdHlsZUZvckVsZW1lbnQoRWxlbWVudCosIFJlbmRlclN0eWxlKiBwYXJlbnRT dHlsZSA9IDAsIGJvb2wgYWxsb3dTaGFyaW5nID0gdHJ1ZSwgYm9vbCByZXNvbHZlRm9yUm9vdERl ZmF1bHQgPSBmYWxzZSwgUmVuZGVyUmVnaW9uKiByZWdpb25Gb3JTdHlsaW5nID0gMCk7CisgICAg UGFzc1JlZlB0cjxSZW5kZXJTdHlsZT4gc3R5bGVGb3JFbGVtZW50KEVsZW1lbnQqLCBSZW5kZXJT dHlsZSogcGFyZW50U3R5bGUgPSAwLCBTdHlsZVNoYXJpbmdCZWhhdmlvciA9IEFsbG93U3R5bGVT aGFyaW5nLAorICAgICAgICBSdWxlTWF0Y2hpbmdCZWhhdmlvciA9IE1hdGNoQWxsUnVsZXMsIFJl bmRlclJlZ2lvbiogcmVnaW9uRm9yU3R5bGluZyA9IDApOwogCiAgICAgdm9pZCBrZXlmcmFtZVN0 eWxlc0ZvckFuaW1hdGlvbihFbGVtZW50KiwgY29uc3QgUmVuZGVyU3R5bGUqLCBLZXlmcmFtZUxp c3QmKTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvY3NzL01lZGlhUXVlcnlNYXRjaGVy LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9NZWRpYVF1ZXJ5TWF0Y2hlci5jcHAKaW5kZXggZjdi MjNiN2E5ZWQzMTAxNGVjMjAzNmViZTViMzdhYjc0NWQyOTgxMi4uMzYzYmEyMWJkMWVkYzIyZjc3 N2JhYTYwMDA4ZTBiODBkZWU0ZTcxNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvY3NzL01l ZGlhUXVlcnlNYXRjaGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9jc3MvTWVkaWFRdWVyeU1h dGNoZXIuY3BwCkBAIC04OCw3ICs4OCw3IEBAIFBhc3NPd25QdHI8TWVkaWFRdWVyeUV2YWx1YXRv cj4gTWVkaWFRdWVyeU1hdGNoZXI6OnByZXBhcmVFdmFsdWF0b3IoKSBjb25zdAogICAgIGlmICgh c3R5bGVTZWxlY3RvcikKICAgICAgICAgcmV0dXJuIG51bGxwdHI7CiAKLSAgICBSZWZQdHI8UmVu ZGVyU3R5bGU+IHJvb3RTdHlsZSA9IHN0eWxlU2VsZWN0b3ItPnN0eWxlRm9yRWxlbWVudChkb2N1 bWVudEVsZW1lbnQsIDAgLypkZWZhdWx0UGFyZW50Ki8sIGZhbHNlIC8qYWxsb3dTaGFyaW5nKi8s IHRydWUgLypyZXNvbHZlRm9yUm9vdERlZmF1bHQqLyk7CisgICAgUmVmUHRyPFJlbmRlclN0eWxl PiByb290U3R5bGUgPSBzdHlsZVNlbGVjdG9yLT5zdHlsZUZvckVsZW1lbnQoZG9jdW1lbnRFbGVt ZW50LCAwIC8qZGVmYXVsdFBhcmVudCovLCBEaXNhbGxvd1N0eWxlU2hhcmluZywgTWF0Y2hPbmx5 VXNlckFnZW50UnVsZXMpOwogCiAgICAgcmV0dXJuIGFkb3B0UHRyKG5ldyBNZWRpYVF1ZXJ5RXZh bHVhdG9yKG1lZGlhVHlwZSgpLCBtX2RvY3VtZW50LT5mcmFtZSgpLCByb290U3R5bGUuZ2V0KCkp KTsKIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9TdHlsZU1lZGlhLmNwcCBiL1Nv dXJjZS9XZWJDb3JlL2Nzcy9TdHlsZU1lZGlhLmNwcAppbmRleCA0NjFiOWNkMmM1NjQ5ZmMxYTcy MzE5YmVjYzFlNDkwNDgyOTdhOTEyLi5iYTI2NjRkZDFjZDQxMzU5ZWEyZTNmMjkxNTIxYzMxZGMx YzE5MTJiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9jc3MvU3R5bGVNZWRpYS5jcHAKKysr IGIvU291cmNlL1dlYkNvcmUvY3NzL1N0eWxlTWVkaWEuY3BwCkBAIC02NCw3ICs2NCw3IEBAIGJv b2wgU3R5bGVNZWRpYTo6bWF0Y2hNZWRpdW0oY29uc3QgU3RyaW5nJiBxdWVyeSkgY29uc3QKICAg ICBpZiAoIXN0eWxlU2VsZWN0b3IpCiAgICAgICAgIHJldHVybiBmYWxzZTsKIAotICAgIFJlZlB0 cjxSZW5kZXJTdHlsZT4gcm9vdFN0eWxlID0gc3R5bGVTZWxlY3Rvci0+c3R5bGVGb3JFbGVtZW50 KGRvY3VtZW50RWxlbWVudCwgMCAvKmRlZmF1bHRQYXJlbnQqLywgZmFsc2UgLyphbGxvd1NoYXJp bmcqLywgdHJ1ZSAvKnJlc29sdmVGb3JSb290RGVmYXVsdCovKTsKKyAgICBSZWZQdHI8UmVuZGVy U3R5bGU+IHJvb3RTdHlsZSA9IHN0eWxlU2VsZWN0b3ItPnN0eWxlRm9yRWxlbWVudChkb2N1bWVu dEVsZW1lbnQsIDAgLypkZWZhdWx0UGFyZW50Ki8sIERpc2FsbG93U3R5bGVTaGFyaW5nLCBNYXRj aE9ubHlVc2VyQWdlbnRSdWxlcyk7CiAKICAgICBSZWZQdHI8TWVkaWFRdWVyeVNldD4gbWVkaWEg PSBNZWRpYVF1ZXJ5U2V0OjpjcmVhdGUoKTsKICAgICBpZiAoIW1lZGlhLT5wYXJzZShxdWVyeSkp CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9kb20vRWxlbWVudC5jcHAgYi9Tb3VyY2UvV2Vi Q29yZS9kb20vRWxlbWVudC5jcHAKaW5kZXggM2NkYmRmMTExYTNkYjQwYTU0NmE3ODUwZTg2ZGEw NzgwMjQxMGQzOC4uY2EyYTdlMDI1MzhlZWYwNDdmYjhkZjk3ZDEzMTgyNjU1YjcwMzdlMyAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvZG9tL0VsZW1lbnQuY3BwCisrKyBiL1NvdXJjZS9XZWJD b3JlL2RvbS9FbGVtZW50LmNwcApAQCAtMTAzOCw3ICsxMDM4LDcgQEAgUGFzc1JlZlB0cjxSZW5k ZXJTdHlsZT4gRWxlbWVudDo6c3R5bGVGb3JSZW5kZXJlcigpCiB7CiAgICAgaWYgKGhhc0N1c3Rv bVN0eWxlRm9yUmVuZGVyZXIoKSkKICAgICAgICAgcmV0dXJuIGN1c3RvbVN0eWxlRm9yUmVuZGVy ZXIoKTsKLSAgICByZXR1cm4gZG9jdW1lbnQoKS0+c3R5bGVTZWxlY3RvcigpLT5zdHlsZUZvckVs ZW1lbnQoc3RhdGljX2Nhc3Q8RWxlbWVudCo+KHRoaXMpLCAwLCB0cnVlLyphbGxvd1NoYXJpbmcq Lyk7CisgICAgcmV0dXJuIGRvY3VtZW50KCktPnN0eWxlU2VsZWN0b3IoKS0+c3R5bGVGb3JFbGVt ZW50KHN0YXRpY19jYXN0PEVsZW1lbnQqPih0aGlzKSk7CiB9CiAKIHZvaWQgRWxlbWVudDo6cmVj YWxjU3R5bGUoU3R5bGVDaGFuZ2UgY2hhbmdlKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv cmVuZGVyaW5nL1JlbmRlck9iamVjdC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVu ZGVyT2JqZWN0LmNwcAppbmRleCBhODJjODEzMTNjNGUwNDIwY2E4ZjYyZjYzMGI1MmFmNTdlMmFl NDc4Li5kNjQ4NGM4ZGNiZmNkM2U1ODhlNzc3ODAwZWI1MTUxOGNiMDc1MDUzIDEwMDc1NQotLS0g YS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyT2JqZWN0LmNwcAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyT2JqZWN0LmNwcApAQCAtMjU2MCwxOSArMjU2MCwyMCBA QCBQYXNzUmVmUHRyPFJlbmRlclN0eWxlPiBSZW5kZXJPYmplY3Q6OmdldFVuY2FjaGVkUHNldWRv U3R5bGUoUHNldWRvSWQgcHNldWRvLCBSZQogICAgICAgICBwYXJlbnRTdHlsZSA9IHN0eWxlKCk7 CiAgICAgfQogCisgICAgLy8gRklYTUU6IFRoaXMgImZpbmQgbmVhcmVzdCBlbGVtZW50IHBhcmVu dCIgc2hvdWxkIGJlIGEgaGVscGVyIGZ1bmN0aW9uLgogICAgIE5vZGUqIG4gPSBub2RlKCk7CiAg ICAgd2hpbGUgKG4gJiYgIW4tPmlzRWxlbWVudE5vZGUoKSkKICAgICAgICAgbiA9IG4tPnBhcmVu dE5vZGUoKTsKICAgICBpZiAoIW4pCiAgICAgICAgIHJldHVybiAwOworICAgIEVsZW1lbnQqIGVs ZW1lbnQgPSB0b0VsZW1lbnQobik7CiAKLSAgICBSZWZQdHI8UmVuZGVyU3R5bGU+IHJlc3VsdDsK ICAgICBpZiAocHNldWRvID09IEZJUlNUX0xJTkVfSU5IRVJJVEVEKSB7Ci0gICAgICAgIHJlc3Vs dCA9IGRvY3VtZW50KCktPnN0eWxlU2VsZWN0b3IoKS0+c3R5bGVGb3JFbGVtZW50KHN0YXRpY19j YXN0PEVsZW1lbnQqPihuKSwgcGFyZW50U3R5bGUsIGZhbHNlKTsKKyAgICAgICAgUmVmUHRyPFJl bmRlclN0eWxlPiByZXN1bHQgPSBkb2N1bWVudCgpLT5zdHlsZVNlbGVjdG9yKCktPnN0eWxlRm9y RWxlbWVudChlbGVtZW50LCBwYXJlbnRTdHlsZSwgRGlzYWxsb3dTdHlsZVNoYXJpbmcpOwogICAg ICAgICByZXN1bHQtPnNldFN0eWxlVHlwZShGSVJTVF9MSU5FX0lOSEVSSVRFRCk7Ci0gICAgfSBl bHNlCi0gICAgICAgIHJlc3VsdCA9IGRvY3VtZW50KCktPnN0eWxlU2VsZWN0b3IoKS0+cHNldWRv U3R5bGVGb3JFbGVtZW50KHBzZXVkbywgc3RhdGljX2Nhc3Q8RWxlbWVudCo+KG4pLCBwYXJlbnRT dHlsZSk7Ci0gICAgcmV0dXJuIHJlc3VsdC5yZWxlYXNlKCk7CisgICAgICAgIHJldHVybiByZXN1 bHQucmVsZWFzZSgpOworICAgIH0KKyAgICByZXR1cm4gZG9jdW1lbnQoKS0+c3R5bGVTZWxlY3Rv cigpLT5wc2V1ZG9TdHlsZUZvckVsZW1lbnQocHNldWRvLCBlbGVtZW50LCBwYXJlbnRTdHlsZSk7 CiB9CiAKIHN0YXRpYyBDb2xvciBkZWNvcmF0aW9uQ29sb3IoUmVuZGVyT2JqZWN0KiByZW5kZXJl cikKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJSZWdpb24uY3Bw IGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclJlZ2lvbi5jcHAKaW5kZXggZGU5OGZm ODkxODg0NTQ0MTg2YTY4NzY0NTVkOTM3MzJmZWQwMTUyYi4uMTYxZTUwOWFiZTNlNjUxMTFlMDBh MTkwZWY3ZmU4YzJkYTdkZTZjNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n L1JlbmRlclJlZ2lvbi5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclJl Z2lvbi5jcHAKQEAgLTMwMCw3ICszMDAsNyBAQCBQYXNzUmVmUHRyPFJlbmRlclN0eWxlPiBSZW5k ZXJSZWdpb246OmNvbXB1dGVTdHlsZUluUmVnaW9uKGNvbnN0IFJlbmRlckJveCogYm94KQogICAg IEFTU0VSVChib3gtPm5vZGUoKSAmJiBib3gtPm5vZGUoKS0+aXNFbGVtZW50Tm9kZSgpKTsKIAog ICAgIEVsZW1lbnQqIGVsZW1lbnQgPSB0b0VsZW1lbnQoYm94LT5ub2RlKCkpOwotICAgIFJlZlB0 cjxSZW5kZXJTdHlsZT4gcmVuZGVyQm94UmVnaW9uU3R5bGUgPSBib3gtPnZpZXcoKS0+ZG9jdW1l bnQoKS0+c3R5bGVTZWxlY3RvcigpLT5zdHlsZUZvckVsZW1lbnQoZWxlbWVudCwgMCwgZmFsc2Us IGZhbHNlLCB0aGlzKTsKKyAgICBSZWZQdHI8UmVuZGVyU3R5bGU+IHJlbmRlckJveFJlZ2lvblN0 eWxlID0gYm94LT52aWV3KCktPmRvY3VtZW50KCktPnN0eWxlU2VsZWN0b3IoKS0+c3R5bGVGb3JF bGVtZW50KGVsZW1lbnQsIDAsIERpc2FsbG93U3R5bGVTaGFyaW5nLCBNYXRjaEFsbFJ1bGVzLCB0 aGlzKTsKICAgICBtX3JlbmRlckJveFJlZ2lvblN0eWxlLmFkZChib3gsIHJlbmRlckJveFJlZ2lv blN0eWxlKTsKIAogICAgIGlmICghYm94LT5oYXNCb3hEZWNvcmF0aW9ucygpKSB7CmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9zdmcvU1ZHRWxlbWVudC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9z dmcvU1ZHRWxlbWVudC5jcHAKaW5kZXggZjA0ODZhOGEyNDgwZmExYzMyZTI4ZjhlZmVlOTY5OGJj NjUwMzEyYi4uMTc1M2VjZTY2Yzk5OTI5ZjZkNmM3OTM2NzcwMjRkZTNhOWM3MjNlMiAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvc3ZnL1NWR0VsZW1lbnQuY3BwCisrKyBiL1NvdXJjZS9XZWJD b3JlL3N2Zy9TVkdFbGVtZW50LmNwcApAQCAtNDc4LDcgKzQ3OCw3IEBAIHZvaWQgU1ZHRWxlbWVu dDo6c3luY2hyb25pemVTeXN0ZW1MYW5ndWFnZSh2b2lkKiBjb250ZXh0RWxlbWVudCkKIFBhc3NS ZWZQdHI8UmVuZGVyU3R5bGU+IFNWR0VsZW1lbnQ6OmN1c3RvbVN0eWxlRm9yUmVuZGVyZXIoKQog ewogICAgIGlmICghY29ycmVzcG9uZGluZ0VsZW1lbnQoKSkKLSAgICAgICAgcmV0dXJuIGRvY3Vt ZW50KCktPnN0eWxlU2VsZWN0b3IoKS0+c3R5bGVGb3JFbGVtZW50KHN0YXRpY19jYXN0PEVsZW1l bnQqPih0aGlzKSwgMCwgdHJ1ZSk7CisgICAgICAgIHJldHVybiBkb2N1bWVudCgpLT5zdHlsZVNl bGVjdG9yKCktPnN0eWxlRm9yRWxlbWVudCh0aGlzKTsKIAogICAgIFJlbmRlclN0eWxlKiBzdHls ZSA9IDA7CiAgICAgaWYgKEVsZW1lbnQqIHBhcmVudCA9IHBhcmVudE9ySG9zdEVsZW1lbnQoKSkg ewpAQCAtNDg2LDcgKzQ4Niw3IEBAIFBhc3NSZWZQdHI8UmVuZGVyU3R5bGU+IFNWR0VsZW1lbnQ6 OmN1c3RvbVN0eWxlRm9yUmVuZGVyZXIoKQogICAgICAgICAgICAgc3R5bGUgPSByZW5kZXJlci0+ c3R5bGUoKTsKICAgICB9CiAKLSAgICByZXR1cm4gZG9jdW1lbnQoKS0+c3R5bGVTZWxlY3Rvcigp LT5zdHlsZUZvckVsZW1lbnQoY29ycmVzcG9uZGluZ0VsZW1lbnQoKSwgc3R5bGUsIGZhbHNlIC8q YWxsb3dTaGFyaW5nKi8pOworICAgIHJldHVybiBkb2N1bWVudCgpLT5zdHlsZVNlbGVjdG9yKCkt PnN0eWxlRm9yRWxlbWVudChjb3JyZXNwb25kaW5nRWxlbWVudCgpLCBzdHlsZSwgRGlzYWxsb3dT dHlsZVNoYXJpbmcpOwogfQogCiBTdHlsZVByb3BlcnR5U2V0KiBTVkdFbGVtZW50OjphbmltYXRl ZFNNSUxTdHlsZVByb3BlcnRpZXMoKSBjb25zdAo=