77001 2012-01-25 03:24:53 -0800 border-image should not crash when the source is not specified. 2012-01-25 10:55:01 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 76876 1 menard menard abarth kling koivisto macpherson tony webkit.review.bot oldest_to_newest 542144 0 menard 2012-01-25 03:24:53 -0800 border-image should not crash when the source is not specified. 542149 1 123913 menard 2012-01-25 03:33:48 -0800 Created attachment 123913 Patch 542273 2 123913 kling 2012-01-25 08:02:51 -0800 Comment on attachment 123913 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=123913&action=review With this change, mapNinePieceImage() becomes very liberal in which argument order it accepts. Are you sure this won't lead to situations where incorrect values slip through the crack? > Source/WebCore/ChangeLog:10 > + may happen that you have no value set for it. CSSBorderImage::createBorderImageValue There is no CSSBorderImage class, the method is simply WebCore::createBorderImageValue. > Source/WebCore/css/CSSStyleSelector.cpp:4322 > + if (current->isPrimitiveValue() && !current->isImageValue() && !current->isImageGeneratorValue()) If isPrimitiveValue() is true, isImageGeneratorValue() is going to be false, no need to check the latter. 542304 3 123946 menard 2012-01-25 08:42:09 -0800 Created attachment 123946 Patch 542309 4 menard 2012-01-25 08:48:08 -0800 (In reply to comment #2) > (From update of attachment 123913 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=123913&action=review > > With this change, mapNinePieceImage() becomes very liberal in which argument order it accepts. Are you sure this won't lead to situations where incorrect values slip through the crack? Well before r105502 http://trac.webkit.org/changeset/105502/trunk/Source/WebCore/css/CSSStyleSelector.cpp It was already liberal on the order as it was just taking the CSSBorderImageValue object as parameter. > > > Source/WebCore/ChangeLog:10 > > + may happen that you have no value set for it. CSSBorderImage::createBorderImageValue > > There is no CSSBorderImage class, the method is simply WebCore::createBorderImageValue. Fixed. > > > Source/WebCore/css/CSSStyleSelector.cpp:4322 > > + if (current->isPrimitiveValue() && !current->isImageValue() && !current->isImageGeneratorValue()) > > If isPrimitiveValue() is true, isImageGeneratorValue() is going to be false, no need to check the latter. Good catch. Fixed. 542329 5 123951 menard 2012-01-25 09:09:26 -0800 Created attachment 123951 Patch 542335 6 123951 kling 2012-01-25 09:12:29 -0800 Comment on attachment 123951 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=123951&action=review Looks good, r=me. > Source/WebCore/css/CSSStyleSelector.cpp:4320 > + } else if (current->isPrimitiveValue()) > + // Set the appropriate rules for stretch/round/repeat of the slices. > + mapNinePieceImageRepeat(current, image); Please add { } here, since the comment makes it two lines. 542337 7 123953 menard 2012-01-25 09:14:16 -0800 Created attachment 123953 Patch for landing 542447 8 123953 webkit.review.bot 2012-01-25 10:54:56 -0800 Comment on attachment 123953 Patch for landing Clearing flags on attachment: 123953 Committed r105898: <http://trac.webkit.org/changeset/105898> 542448 9 webkit.review.bot 2012-01-25 10:55:01 -0800 All reviewed patches have been landed. Closing bug. 123913 2012-01-25 03:33:48 -0800 2012-01-25 08:42:01 -0800 Patch bug-77001-20120125083336.patch text/plain 7347 menard U3VidmVyc2lvbiBSZXZpc2lvbjogMTA1Nzc1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggY2QyMzhkOWZkY2I5YzBl M2IyMDEyYTVlNTFiZjhlZjJkOWRhOTg5Mi4uYjU3MWVlNzk4YWU3MjllZmU3YjY2ZTVlMzNjNTUx M2UyOWI2ODhjNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDEyLTAxLTI1ICBBbGV4 aXMgTWVuYXJkICA8YWxleGlzLm1lbmFyZEBvcGVuYm9zc2Eub3JnPgorCisgICAgICAgIGJvcmRl ci1pbWFnZSBzaG91bGQgbm90IGNyYXNoIHdoZW4gdGhlIHNvdXJjZSBpcyBub3Qgc3BlY2lmaWVk LgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NzcwMDEK KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGlzIGJ1 ZyB3YXMgaW50cm9kdWNlZCBieSByMTA1NTAyIGJ1dCB3YXMgZXhwb3NlZCBieSByMTA1NzM4Lgor ICAgICAgICBUaGUgaW1hZ2Utc291cmNlIG9mIGEgYm9yZGVyLWltYWdlIGlzIG5vdCBtYW5kYXRv cnkgdGhlcmVmb3JlIGl0CisgICAgICAgIG1heSBoYXBwZW4gdGhhdCB5b3UgaGF2ZSBubyB2YWx1 ZSBzZXQgZm9yIGl0LiBDU1NCb3JkZXJJbWFnZTo6Y3JlYXRlQm9yZGVySW1hZ2VWYWx1ZQorICAg ICAgICB3YXMgd3JvbmdseSBhc3N1bWluZyB0aGF0IHRoZSBpbWFnZSBpcyBhbHdheXMgc2V0LiBU aGlzIHByb2JsZW0gYWxzbyByZXF1aXJlZCBhIGJpdAorICAgICAgICBvZiByZWZhY3RvcmluZyBp biBDU1NTdHlsZVNlbGVjdG9yOjptYXBOaW5lUGllY2VJbWFnZSB0byB0YWtlIGludG8gYWNjb3Vu dCB0aGF0CisgICAgICAgIHRoZSBpbWFnZSBjb3VsZCBiZSBvcHRpb25hbCAoanVzdCBsaWtlIG90 aGVyIHByb3BlcnRpZXMpLgorCisgICAgICAgIFRlc3Q6IGZhc3QvY3NzL2JvcmRlci1pbWFnZS1u dWxsLWltYWdlLWNyYXNoLmh0bWwKKworICAgICAgICAqIGNzcy9DU1NCb3JkZXJJbWFnZS5jcHA6 CisgICAgICAgIChXZWJDb3JlOjpjcmVhdGVCb3JkZXJJbWFnZVZhbHVlKToKKyAgICAgICAgKiBj c3MvQ1NTU3R5bGVTZWxlY3Rvci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpDU1NTdHlsZVNlbGVj dG9yOjptYXBOaW5lUGllY2VJbWFnZSk6CisKIDIwMTItMDEtMTYgIFJvYmVydCBIb2dhbiAgPHJv YmVydEB3ZWJraXQub3JnPgogCiAgICAgICAgIFJFR1JFU1NJT04gKHIxMDIwNDApOiBXcm9uZyBj b2x1bW4gd2lkdGhzIHdoZW4gcm93IGhhcyBjb2xzcGFuIGFuZCB1bndyYXBwYWJsZSB0ZXh0CmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTQm9yZGVySW1hZ2UuY3BwIGIvU291cmNl L1dlYkNvcmUvY3NzL0NTU0JvcmRlckltYWdlLmNwcAppbmRleCAzYjY2YzZiMjJiNTA1ZGFjMjc2 NTU5NGY5YzQ0YzQ5N2NlY2I4MTMxLi5hYzNlNTFlZjE3YmFhZjNmYTZkMmEyMDE3ZjRjMjI1OWU3 MGM4Mjk3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTQm9yZGVySW1hZ2UuY3Bw CisrKyBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NCb3JkZXJJbWFnZS5jcHAKQEAgLTI2LDcgKzI2 LDggQEAgUGFzc1JlZlB0cjxDU1NWYWx1ZUxpc3Q+IGNyZWF0ZUJvcmRlckltYWdlVmFsdWUoUGFz c1JlZlB0cjxDU1NWYWx1ZT4gaW1hZ2UsIFBhc3MKICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgIFBhc3NSZWZQdHI8Q1NTVmFsdWU+IG91dHNldCwgUGFzc1Jl ZlB0cjxDU1NWYWx1ZT4gcmVwZWF0KQogewogICAgIFJlZlB0cjxDU1NWYWx1ZUxpc3Q+IGxpc3Qg PSBDU1NWYWx1ZUxpc3Q6OmNyZWF0ZVNwYWNlU2VwYXJhdGVkKCk7Ci0gICAgbGlzdC0+YXBwZW5k KGltYWdlKTsKKyAgICBpZiAoaW1hZ2UpCisgICAgICAgIGxpc3QtPmFwcGVuZChpbWFnZSk7CiAK ICAgICBpZiAoYm9yZGVyU2xpY2UgfHwgb3V0c2V0KSB7CiAgICAgICAgIFJlZlB0cjxDU1NWYWx1 ZUxpc3Q+IGxpc3RTbGFzaCA9IENTU1ZhbHVlTGlzdDo6Y3JlYXRlU2xhc2hTZXBhcmF0ZWQoKTsK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NTdHlsZVNlbGVjdG9yLmNwcCBiL1Nv dXJjZS9XZWJDb3JlL2Nzcy9DU1NTdHlsZVNlbGVjdG9yLmNwcAppbmRleCA4ZDQ0Y2E2MjExZTdl ZDgzY2FmZTUzNTlkMTMzNzZkMTRjMGVmYzIzLi5kZGRiNzcyMGFlZDMyMzQ5N2Y4YTJlNjI5ODc2 NDI0OGU1OGMyNGM2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTU3R5bGVTZWxl Y3Rvci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvY3NzL0NTU1N0eWxlU2VsZWN0b3IuY3BwCkBA IC00Mjk1LDI0ICs0Mjk1LDE3IEBAIHZvaWQgQ1NTU3R5bGVTZWxlY3Rvcjo6bWFwTmluZVBpZWNl SW1hZ2UoQ1NTUHJvcGVydHlJRCBwcm9wZXJ0eSwgQ1NTVmFsdWUqIHZhbHVlCiAgICAgZWxzZQog ICAgICAgICBpbWFnZVByb3BlcnR5ID0gcHJvcGVydHk7CiAKLSAgICBpZiAoQ1NTVmFsdWUqIGlt YWdlVmFsdWUgPSBib3JkZXJJbWFnZS0+aXRlbSgwKSkKLSAgICAgICAgaW1hZ2Uuc2V0SW1hZ2Uo c3R5bGVJbWFnZShpbWFnZVByb3BlcnR5LCBpbWFnZVZhbHVlKSk7CisgICAgZm9yICh1bnNpZ25l ZCBpID0gMCA7IGkgPCBib3JkZXJJbWFnZS0+bGVuZ3RoKCkgOyArK2kpIHsKKyAgICAgICAgQ1NT VmFsdWUqIGN1cnJlbnQgPSBib3JkZXJJbWFnZS0+aXRlbShpKTsKIAotICAgIGlmIChib3JkZXJJ bWFnZS0+aXRlbSgxKSkgewotICAgICAgICBpZiAoYm9yZGVySW1hZ2UtPml0ZW0oMSktPmNzc1Zh bHVlVHlwZSgpICE9IENTU1ZhbHVlOjpDU1NfVkFMVUVfTElTVCkgewotICAgICAgICAgICAgLy8g TWFwIGluIHRoZSBpbWFnZSBzbGljZXMuCi0gICAgICAgICAgICBpZiAoYm9yZGVySW1hZ2UtPml0 ZW0oMSkpIHsKLSAgICAgICAgICAgICAgICBpZiAoYm9yZGVySW1hZ2UtPml0ZW0oMSktPmlzQm9y ZGVySW1hZ2VTbGljZVZhbHVlKCkpIHsKLSAgICAgICAgICAgICAgICAgICAgbWFwTmluZVBpZWNl SW1hZ2VTbGljZShib3JkZXJJbWFnZS0+aXRlbSgxKSwgaW1hZ2UpOwotICAgICAgICAgICAgICAg ICAgICAgaWYgKGJvcmRlckltYWdlLT5pdGVtKDIpKQotICAgICAgICAgICAgICAgICAgICAgICAg Ly8gU2V0IHRoZSBhcHByb3ByaWF0ZSBydWxlcyBmb3Igc3RyZXRjaC9yb3VuZC9yZXBlYXQgb2Yg dGhlIHNsaWNlcwotICAgICAgICAgICAgICAgICAgICAgICAgbWFwTmluZVBpZWNlSW1hZ2VSZXBl YXQoYm9yZGVySW1hZ2UtPml0ZW0oMiksIGltYWdlKTsKLSAgICAgICAgICAgICAgICB9IGVsc2UK LSAgICAgICAgICAgICAgICAgICAgLy8gU2V0IHRoZSBhcHByb3ByaWF0ZSBydWxlcyBmb3Igc3Ry ZXRjaC9yb3VuZC9yZXBlYXQgb2YgdGhlIHNsaWNlcwotICAgICAgICAgICAgICAgICAgICBtYXBO aW5lUGllY2VJbWFnZVJlcGVhdChib3JkZXJJbWFnZS0+aXRlbSgxKSwgaW1hZ2UpOwotICAgICAg ICAgICAgfQotICAgICAgICB9IGVsc2UgewotICAgICAgICAgICAgQ1NTVmFsdWVMaXN0KiBzbGFz aExpc3QgPSBzdGF0aWNfY2FzdDxDU1NWYWx1ZUxpc3QqPihib3JkZXJJbWFnZS0+aXRlbSgxKSk7 CisgICAgICAgIGlmIChjdXJyZW50LT5pc0ltYWdlVmFsdWUoKSB8fCBjdXJyZW50LT5pc0ltYWdl R2VuZXJhdG9yVmFsdWUoKSkKKyAgICAgICAgICAgIGltYWdlLnNldEltYWdlKHN0eWxlSW1hZ2Uo aW1hZ2VQcm9wZXJ0eSwgY3VycmVudCkpOworCisgICAgICAgIGlmIChjdXJyZW50LT5pc0JvcmRl ckltYWdlU2xpY2VWYWx1ZSgpKQorICAgICAgICAgICAgbWFwTmluZVBpZWNlSW1hZ2VTbGljZShj dXJyZW50LCBpbWFnZSk7CisKKyAgICAgICAgaWYgKGN1cnJlbnQtPmlzVmFsdWVMaXN0KCkpIHsK KyAgICAgICAgICAgIENTU1ZhbHVlTGlzdCogc2xhc2hMaXN0ID0gc3RhdGljX2Nhc3Q8Q1NTVmFs dWVMaXN0Kj4oY3VycmVudCk7CiAgICAgICAgICAgICAvLyBNYXAgaW4gdGhlIGltYWdlIHNsaWNl cy4KICAgICAgICAgICAgIGlmIChzbGFzaExpc3QtPml0ZW0oMCkgJiYgc2xhc2hMaXN0LT5pdGVt KDApLT5pc0JvcmRlckltYWdlU2xpY2VWYWx1ZSgpKQogICAgICAgICAgICAgICAgIG1hcE5pbmVQ aWVjZUltYWdlU2xpY2Uoc2xhc2hMaXN0LT5pdGVtKDApLCBpbWFnZSk7CkBAIC00MzI0LDEwICs0 MzE3LDEwIEBAIHZvaWQgQ1NTU3R5bGVTZWxlY3Rvcjo6bWFwTmluZVBpZWNlSW1hZ2UoQ1NTUHJv cGVydHlJRCBwcm9wZXJ0eSwgQ1NTVmFsdWUqIHZhbHVlCiAgICAgICAgICAgICAvLyBNYXAgaW4g dGhlIG91dHNldC4KICAgICAgICAgICAgIGlmIChzbGFzaExpc3QtPml0ZW0oMikpCiAgICAgICAg ICAgICAgICAgaW1hZ2Uuc2V0T3V0c2V0KG1hcE5pbmVQaWVjZUltYWdlUXVhZChzbGFzaExpc3Qt Pml0ZW0oMikpKTsKLQotICAgICAgICAgICAgLy8gU2V0IHRoZSBhcHByb3ByaWF0ZSBydWxlcyBm b3Igc3RyZXRjaC9yb3VuZC9yZXBlYXQgb2YgdGhlIHNsaWNlcwotICAgICAgICAgICAgbWFwTmlu ZVBpZWNlSW1hZ2VSZXBlYXQoYm9yZGVySW1hZ2UtPml0ZW0oMiksIGltYWdlKTsKICAgICAgICAg fQorCisgICAgICAgIGlmIChjdXJyZW50LT5pc1ByaW1pdGl2ZVZhbHVlKCkgJiYgIWN1cnJlbnQt PmlzSW1hZ2VWYWx1ZSgpICYmICFjdXJyZW50LT5pc0ltYWdlR2VuZXJhdG9yVmFsdWUoKSkKKyAg ICAgICAgICAgIG1hcE5pbmVQaWVjZUltYWdlUmVwZWF0KGN1cnJlbnQsIGltYWdlKTsKICAgICB9 CiAKICAgICBpZiAocHJvcGVydHkgPT0gQ1NTUHJvcGVydHlXZWJraXRCb3JkZXJJbWFnZSkgewpk aWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9n CmluZGV4IDY0ZWVkZjlmMmJlZGIwOGMzZjZkZTg5NDlkZjg1Yzk5NmQwOGRjMWEuLmVhOTlmYmNj MzMxNGI3ODQyNDkzNzZlZmU4Y2ExMTIxNGJkYTM2ZTggMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3Rz L0NoYW5nZUxvZworKysgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNSBAQAor MjAxMi0wMS0yNSAgQWxleGlzIE1lbmFyZCAgPGFsZXhpcy5tZW5hcmRAb3BlbmJvc3NhLm9yZz4K KworICAgICAgICBib3JkZXItaW1hZ2Ugc2hvdWxkIG5vdCBjcmFzaCB3aGVuIHRoZSBzb3VyY2Ug aXMgbm90IHNwZWNpZmllZC4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTc3MDAxCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgQWRkIGEgbmV3IHRlc3QgdG8gY292ZXIgdGhpcyBjcmFzaCBzcGVjaWZpY2FsbHku CisKKyAgICAgICAgKiBmYXN0L2Nzcy9ib3JkZXItaW1hZ2UtbnVsbC1pbWFnZS1jcmFzaC1leHBl Y3RlZC50eHQ6IEFkZGVkLgorICAgICAgICAqIGZhc3QvY3NzL2JvcmRlci1pbWFnZS1udWxsLWlt YWdlLWNyYXNoLmh0bWw6IEFkZGVkLgorCiAyMDEyLTAxLTE2ICBSb2JlcnQgSG9nYW4gIDxyb2Jl cnRAd2Via2l0Lm9yZz4KIAogICAgICAgICBSRUdSRVNTSU9OIChyMTAyMDQwKTogV3JvbmcgY29s dW1uIHdpZHRocyB3aGVuIHJvdyBoYXMgY29sc3BhbiBhbmQgdW53cmFwcGFibGUgdGV4dApkaWZm IC0tZ2l0IGEvTGF5b3V0VGVzdHMvZmFzdC9jc3MvYm9yZGVyLWltYWdlLW51bGwtaW1hZ2UtY3Jh c2gtZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMvZmFzdC9jc3MvYm9yZGVyLWltYWdlLW51bGwt aW1hZ2UtY3Jhc2gtZXhwZWN0ZWQudHh0Cm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLjExNGFiZTEwY2FiZDU0OGNhYTMw MjZiNjAyMmE1N2VlNjBkMGFkNDUKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9mYXN0 L2Nzcy9ib3JkZXItaW1hZ2UtbnVsbC1pbWFnZS1jcmFzaC1leHBlY3RlZC50eHQKQEAgLTAsMCAr MSwxMCBAQAorVGVzdHMgdGhhdCBzaG9ydGhhbmQgYm9yZGVyLWltYWdlIHdpdGggYSBudWxsIGlt YWdlIGRvZXNuJ3QgY3Jhc2guCisKK09uIHN1Y2Nlc3MsIHlvdSB3aWxsIHNlZSBhIHNlcmllcyBv ZiAiUEFTUyIgbWVzc2FnZXMsIGZvbGxvd2VkIGJ5ICJURVNUIENPTVBMRVRFIi4KKworCitQQVNT IGNvbXB1dGVkU3R5bGUuZ2V0UHJvcGVydHlWYWx1ZSgnYm9yZGVyLWltYWdlJykgaXMgJ25vbmUn CitQQVNTIHN1Y2Nlc3NmdWxseVBhcnNlZCBpcyB0cnVlCisKK1RFU1QgQ09NUExFVEUKKwpkaWZm IC0tZ2l0IGEvTGF5b3V0VGVzdHMvZmFzdC9jc3MvYm9yZGVyLWltYWdlLW51bGwtaW1hZ2UtY3Jh c2guaHRtbCBiL0xheW91dFRlc3RzL2Zhc3QvY3NzL2JvcmRlci1pbWFnZS1udWxsLWltYWdlLWNy YXNoLmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMC4uNjUzOTU4MTM2NGVjY2U5Mjc0NDlkMGU0YmNkZGNkN2Q1ZGJm NjA1NgotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2Zhc3QvY3NzL2JvcmRlci1pbWFn ZS1udWxsLWltYWdlLWNyYXNoLmh0bWwKQEAgLTAsMCArMSwyOCBAQAorPCFET0NUWVBFIGh0bWw+ Cis8aHRtbD4KKzxoZWFkPgorPG1ldGEgY2hhcnNldD0idXRmLTgiPgorPHNjcmlwdCBzcmM9Ii4u L2pzL3Jlc291cmNlcy9qcy10ZXN0LXByZS5qcyI+PC9zY3JpcHQ+Cis8L2hlYWQ+Cis8Ym9keT4K KzxzY3JpcHQ+CisKK2Rlc2NyaXB0aW9uKCJUZXN0cyB0aGF0IHNob3J0aGFuZCBib3JkZXItaW1h Z2Ugd2l0aCBhIG51bGwgaW1hZ2UgZG9lc24ndCBjcmFzaC4iKTsKKwordmFyIHRlc3RDb250YWlu ZXIgPSBkb2N1bWVudC5jcmVhdGVFbGVtZW50KCJkaXYiKTsKK3Rlc3RDb250YWluZXIuY29udGVu dEVkaXRhYmxlID0gdHJ1ZTsKK2RvY3VtZW50LmJvZHkuYXBwZW5kQ2hpbGQodGVzdENvbnRhaW5l cik7CisKK3Rlc3RDb250YWluZXIuaW5uZXJIVE1MID0gJzxkaXYgaWQ9InRlc3QiPmhlbGxvPC9k aXY+JzsKKworZSA9IGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCd0ZXN0Jyk7Citjb21wdXRlZFN0 eWxlID0gd2luZG93LmdldENvbXB1dGVkU3R5bGUoZSwgbnVsbCk7CitlLnN0eWxlLmJvcmRlcklt YWdlID0gIjEwJSBmaWxsIjsKKworc2hvdWxkQmUoImNvbXB1dGVkU3R5bGUuZ2V0UHJvcGVydHlW YWx1ZSgnYm9yZGVyLWltYWdlJykiLCAiJ25vbmUnIik7CisKK2RvY3VtZW50LmJvZHkucmVtb3Zl Q2hpbGQodGVzdENvbnRhaW5lcik7Cis8L3NjcmlwdD4KKzxzY3JpcHQgc3JjPSIuLi9qcy9yZXNv dXJjZXMvanMtdGVzdC1wb3N0LmpzIj48L3NjcmlwdD4KKzwvYm9keT4KKzwvaHRtbD4K 123946 2012-01-25 08:42:09 -0800 2012-01-25 09:09:18 -0800 Patch bug-77001-20120125134157.patch text/plain 7230 menard U3VidmVyc2lvbiBSZXZpc2lvbjogMTA1ODYyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNzZkZTk0M2NhNTcwM2Zl ZmJhMTcwZjdlOWYyZGMyZTM4OTc1MzAyYy4uZDI4MWU1MGU1ZDI3NWRjM2NkOTI3YzJkOTllMzg0 ZDViODlkZWU3NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDEyLTAxLTI1ICBBbGV4 aXMgTWVuYXJkICA8YWxleGlzLm1lbmFyZEBvcGVuYm9zc2Eub3JnPgorCisgICAgICAgIGJvcmRl ci1pbWFnZSBzaG91bGQgbm90IGNyYXNoIHdoZW4gdGhlIHNvdXJjZSBpcyBub3Qgc3BlY2lmaWVk LgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NzcwMDEK KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGlzIGJ1 ZyB3YXMgaW50cm9kdWNlZCBieSByMTA1NTAyIGJ1dCB3YXMgZXhwb3NlZCBieSByMTA1NzM4Lgor ICAgICAgICBUaGUgaW1hZ2Utc291cmNlIG9mIGEgYm9yZGVyLWltYWdlIGlzIG5vdCBtYW5kYXRv cnkgdGhlcmVmb3JlIGl0CisgICAgICAgIG1heSBoYXBwZW4gdGhhdCB5b3UgaGF2ZSBubyB2YWx1 ZSBzZXQgZm9yIGl0LiBXZWJDb3JlOjpjcmVhdGVCb3JkZXJJbWFnZVZhbHVlCisgICAgICAgIHdh cyB3cm9uZ2x5IGFzc3VtaW5nIHRoYXQgdGhlIGltYWdlIGlzIGFsd2F5cyBzZXQuIFRoaXMgcHJv YmxlbSBhbHNvIHJlcXVpcmVkIGEgYml0CisgICAgICAgIG9mIHJlZmFjdG9yaW5nIGluIENTU1N0 eWxlU2VsZWN0b3I6Om1hcE5pbmVQaWVjZUltYWdlIHRvIHRha2UgaW50byBhY2NvdW50IHRoYXQK KyAgICAgICAgdGhlIGltYWdlIGNvdWxkIGJlIG9wdGlvbmFsIChqdXN0IGxpa2Ugb3RoZXIgcHJv cGVydGllcykuCisKKyAgICAgICAgVGVzdDogZmFzdC9jc3MvYm9yZGVyLWltYWdlLW51bGwtaW1h Z2UtY3Jhc2guaHRtbAorCisgICAgICAgICogY3NzL0NTU0JvcmRlckltYWdlLmNwcDoKKyAgICAg ICAgKFdlYkNvcmU6OmNyZWF0ZUJvcmRlckltYWdlVmFsdWUpOgorICAgICAgICAqIGNzcy9DU1NT dHlsZVNlbGVjdG9yLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkNTU1N0eWxlU2VsZWN0b3I6Om1h cE5pbmVQaWVjZUltYWdlKToKKwogMjAxMi0wMS0yNSAgQW50b24gTXVoaW4gIDxhbnRvbm1AY2hy b21pdW0ub3JnPgogCiAgICAgICAgIFVucmV2aWV3IG1hbnVhbCByZXZlcnQgb2YgcjEwNTg0My4K ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NCb3JkZXJJbWFnZS5jcHAgYi9Tb3Vy Y2UvV2ViQ29yZS9jc3MvQ1NTQm9yZGVySW1hZ2UuY3BwCmluZGV4IDNiNjZjNmIyMmI1MDVkYWMy NzY1NTk0ZjljNDRjNDk3Y2VjYjgxMzEuLmFjM2U1MWVmMTdiYWFmM2ZhNmQyYTIwMTdmNGMyMjU5 ZTcwYzgyOTcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NCb3JkZXJJbWFnZS5j cHAKKysrIGIvU291cmNlL1dlYkNvcmUvY3NzL0NTU0JvcmRlckltYWdlLmNwcApAQCAtMjYsNyAr MjYsOCBAQCBQYXNzUmVmUHRyPENTU1ZhbHVlTGlzdD4gY3JlYXRlQm9yZGVySW1hZ2VWYWx1ZShQ YXNzUmVmUHRyPENTU1ZhbHVlPiBpbWFnZSwgUGFzcwogICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgUGFzc1JlZlB0cjxDU1NWYWx1ZT4gb3V0c2V0LCBQYXNz UmVmUHRyPENTU1ZhbHVlPiByZXBlYXQpCiB7CiAgICAgUmVmUHRyPENTU1ZhbHVlTGlzdD4gbGlz dCA9IENTU1ZhbHVlTGlzdDo6Y3JlYXRlU3BhY2VTZXBhcmF0ZWQoKTsKLSAgICBsaXN0LT5hcHBl bmQoaW1hZ2UpOworICAgIGlmIChpbWFnZSkKKyAgICAgICAgbGlzdC0+YXBwZW5kKGltYWdlKTsK IAogICAgIGlmIChib3JkZXJTbGljZSB8fCBvdXRzZXQpIHsKICAgICAgICAgUmVmUHRyPENTU1Zh bHVlTGlzdD4gbGlzdFNsYXNoID0gQ1NTVmFsdWVMaXN0OjpjcmVhdGVTbGFzaFNlcGFyYXRlZCgp OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvY3NzL0NTU1N0eWxlU2VsZWN0b3IuY3BwIGIv U291cmNlL1dlYkNvcmUvY3NzL0NTU1N0eWxlU2VsZWN0b3IuY3BwCmluZGV4IDhkNDRjYTYyMTFl N2VkODNjYWZlNTM1OWQxMzM3NmQxNGMwZWZjMjMuLmQzMGE3ZTNlZjUwZWRlZDQyNDIyMDc3ODI5 MzU0OGZkNzU5MWZmMTkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NTdHlsZVNl bGVjdG9yLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTU3R5bGVTZWxlY3Rvci5jcHAK QEAgLTQyOTUsMjQgKzQyOTUsMTcgQEAgdm9pZCBDU1NTdHlsZVNlbGVjdG9yOjptYXBOaW5lUGll Y2VJbWFnZShDU1NQcm9wZXJ0eUlEIHByb3BlcnR5LCBDU1NWYWx1ZSogdmFsdWUKICAgICBlbHNl CiAgICAgICAgIGltYWdlUHJvcGVydHkgPSBwcm9wZXJ0eTsKIAotICAgIGlmIChDU1NWYWx1ZSog aW1hZ2VWYWx1ZSA9IGJvcmRlckltYWdlLT5pdGVtKDApKQotICAgICAgICBpbWFnZS5zZXRJbWFn ZShzdHlsZUltYWdlKGltYWdlUHJvcGVydHksIGltYWdlVmFsdWUpKTsKKyAgICBmb3IgKHVuc2ln bmVkIGkgPSAwIDsgaSA8IGJvcmRlckltYWdlLT5sZW5ndGgoKSA7ICsraSkgeworICAgICAgICBD U1NWYWx1ZSogY3VycmVudCA9IGJvcmRlckltYWdlLT5pdGVtKGkpOwogCi0gICAgaWYgKGJvcmRl ckltYWdlLT5pdGVtKDEpKSB7Ci0gICAgICAgIGlmIChib3JkZXJJbWFnZS0+aXRlbSgxKS0+Y3Nz VmFsdWVUeXBlKCkgIT0gQ1NTVmFsdWU6OkNTU19WQUxVRV9MSVNUKSB7Ci0gICAgICAgICAgICAv LyBNYXAgaW4gdGhlIGltYWdlIHNsaWNlcy4KLSAgICAgICAgICAgIGlmIChib3JkZXJJbWFnZS0+ aXRlbSgxKSkgewotICAgICAgICAgICAgICAgIGlmIChib3JkZXJJbWFnZS0+aXRlbSgxKS0+aXNC b3JkZXJJbWFnZVNsaWNlVmFsdWUoKSkgewotICAgICAgICAgICAgICAgICAgICBtYXBOaW5lUGll Y2VJbWFnZVNsaWNlKGJvcmRlckltYWdlLT5pdGVtKDEpLCBpbWFnZSk7Ci0gICAgICAgICAgICAg ICAgICAgICBpZiAoYm9yZGVySW1hZ2UtPml0ZW0oMikpCi0gICAgICAgICAgICAgICAgICAgICAg ICAvLyBTZXQgdGhlIGFwcHJvcHJpYXRlIHJ1bGVzIGZvciBzdHJldGNoL3JvdW5kL3JlcGVhdCBv ZiB0aGUgc2xpY2VzCi0gICAgICAgICAgICAgICAgICAgICAgICBtYXBOaW5lUGllY2VJbWFnZVJl cGVhdChib3JkZXJJbWFnZS0+aXRlbSgyKSwgaW1hZ2UpOwotICAgICAgICAgICAgICAgIH0gZWxz ZQotICAgICAgICAgICAgICAgICAgICAvLyBTZXQgdGhlIGFwcHJvcHJpYXRlIHJ1bGVzIGZvciBz dHJldGNoL3JvdW5kL3JlcGVhdCBvZiB0aGUgc2xpY2VzCi0gICAgICAgICAgICAgICAgICAgIG1h cE5pbmVQaWVjZUltYWdlUmVwZWF0KGJvcmRlckltYWdlLT5pdGVtKDEpLCBpbWFnZSk7Ci0gICAg ICAgICAgICB9Ci0gICAgICAgIH0gZWxzZSB7Ci0gICAgICAgICAgICBDU1NWYWx1ZUxpc3QqIHNs YXNoTGlzdCA9IHN0YXRpY19jYXN0PENTU1ZhbHVlTGlzdCo+KGJvcmRlckltYWdlLT5pdGVtKDEp KTsKKyAgICAgICAgaWYgKGN1cnJlbnQtPmlzSW1hZ2VWYWx1ZSgpIHx8IGN1cnJlbnQtPmlzSW1h Z2VHZW5lcmF0b3JWYWx1ZSgpKQorICAgICAgICAgICAgaW1hZ2Uuc2V0SW1hZ2Uoc3R5bGVJbWFn ZShpbWFnZVByb3BlcnR5LCBjdXJyZW50KSk7CisKKyAgICAgICAgaWYgKGN1cnJlbnQtPmlzQm9y ZGVySW1hZ2VTbGljZVZhbHVlKCkpCisgICAgICAgICAgICBtYXBOaW5lUGllY2VJbWFnZVNsaWNl KGN1cnJlbnQsIGltYWdlKTsKKworICAgICAgICBpZiAoY3VycmVudC0+aXNWYWx1ZUxpc3QoKSkg eworICAgICAgICAgICAgQ1NTVmFsdWVMaXN0KiBzbGFzaExpc3QgPSBzdGF0aWNfY2FzdDxDU1NW YWx1ZUxpc3QqPihjdXJyZW50KTsKICAgICAgICAgICAgIC8vIE1hcCBpbiB0aGUgaW1hZ2Ugc2xp Y2VzLgogICAgICAgICAgICAgaWYgKHNsYXNoTGlzdC0+aXRlbSgwKSAmJiBzbGFzaExpc3QtPml0 ZW0oMCktPmlzQm9yZGVySW1hZ2VTbGljZVZhbHVlKCkpCiAgICAgICAgICAgICAgICAgbWFwTmlu ZVBpZWNlSW1hZ2VTbGljZShzbGFzaExpc3QtPml0ZW0oMCksIGltYWdlKTsKQEAgLTQzMjQsMTAg KzQzMTcsMTAgQEAgdm9pZCBDU1NTdHlsZVNlbGVjdG9yOjptYXBOaW5lUGllY2VJbWFnZShDU1NQ cm9wZXJ0eUlEIHByb3BlcnR5LCBDU1NWYWx1ZSogdmFsdWUKICAgICAgICAgICAgIC8vIE1hcCBp biB0aGUgb3V0c2V0LgogICAgICAgICAgICAgaWYgKHNsYXNoTGlzdC0+aXRlbSgyKSkKICAgICAg ICAgICAgICAgICBpbWFnZS5zZXRPdXRzZXQobWFwTmluZVBpZWNlSW1hZ2VRdWFkKHNsYXNoTGlz dC0+aXRlbSgyKSkpOwotCi0gICAgICAgICAgICAvLyBTZXQgdGhlIGFwcHJvcHJpYXRlIHJ1bGVz IGZvciBzdHJldGNoL3JvdW5kL3JlcGVhdCBvZiB0aGUgc2xpY2VzCi0gICAgICAgICAgICBtYXBO aW5lUGllY2VJbWFnZVJlcGVhdChib3JkZXJJbWFnZS0+aXRlbSgyKSwgaW1hZ2UpOwogICAgICAg ICB9CisKKyAgICAgICAgaWYgKGN1cnJlbnQtPmlzUHJpbWl0aXZlVmFsdWUoKSAmJiAhY3VycmVu dC0+aXNJbWFnZVZhbHVlKCkpCisgICAgICAgICAgICBtYXBOaW5lUGllY2VJbWFnZVJlcGVhdChj dXJyZW50LCBpbWFnZSk7CiAgICAgfQogCiAgICAgaWYgKHByb3BlcnR5ID09IENTU1Byb3BlcnR5 V2Via2l0Qm9yZGVySW1hZ2UpIHsKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBi L0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCBiYTNiNjJjOWMzNjg5MDc2Njg2M2EyN2IzNmZj NmVmNmI4ZDk1MjQ3Li4wYmJhNGYwNzhmNTZlMDlmY2UyYTlhYmUwNjE2ZjQyNDcyMWUyM2M4IDEw MDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdl TG9nCkBAIC0xLDMgKzEsMTUgQEAKKzIwMTItMDEtMjUgIEFsZXhpcyBNZW5hcmQgIDxhbGV4aXMu bWVuYXJkQG9wZW5ib3NzYS5vcmc+CisKKyAgICAgICAgYm9yZGVyLWltYWdlIHNob3VsZCBub3Qg Y3Jhc2ggd2hlbiB0aGUgc291cmNlIGlzIG5vdCBzcGVjaWZpZWQuCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD03NzAwMQorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFkZCBhIG5ldyB0ZXN0IHRvIGNvdmVyIHRo aXMgY3Jhc2ggc3BlY2lmaWNhbGx5LgorCisgICAgICAgICogZmFzdC9jc3MvYm9yZGVyLWltYWdl LW51bGwtaW1hZ2UtY3Jhc2gtZXhwZWN0ZWQudHh0OiBBZGRlZC4KKyAgICAgICAgKiBmYXN0L2Nz cy9ib3JkZXItaW1hZ2UtbnVsbC1pbWFnZS1jcmFzaC5odG1sOiBBZGRlZC4KKwogMjAxMi0wMS0y NSAgTm9lbCBHb3Jkb24gIDxub2VsLmdvcmRvbkBnbWFpbC5jb20+CiAKICAgICAgICAgW2Nocm9t aXVtXSBmYXN0L2Nzcy90ZXh0LW92ZXJmbG93LWlucHV0Lmh0bWwgcmViYXNlbGluZQpkaWZmIC0t Z2l0IGEvTGF5b3V0VGVzdHMvZmFzdC9jc3MvYm9yZGVyLWltYWdlLW51bGwtaW1hZ2UtY3Jhc2gt ZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMvZmFzdC9jc3MvYm9yZGVyLWltYWdlLW51bGwtaW1h Z2UtY3Jhc2gtZXhwZWN0ZWQudHh0Cm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLjExNGFiZTEwY2FiZDU0OGNhYTMwMjZi NjAyMmE1N2VlNjBkMGFkNDUKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9mYXN0L2Nz cy9ib3JkZXItaW1hZ2UtbnVsbC1pbWFnZS1jcmFzaC1leHBlY3RlZC50eHQKQEAgLTAsMCArMSwx MCBAQAorVGVzdHMgdGhhdCBzaG9ydGhhbmQgYm9yZGVyLWltYWdlIHdpdGggYSBudWxsIGltYWdl IGRvZXNuJ3QgY3Jhc2guCisKK09uIHN1Y2Nlc3MsIHlvdSB3aWxsIHNlZSBhIHNlcmllcyBvZiAi UEFTUyIgbWVzc2FnZXMsIGZvbGxvd2VkIGJ5ICJURVNUIENPTVBMRVRFIi4KKworCitQQVNTIGNv bXB1dGVkU3R5bGUuZ2V0UHJvcGVydHlWYWx1ZSgnYm9yZGVyLWltYWdlJykgaXMgJ25vbmUnCitQ QVNTIHN1Y2Nlc3NmdWxseVBhcnNlZCBpcyB0cnVlCisKK1RFU1QgQ09NUExFVEUKKwpkaWZmIC0t Z2l0IGEvTGF5b3V0VGVzdHMvZmFzdC9jc3MvYm9yZGVyLWltYWdlLW51bGwtaW1hZ2UtY3Jhc2gu aHRtbCBiL0xheW91dFRlc3RzL2Zhc3QvY3NzL2JvcmRlci1pbWFnZS1udWxsLWltYWdlLWNyYXNo Lmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMC4uNjUzOTU4MTM2NGVjY2U5Mjc0NDlkMGU0YmNkZGNkN2Q1ZGJmNjA1 NgotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2Zhc3QvY3NzL2JvcmRlci1pbWFnZS1u dWxsLWltYWdlLWNyYXNoLmh0bWwKQEAgLTAsMCArMSwyOCBAQAorPCFET0NUWVBFIGh0bWw+Cis8 aHRtbD4KKzxoZWFkPgorPG1ldGEgY2hhcnNldD0idXRmLTgiPgorPHNjcmlwdCBzcmM9Ii4uL2pz L3Jlc291cmNlcy9qcy10ZXN0LXByZS5qcyI+PC9zY3JpcHQ+Cis8L2hlYWQ+Cis8Ym9keT4KKzxz Y3JpcHQ+CisKK2Rlc2NyaXB0aW9uKCJUZXN0cyB0aGF0IHNob3J0aGFuZCBib3JkZXItaW1hZ2Ug d2l0aCBhIG51bGwgaW1hZ2UgZG9lc24ndCBjcmFzaC4iKTsKKwordmFyIHRlc3RDb250YWluZXIg PSBkb2N1bWVudC5jcmVhdGVFbGVtZW50KCJkaXYiKTsKK3Rlc3RDb250YWluZXIuY29udGVudEVk aXRhYmxlID0gdHJ1ZTsKK2RvY3VtZW50LmJvZHkuYXBwZW5kQ2hpbGQodGVzdENvbnRhaW5lcik7 CisKK3Rlc3RDb250YWluZXIuaW5uZXJIVE1MID0gJzxkaXYgaWQ9InRlc3QiPmhlbGxvPC9kaXY+ JzsKKworZSA9IGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCd0ZXN0Jyk7Citjb21wdXRlZFN0eWxl ID0gd2luZG93LmdldENvbXB1dGVkU3R5bGUoZSwgbnVsbCk7CitlLnN0eWxlLmJvcmRlckltYWdl ID0gIjEwJSBmaWxsIjsKKworc2hvdWxkQmUoImNvbXB1dGVkU3R5bGUuZ2V0UHJvcGVydHlWYWx1 ZSgnYm9yZGVyLWltYWdlJykiLCAiJ25vbmUnIik7CisKK2RvY3VtZW50LmJvZHkucmVtb3ZlQ2hp bGQodGVzdENvbnRhaW5lcik7Cis8L3NjcmlwdD4KKzxzY3JpcHQgc3JjPSIuLi9qcy9yZXNvdXJj ZXMvanMtdGVzdC1wb3N0LmpzIj48L3NjcmlwdD4KKzwvYm9keT4KKzwvaHRtbD4K 123951 2012-01-25 09:09:26 -0800 2012-01-25 09:14:08 -0800 Patch bug-77001-20120125140914.patch text/plain 7822 menard U3VidmVyc2lvbiBSZXZpc2lvbjogMTA1ODYyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNzZkZTk0M2NhNTcwM2Zl ZmJhMTcwZjdlOWYyZGMyZTM4OTc1MzAyYy4uZDI4MWU1MGU1ZDI3NWRjM2NkOTI3YzJkOTllMzg0 ZDViODlkZWU3NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDEyLTAxLTI1ICBBbGV4 aXMgTWVuYXJkICA8YWxleGlzLm1lbmFyZEBvcGVuYm9zc2Eub3JnPgorCisgICAgICAgIGJvcmRl ci1pbWFnZSBzaG91bGQgbm90IGNyYXNoIHdoZW4gdGhlIHNvdXJjZSBpcyBub3Qgc3BlY2lmaWVk LgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NzcwMDEK KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGlzIGJ1 ZyB3YXMgaW50cm9kdWNlZCBieSByMTA1NTAyIGJ1dCB3YXMgZXhwb3NlZCBieSByMTA1NzM4Lgor ICAgICAgICBUaGUgaW1hZ2Utc291cmNlIG9mIGEgYm9yZGVyLWltYWdlIGlzIG5vdCBtYW5kYXRv cnkgdGhlcmVmb3JlIGl0CisgICAgICAgIG1heSBoYXBwZW4gdGhhdCB5b3UgaGF2ZSBubyB2YWx1 ZSBzZXQgZm9yIGl0LiBXZWJDb3JlOjpjcmVhdGVCb3JkZXJJbWFnZVZhbHVlCisgICAgICAgIHdh cyB3cm9uZ2x5IGFzc3VtaW5nIHRoYXQgdGhlIGltYWdlIGlzIGFsd2F5cyBzZXQuIFRoaXMgcHJv YmxlbSBhbHNvIHJlcXVpcmVkIGEgYml0CisgICAgICAgIG9mIHJlZmFjdG9yaW5nIGluIENTU1N0 eWxlU2VsZWN0b3I6Om1hcE5pbmVQaWVjZUltYWdlIHRvIHRha2UgaW50byBhY2NvdW50IHRoYXQK KyAgICAgICAgdGhlIGltYWdlIGNvdWxkIGJlIG9wdGlvbmFsIChqdXN0IGxpa2Ugb3RoZXIgcHJv cGVydGllcykuCisKKyAgICAgICAgVGVzdDogZmFzdC9jc3MvYm9yZGVyLWltYWdlLW51bGwtaW1h Z2UtY3Jhc2guaHRtbAorCisgICAgICAgICogY3NzL0NTU0JvcmRlckltYWdlLmNwcDoKKyAgICAg ICAgKFdlYkNvcmU6OmNyZWF0ZUJvcmRlckltYWdlVmFsdWUpOgorICAgICAgICAqIGNzcy9DU1NT dHlsZVNlbGVjdG9yLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkNTU1N0eWxlU2VsZWN0b3I6Om1h cE5pbmVQaWVjZUltYWdlKToKKwogMjAxMi0wMS0yNSAgQW50b24gTXVoaW4gIDxhbnRvbm1AY2hy b21pdW0ub3JnPgogCiAgICAgICAgIFVucmV2aWV3IG1hbnVhbCByZXZlcnQgb2YgcjEwNTg0My4K ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NCb3JkZXJJbWFnZS5jcHAgYi9Tb3Vy Y2UvV2ViQ29yZS9jc3MvQ1NTQm9yZGVySW1hZ2UuY3BwCmluZGV4IDNiNjZjNmIyMmI1MDVkYWMy NzY1NTk0ZjljNDRjNDk3Y2VjYjgxMzEuLmFjM2U1MWVmMTdiYWFmM2ZhNmQyYTIwMTdmNGMyMjU5 ZTcwYzgyOTcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NCb3JkZXJJbWFnZS5j cHAKKysrIGIvU291cmNlL1dlYkNvcmUvY3NzL0NTU0JvcmRlckltYWdlLmNwcApAQCAtMjYsNyAr MjYsOCBAQCBQYXNzUmVmUHRyPENTU1ZhbHVlTGlzdD4gY3JlYXRlQm9yZGVySW1hZ2VWYWx1ZShQ YXNzUmVmUHRyPENTU1ZhbHVlPiBpbWFnZSwgUGFzcwogICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgUGFzc1JlZlB0cjxDU1NWYWx1ZT4gb3V0c2V0LCBQYXNz UmVmUHRyPENTU1ZhbHVlPiByZXBlYXQpCiB7CiAgICAgUmVmUHRyPENTU1ZhbHVlTGlzdD4gbGlz dCA9IENTU1ZhbHVlTGlzdDo6Y3JlYXRlU3BhY2VTZXBhcmF0ZWQoKTsKLSAgICBsaXN0LT5hcHBl bmQoaW1hZ2UpOworICAgIGlmIChpbWFnZSkKKyAgICAgICAgbGlzdC0+YXBwZW5kKGltYWdlKTsK IAogICAgIGlmIChib3JkZXJTbGljZSB8fCBvdXRzZXQpIHsKICAgICAgICAgUmVmUHRyPENTU1Zh bHVlTGlzdD4gbGlzdFNsYXNoID0gQ1NTVmFsdWVMaXN0OjpjcmVhdGVTbGFzaFNlcGFyYXRlZCgp OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvY3NzL0NTU1N0eWxlU2VsZWN0b3IuY3BwIGIv U291cmNlL1dlYkNvcmUvY3NzL0NTU1N0eWxlU2VsZWN0b3IuY3BwCmluZGV4IDhkNDRjYTYyMTFl N2VkODNjYWZlNTM1OWQxMzM3NmQxNGMwZWZjMjMuLmRiYWNmMDc0NDlhMzEyMDA1ZTk0NzFiNTVl MjYxZDhiM2NlMWY5MDQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NTdHlsZVNl bGVjdG9yLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTU3R5bGVTZWxlY3Rvci5jcHAK QEAgLTQyNzksOCArNDI3OSw4IEBAIHZvaWQgQ1NTU3R5bGVTZWxlY3Rvcjo6bWFwQW5pbWF0aW9u VGltaW5nRnVuY3Rpb24oQW5pbWF0aW9uKiBhbmltYXRpb24sIENTU1ZhbHVlCiAKIHZvaWQgQ1NT U3R5bGVTZWxlY3Rvcjo6bWFwTmluZVBpZWNlSW1hZ2UoQ1NTUHJvcGVydHlJRCBwcm9wZXJ0eSwg Q1NTVmFsdWUqIHZhbHVlLCBOaW5lUGllY2VJbWFnZSYgaW1hZ2UpCiB7Ci0gICAgLy8gSWYgd2Un cmUgYSBwcmltaXRpdmUgdmFsdWUsIHRoZW4gd2UgYXJlICJub25lIiBhbmQgZG9uJ3QgbmVlZCB0 byBhbHRlciB0aGUgZW1wdHkgaW1hZ2UgYXQgYWxsLgotICAgIGlmICghdmFsdWUgfHwgdmFsdWUt PmlzUHJpbWl0aXZlVmFsdWUoKSkKKyAgICAvLyBJZiB3ZSdyZSBub3QgYSB2YWx1ZSBsaXN0LCB0 aGVuIHdlIGFyZSAibm9uZSIgYW5kIGRvbid0IG5lZWQgdG8gYWx0ZXIgdGhlIGVtcHR5IGltYWdl IGF0IGFsbC4KKyAgICBpZiAoIXZhbHVlIHx8ICF2YWx1ZS0+aXNWYWx1ZUxpc3QoKSkKICAgICAg ICAgcmV0dXJuOwogCiAgICAgLy8gUmV0cmlldmUgdGhlIGJvcmRlciBpbWFnZSB2YWx1ZS4KQEAg LTQyOTUsMjQgKzQyOTUsMTUgQEAgdm9pZCBDU1NTdHlsZVNlbGVjdG9yOjptYXBOaW5lUGllY2VJ bWFnZShDU1NQcm9wZXJ0eUlEIHByb3BlcnR5LCBDU1NWYWx1ZSogdmFsdWUKICAgICBlbHNlCiAg ICAgICAgIGltYWdlUHJvcGVydHkgPSBwcm9wZXJ0eTsKIAotICAgIGlmIChDU1NWYWx1ZSogaW1h Z2VWYWx1ZSA9IGJvcmRlckltYWdlLT5pdGVtKDApKQotICAgICAgICBpbWFnZS5zZXRJbWFnZShz dHlsZUltYWdlKGltYWdlUHJvcGVydHksIGltYWdlVmFsdWUpKTsKKyAgICBmb3IgKHVuc2lnbmVk IGkgPSAwIDsgaSA8IGJvcmRlckltYWdlLT5sZW5ndGgoKSA7ICsraSkgeworICAgICAgICBDU1NW YWx1ZSogY3VycmVudCA9IGJvcmRlckltYWdlLT5pdGVtKGkpOwogCi0gICAgaWYgKGJvcmRlcklt YWdlLT5pdGVtKDEpKSB7Ci0gICAgICAgIGlmIChib3JkZXJJbWFnZS0+aXRlbSgxKS0+Y3NzVmFs dWVUeXBlKCkgIT0gQ1NTVmFsdWU6OkNTU19WQUxVRV9MSVNUKSB7Ci0gICAgICAgICAgICAvLyBN YXAgaW4gdGhlIGltYWdlIHNsaWNlcy4KLSAgICAgICAgICAgIGlmIChib3JkZXJJbWFnZS0+aXRl bSgxKSkgewotICAgICAgICAgICAgICAgIGlmIChib3JkZXJJbWFnZS0+aXRlbSgxKS0+aXNCb3Jk ZXJJbWFnZVNsaWNlVmFsdWUoKSkgewotICAgICAgICAgICAgICAgICAgICBtYXBOaW5lUGllY2VJ bWFnZVNsaWNlKGJvcmRlckltYWdlLT5pdGVtKDEpLCBpbWFnZSk7Ci0gICAgICAgICAgICAgICAg ICAgICBpZiAoYm9yZGVySW1hZ2UtPml0ZW0oMikpCi0gICAgICAgICAgICAgICAgICAgICAgICAv LyBTZXQgdGhlIGFwcHJvcHJpYXRlIHJ1bGVzIGZvciBzdHJldGNoL3JvdW5kL3JlcGVhdCBvZiB0 aGUgc2xpY2VzCi0gICAgICAgICAgICAgICAgICAgICAgICBtYXBOaW5lUGllY2VJbWFnZVJlcGVh dChib3JkZXJJbWFnZS0+aXRlbSgyKSwgaW1hZ2UpOwotICAgICAgICAgICAgICAgIH0gZWxzZQot ICAgICAgICAgICAgICAgICAgICAvLyBTZXQgdGhlIGFwcHJvcHJpYXRlIHJ1bGVzIGZvciBzdHJl dGNoL3JvdW5kL3JlcGVhdCBvZiB0aGUgc2xpY2VzCi0gICAgICAgICAgICAgICAgICAgIG1hcE5p bmVQaWVjZUltYWdlUmVwZWF0KGJvcmRlckltYWdlLT5pdGVtKDEpLCBpbWFnZSk7Ci0gICAgICAg ICAgICB9Ci0gICAgICAgIH0gZWxzZSB7Ci0gICAgICAgICAgICBDU1NWYWx1ZUxpc3QqIHNsYXNo TGlzdCA9IHN0YXRpY19jYXN0PENTU1ZhbHVlTGlzdCo+KGJvcmRlckltYWdlLT5pdGVtKDEpKTsK KyAgICAgICAgaWYgKGN1cnJlbnQtPmlzSW1hZ2VWYWx1ZSgpIHx8IGN1cnJlbnQtPmlzSW1hZ2VH ZW5lcmF0b3JWYWx1ZSgpKQorICAgICAgICAgICAgaW1hZ2Uuc2V0SW1hZ2Uoc3R5bGVJbWFnZShp bWFnZVByb3BlcnR5LCBjdXJyZW50KSk7CisgICAgICAgIGVsc2UgaWYgKGN1cnJlbnQtPmlzQm9y ZGVySW1hZ2VTbGljZVZhbHVlKCkpCisgICAgICAgICAgICBtYXBOaW5lUGllY2VJbWFnZVNsaWNl KGN1cnJlbnQsIGltYWdlKTsKKyAgICAgICAgZWxzZSBpZiAoY3VycmVudC0+aXNWYWx1ZUxpc3Qo KSkgeworICAgICAgICAgICAgQ1NTVmFsdWVMaXN0KiBzbGFzaExpc3QgPSBzdGF0aWNfY2FzdDxD U1NWYWx1ZUxpc3QqPihjdXJyZW50KTsKICAgICAgICAgICAgIC8vIE1hcCBpbiB0aGUgaW1hZ2Ug c2xpY2VzLgogICAgICAgICAgICAgaWYgKHNsYXNoTGlzdC0+aXRlbSgwKSAmJiBzbGFzaExpc3Qt Pml0ZW0oMCktPmlzQm9yZGVySW1hZ2VTbGljZVZhbHVlKCkpCiAgICAgICAgICAgICAgICAgbWFw TmluZVBpZWNlSW1hZ2VTbGljZShzbGFzaExpc3QtPml0ZW0oMCksIGltYWdlKTsKQEAgLTQzMjQs MTAgKzQzMTUsOSBAQCB2b2lkIENTU1N0eWxlU2VsZWN0b3I6Om1hcE5pbmVQaWVjZUltYWdlKENT U1Byb3BlcnR5SUQgcHJvcGVydHksIENTU1ZhbHVlKiB2YWx1ZQogICAgICAgICAgICAgLy8gTWFw IGluIHRoZSBvdXRzZXQuCiAgICAgICAgICAgICBpZiAoc2xhc2hMaXN0LT5pdGVtKDIpKQogICAg ICAgICAgICAgICAgIGltYWdlLnNldE91dHNldChtYXBOaW5lUGllY2VJbWFnZVF1YWQoc2xhc2hM aXN0LT5pdGVtKDIpKSk7Ci0KLSAgICAgICAgICAgIC8vIFNldCB0aGUgYXBwcm9wcmlhdGUgcnVs ZXMgZm9yIHN0cmV0Y2gvcm91bmQvcmVwZWF0IG9mIHRoZSBzbGljZXMKLSAgICAgICAgICAgIG1h cE5pbmVQaWVjZUltYWdlUmVwZWF0KGJvcmRlckltYWdlLT5pdGVtKDIpLCBpbWFnZSk7Ci0gICAg ICAgIH0KKyAgICAgICAgfSBlbHNlIGlmIChjdXJyZW50LT5pc1ByaW1pdGl2ZVZhbHVlKCkpCisg ICAgICAgICAgICAvLyBTZXQgdGhlIGFwcHJvcHJpYXRlIHJ1bGVzIGZvciBzdHJldGNoL3JvdW5k L3JlcGVhdCBvZiB0aGUgc2xpY2VzLgorICAgICAgICAgICAgbWFwTmluZVBpZWNlSW1hZ2VSZXBl YXQoY3VycmVudCwgaW1hZ2UpOwogICAgIH0KIAogICAgIGlmIChwcm9wZXJ0eSA9PSBDU1NQcm9w ZXJ0eVdlYmtpdEJvcmRlckltYWdlKSB7CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggYmEzYjYyYzljMzY4OTA3NjY4NjNhMjdi MzZmYzZlZjZiOGQ5NTI0Ny4uMGJiYTRmMDc4ZjU2ZTA5ZmNlMmE5YWJlMDYxNmY0MjQ3MjFlMjNj OCAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3RzL0No YW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDEyLTAxLTI1ICBBbGV4aXMgTWVuYXJkICA8YWxl eGlzLm1lbmFyZEBvcGVuYm9zc2Eub3JnPgorCisgICAgICAgIGJvcmRlci1pbWFnZSBzaG91bGQg bm90IGNyYXNoIHdoZW4gdGhlIHNvdXJjZSBpcyBub3Qgc3BlY2lmaWVkLgorICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NzcwMDEKKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBZGQgYSBuZXcgdGVzdCB0byBjb3Zl ciB0aGlzIGNyYXNoIHNwZWNpZmljYWxseS4KKworICAgICAgICAqIGZhc3QvY3NzL2JvcmRlci1p bWFnZS1udWxsLWltYWdlLWNyYXNoLWV4cGVjdGVkLnR4dDogQWRkZWQuCisgICAgICAgICogZmFz dC9jc3MvYm9yZGVyLWltYWdlLW51bGwtaW1hZ2UtY3Jhc2guaHRtbDogQWRkZWQuCisKIDIwMTIt MDEtMjUgIE5vZWwgR29yZG9uICA8bm9lbC5nb3Jkb25AZ21haWwuY29tPgogCiAgICAgICAgIFtj aHJvbWl1bV0gZmFzdC9jc3MvdGV4dC1vdmVyZmxvdy1pbnB1dC5odG1sIHJlYmFzZWxpbmUKZGlm ZiAtLWdpdCBhL0xheW91dFRlc3RzL2Zhc3QvY3NzL2JvcmRlci1pbWFnZS1udWxsLWltYWdlLWNy YXNoLWV4cGVjdGVkLnR4dCBiL0xheW91dFRlc3RzL2Zhc3QvY3NzL2JvcmRlci1pbWFnZS1udWxs LWltYWdlLWNyYXNoLWV4cGVjdGVkLnR4dApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi4xMTRhYmUxMGNhYmQ1NDhjYWEz MDI2YjYwMjJhNTdlZTYwZDBhZDQ1Ci0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvZmFz dC9jc3MvYm9yZGVyLWltYWdlLW51bGwtaW1hZ2UtY3Jhc2gtZXhwZWN0ZWQudHh0CkBAIC0wLDAg KzEsMTAgQEAKK1Rlc3RzIHRoYXQgc2hvcnRoYW5kIGJvcmRlci1pbWFnZSB3aXRoIGEgbnVsbCBp bWFnZSBkb2Vzbid0IGNyYXNoLgorCitPbiBzdWNjZXNzLCB5b3Ugd2lsbCBzZWUgYSBzZXJpZXMg b2YgIlBBU1MiIG1lc3NhZ2VzLCBmb2xsb3dlZCBieSAiVEVTVCBDT01QTEVURSIuCisKKworUEFT UyBjb21wdXRlZFN0eWxlLmdldFByb3BlcnR5VmFsdWUoJ2JvcmRlci1pbWFnZScpIGlzICdub25l JworUEFTUyBzdWNjZXNzZnVsbHlQYXJzZWQgaXMgdHJ1ZQorCitURVNUIENPTVBMRVRFCisKZGlm ZiAtLWdpdCBhL0xheW91dFRlc3RzL2Zhc3QvY3NzL2JvcmRlci1pbWFnZS1udWxsLWltYWdlLWNy YXNoLmh0bWwgYi9MYXlvdXRUZXN0cy9mYXN0L2Nzcy9ib3JkZXItaW1hZ2UtbnVsbC1pbWFnZS1j cmFzaC5odG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAuLmNlM2VkNThjNjYyMTM5OTAwY2JkNDEyZGQ4ZmVkNjcxZDM4 ZDZlMDMKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9mYXN0L2Nzcy9ib3JkZXItaW1h Z2UtbnVsbC1pbWFnZS1jcmFzaC5odG1sCkBAIC0wLDAgKzEsMjcgQEAKKzwhRE9DVFlQRSBodG1s PgorPGh0bWw+Cis8aGVhZD4KKzxtZXRhIGNoYXJzZXQ9InV0Zi04Ij4KKzxzY3JpcHQgc3JjPSIu Li9qcy9yZXNvdXJjZXMvanMtdGVzdC1wcmUuanMiPjwvc2NyaXB0PgorPC9oZWFkPgorPGJvZHk+ Cis8c2NyaXB0PgorCitkZXNjcmlwdGlvbigiVGVzdHMgdGhhdCBzaG9ydGhhbmQgYm9yZGVyLWlt YWdlIHdpdGggYSBudWxsIGltYWdlIGRvZXNuJ3QgY3Jhc2guIik7CisKK3ZhciB0ZXN0Q29udGFp bmVyID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgiZGl2Iik7Citkb2N1bWVudC5ib2R5LmFwcGVu ZENoaWxkKHRlc3RDb250YWluZXIpOworCit0ZXN0Q29udGFpbmVyLmlubmVySFRNTCA9ICc8ZGl2 IGlkPSJ0ZXN0Ij5oZWxsbzwvZGl2Pic7CisKK2UgPSBkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgn dGVzdCcpOworY29tcHV0ZWRTdHlsZSA9IHdpbmRvdy5nZXRDb21wdXRlZFN0eWxlKGUsIG51bGwp OworZS5zdHlsZS5ib3JkZXJJbWFnZSA9ICIxMCUgZmlsbCI7CisKK3Nob3VsZEJlKCJjb21wdXRl ZFN0eWxlLmdldFByb3BlcnR5VmFsdWUoJ2JvcmRlci1pbWFnZScpIiwgIidub25lJyIpOworCitk b2N1bWVudC5ib2R5LnJlbW92ZUNoaWxkKHRlc3RDb250YWluZXIpOworPC9zY3JpcHQ+Cis8c2Ny aXB0IHNyYz0iLi4vanMvcmVzb3VyY2VzL2pzLXRlc3QtcG9zdC5qcyI+PC9zY3JpcHQ+Cis8L2Jv ZHk+Cis8L2h0bWw+Cg== 123953 2012-01-25 09:14:16 -0800 2012-01-25 10:54:56 -0800 Patch for landing bug-77001-20120125141404.patch text/plain 7768 menard U3VidmVyc2lvbiBSZXZpc2lvbjogMTA1ODYyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNzZkZTk0M2NhNTcwM2Zl ZmJhMTcwZjdlOWYyZGMyZTM4OTc1MzAyYy4uN2I0Mzc2Y2VmZjg5Mjk1ZjE2YWExZTMzNzU3ODk1 YmNiMWUyNzQ0MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDEyLTAxLTI1ICBBbGV4 aXMgTWVuYXJkICA8YWxleGlzLm1lbmFyZEBvcGVuYm9zc2Eub3JnPgorCisgICAgICAgIGJvcmRl ci1pbWFnZSBzaG91bGQgbm90IGNyYXNoIHdoZW4gdGhlIHNvdXJjZSBpcyBub3Qgc3BlY2lmaWVk LgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NzcwMDEK KworICAgICAgICBSZXZpZXdlZCBieSBBbmRyZWFzIEtsaW5nLgorCisgICAgICAgIFRoaXMgYnVn IHdhcyBpbnRyb2R1Y2VkIGJ5IHIxMDU1MDIgYnV0IHdhcyBleHBvc2VkIGJ5IHIxMDU3MzguCisg ICAgICAgIFRoZSBpbWFnZS1zb3VyY2Ugb2YgYSBib3JkZXItaW1hZ2UgaXMgbm90IG1hbmRhdG9y eSB0aGVyZWZvcmUgaXQKKyAgICAgICAgbWF5IGhhcHBlbiB0aGF0IHlvdSBoYXZlIG5vIHZhbHVl IHNldCBmb3IgaXQuIFdlYkNvcmU6OmNyZWF0ZUJvcmRlckltYWdlVmFsdWUKKyAgICAgICAgd2Fz IHdyb25nbHkgYXNzdW1pbmcgdGhhdCB0aGUgaW1hZ2UgaXMgYWx3YXlzIHNldC4gVGhpcyBwcm9i bGVtIGFsc28gcmVxdWlyZWQgYSBiaXQKKyAgICAgICAgb2YgcmVmYWN0b3JpbmcgaW4gQ1NTU3R5 bGVTZWxlY3Rvcjo6bWFwTmluZVBpZWNlSW1hZ2UgdG8gdGFrZSBpbnRvIGFjY291bnQgdGhhdAor ICAgICAgICB0aGUgaW1hZ2UgY291bGQgYmUgb3B0aW9uYWwgKGp1c3QgbGlrZSBvdGhlciBwcm9w ZXJ0aWVzKS4KKworICAgICAgICBUZXN0OiBmYXN0L2Nzcy9ib3JkZXItaW1hZ2UtbnVsbC1pbWFn ZS1jcmFzaC5odG1sCisKKyAgICAgICAgKiBjc3MvQ1NTQm9yZGVySW1hZ2UuY3BwOgorICAgICAg ICAoV2ViQ29yZTo6Y3JlYXRlQm9yZGVySW1hZ2VWYWx1ZSk6CisgICAgICAgICogY3NzL0NTU1N0 eWxlU2VsZWN0b3IuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Q1NTU3R5bGVTZWxlY3Rvcjo6bWFw TmluZVBpZWNlSW1hZ2UpOgorCiAyMDEyLTAxLTI1ICBBbnRvbiBNdWhpbiAgPGFudG9ubUBjaHJv bWl1bS5vcmc+CiAKICAgICAgICAgVW5yZXZpZXcgbWFudWFsIHJldmVydCBvZiByMTA1ODQzLgpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvY3NzL0NTU0JvcmRlckltYWdlLmNwcCBiL1NvdXJj ZS9XZWJDb3JlL2Nzcy9DU1NCb3JkZXJJbWFnZS5jcHAKaW5kZXggM2I2NmM2YjIyYjUwNWRhYzI3 NjU1OTRmOWM0NGM0OTdjZWNiODEzMS4uYWMzZTUxZWYxN2JhYWYzZmE2ZDJhMjAxN2Y0YzIyNTll NzBjODI5NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvY3NzL0NTU0JvcmRlckltYWdlLmNw cAorKysgYi9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTQm9yZGVySW1hZ2UuY3BwCkBAIC0yNiw3ICsy Niw4IEBAIFBhc3NSZWZQdHI8Q1NTVmFsdWVMaXN0PiBjcmVhdGVCb3JkZXJJbWFnZVZhbHVlKFBh c3NSZWZQdHI8Q1NTVmFsdWU+IGltYWdlLCBQYXNzCiAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICBQYXNzUmVmUHRyPENTU1ZhbHVlPiBvdXRzZXQsIFBhc3NS ZWZQdHI8Q1NTVmFsdWU+IHJlcGVhdCkKIHsKICAgICBSZWZQdHI8Q1NTVmFsdWVMaXN0PiBsaXN0 ID0gQ1NTVmFsdWVMaXN0OjpjcmVhdGVTcGFjZVNlcGFyYXRlZCgpOwotICAgIGxpc3QtPmFwcGVu ZChpbWFnZSk7CisgICAgaWYgKGltYWdlKQorICAgICAgICBsaXN0LT5hcHBlbmQoaW1hZ2UpOwog CiAgICAgaWYgKGJvcmRlclNsaWNlIHx8IG91dHNldCkgewogICAgICAgICBSZWZQdHI8Q1NTVmFs dWVMaXN0PiBsaXN0U2xhc2ggPSBDU1NWYWx1ZUxpc3Q6OmNyZWF0ZVNsYXNoU2VwYXJhdGVkKCk7 CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTU3R5bGVTZWxlY3Rvci5jcHAgYi9T b3VyY2UvV2ViQ29yZS9jc3MvQ1NTU3R5bGVTZWxlY3Rvci5jcHAKaW5kZXggOGQ0NGNhNjIxMWU3 ZWQ4M2NhZmU1MzU5ZDEzMzc2ZDE0YzBlZmMyMy4uNjAzNDA3Mzk1NDI2MzQ3MmIxYWFiMWNjNjdh ZDVhODk5ZmE4YzZjNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvY3NzL0NTU1N0eWxlU2Vs ZWN0b3IuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NTdHlsZVNlbGVjdG9yLmNwcApA QCAtNDI3OSw4ICs0Mjc5LDggQEAgdm9pZCBDU1NTdHlsZVNlbGVjdG9yOjptYXBBbmltYXRpb25U aW1pbmdGdW5jdGlvbihBbmltYXRpb24qIGFuaW1hdGlvbiwgQ1NTVmFsdWUKIAogdm9pZCBDU1NT dHlsZVNlbGVjdG9yOjptYXBOaW5lUGllY2VJbWFnZShDU1NQcm9wZXJ0eUlEIHByb3BlcnR5LCBD U1NWYWx1ZSogdmFsdWUsIE5pbmVQaWVjZUltYWdlJiBpbWFnZSkKIHsKLSAgICAvLyBJZiB3ZSdy ZSBhIHByaW1pdGl2ZSB2YWx1ZSwgdGhlbiB3ZSBhcmUgIm5vbmUiIGFuZCBkb24ndCBuZWVkIHRv IGFsdGVyIHRoZSBlbXB0eSBpbWFnZSBhdCBhbGwuCi0gICAgaWYgKCF2YWx1ZSB8fCB2YWx1ZS0+ aXNQcmltaXRpdmVWYWx1ZSgpKQorICAgIC8vIElmIHdlJ3JlIG5vdCBhIHZhbHVlIGxpc3QsIHRo ZW4gd2UgYXJlICJub25lIiBhbmQgZG9uJ3QgbmVlZCB0byBhbHRlciB0aGUgZW1wdHkgaW1hZ2Ug YXQgYWxsLgorICAgIGlmICghdmFsdWUgfHwgIXZhbHVlLT5pc1ZhbHVlTGlzdCgpKQogICAgICAg ICByZXR1cm47CiAKICAgICAvLyBSZXRyaWV2ZSB0aGUgYm9yZGVyIGltYWdlIHZhbHVlLgpAQCAt NDI5NSwyNCArNDI5NSwxNSBAQCB2b2lkIENTU1N0eWxlU2VsZWN0b3I6Om1hcE5pbmVQaWVjZUlt YWdlKENTU1Byb3BlcnR5SUQgcHJvcGVydHksIENTU1ZhbHVlKiB2YWx1ZQogICAgIGVsc2UKICAg ICAgICAgaW1hZ2VQcm9wZXJ0eSA9IHByb3BlcnR5OwogCi0gICAgaWYgKENTU1ZhbHVlKiBpbWFn ZVZhbHVlID0gYm9yZGVySW1hZ2UtPml0ZW0oMCkpCi0gICAgICAgIGltYWdlLnNldEltYWdlKHN0 eWxlSW1hZ2UoaW1hZ2VQcm9wZXJ0eSwgaW1hZ2VWYWx1ZSkpOworICAgIGZvciAodW5zaWduZWQg aSA9IDAgOyBpIDwgYm9yZGVySW1hZ2UtPmxlbmd0aCgpIDsgKytpKSB7CisgICAgICAgIENTU1Zh bHVlKiBjdXJyZW50ID0gYm9yZGVySW1hZ2UtPml0ZW0oaSk7CiAKLSAgICBpZiAoYm9yZGVySW1h Z2UtPml0ZW0oMSkpIHsKLSAgICAgICAgaWYgKGJvcmRlckltYWdlLT5pdGVtKDEpLT5jc3NWYWx1 ZVR5cGUoKSAhPSBDU1NWYWx1ZTo6Q1NTX1ZBTFVFX0xJU1QpIHsKLSAgICAgICAgICAgIC8vIE1h cCBpbiB0aGUgaW1hZ2Ugc2xpY2VzLgotICAgICAgICAgICAgaWYgKGJvcmRlckltYWdlLT5pdGVt KDEpKSB7Ci0gICAgICAgICAgICAgICAgaWYgKGJvcmRlckltYWdlLT5pdGVtKDEpLT5pc0JvcmRl ckltYWdlU2xpY2VWYWx1ZSgpKSB7Ci0gICAgICAgICAgICAgICAgICAgIG1hcE5pbmVQaWVjZUlt YWdlU2xpY2UoYm9yZGVySW1hZ2UtPml0ZW0oMSksIGltYWdlKTsKLSAgICAgICAgICAgICAgICAg ICAgIGlmIChib3JkZXJJbWFnZS0+aXRlbSgyKSkKLSAgICAgICAgICAgICAgICAgICAgICAgIC8v IFNldCB0aGUgYXBwcm9wcmlhdGUgcnVsZXMgZm9yIHN0cmV0Y2gvcm91bmQvcmVwZWF0IG9mIHRo ZSBzbGljZXMKLSAgICAgICAgICAgICAgICAgICAgICAgIG1hcE5pbmVQaWVjZUltYWdlUmVwZWF0 KGJvcmRlckltYWdlLT5pdGVtKDIpLCBpbWFnZSk7Ci0gICAgICAgICAgICAgICAgfSBlbHNlCi0g ICAgICAgICAgICAgICAgICAgIC8vIFNldCB0aGUgYXBwcm9wcmlhdGUgcnVsZXMgZm9yIHN0cmV0 Y2gvcm91bmQvcmVwZWF0IG9mIHRoZSBzbGljZXMKLSAgICAgICAgICAgICAgICAgICAgbWFwTmlu ZVBpZWNlSW1hZ2VSZXBlYXQoYm9yZGVySW1hZ2UtPml0ZW0oMSksIGltYWdlKTsKLSAgICAgICAg ICAgIH0KLSAgICAgICAgfSBlbHNlIHsKLSAgICAgICAgICAgIENTU1ZhbHVlTGlzdCogc2xhc2hM aXN0ID0gc3RhdGljX2Nhc3Q8Q1NTVmFsdWVMaXN0Kj4oYm9yZGVySW1hZ2UtPml0ZW0oMSkpOwor ICAgICAgICBpZiAoY3VycmVudC0+aXNJbWFnZVZhbHVlKCkgfHwgY3VycmVudC0+aXNJbWFnZUdl bmVyYXRvclZhbHVlKCkpCisgICAgICAgICAgICBpbWFnZS5zZXRJbWFnZShzdHlsZUltYWdlKGlt YWdlUHJvcGVydHksIGN1cnJlbnQpKTsKKyAgICAgICAgZWxzZSBpZiAoY3VycmVudC0+aXNCb3Jk ZXJJbWFnZVNsaWNlVmFsdWUoKSkKKyAgICAgICAgICAgIG1hcE5pbmVQaWVjZUltYWdlU2xpY2Uo Y3VycmVudCwgaW1hZ2UpOworICAgICAgICBlbHNlIGlmIChjdXJyZW50LT5pc1ZhbHVlTGlzdCgp KSB7CisgICAgICAgICAgICBDU1NWYWx1ZUxpc3QqIHNsYXNoTGlzdCA9IHN0YXRpY19jYXN0PENT U1ZhbHVlTGlzdCo+KGN1cnJlbnQpOwogICAgICAgICAgICAgLy8gTWFwIGluIHRoZSBpbWFnZSBz bGljZXMuCiAgICAgICAgICAgICBpZiAoc2xhc2hMaXN0LT5pdGVtKDApICYmIHNsYXNoTGlzdC0+ aXRlbSgwKS0+aXNCb3JkZXJJbWFnZVNsaWNlVmFsdWUoKSkKICAgICAgICAgICAgICAgICBtYXBO aW5lUGllY2VJbWFnZVNsaWNlKHNsYXNoTGlzdC0+aXRlbSgwKSwgaW1hZ2UpOwpAQCAtNDMyNCw5 ICs0MzE1LDkgQEAgdm9pZCBDU1NTdHlsZVNlbGVjdG9yOjptYXBOaW5lUGllY2VJbWFnZShDU1NQ cm9wZXJ0eUlEIHByb3BlcnR5LCBDU1NWYWx1ZSogdmFsdWUKICAgICAgICAgICAgIC8vIE1hcCBp biB0aGUgb3V0c2V0LgogICAgICAgICAgICAgaWYgKHNsYXNoTGlzdC0+aXRlbSgyKSkKICAgICAg ICAgICAgICAgICBpbWFnZS5zZXRPdXRzZXQobWFwTmluZVBpZWNlSW1hZ2VRdWFkKHNsYXNoTGlz dC0+aXRlbSgyKSkpOwotCi0gICAgICAgICAgICAvLyBTZXQgdGhlIGFwcHJvcHJpYXRlIHJ1bGVz IGZvciBzdHJldGNoL3JvdW5kL3JlcGVhdCBvZiB0aGUgc2xpY2VzCi0gICAgICAgICAgICBtYXBO aW5lUGllY2VJbWFnZVJlcGVhdChib3JkZXJJbWFnZS0+aXRlbSgyKSwgaW1hZ2UpOworICAgICAg ICB9IGVsc2UgaWYgKGN1cnJlbnQtPmlzUHJpbWl0aXZlVmFsdWUoKSkgeworICAgICAgICAgICAg Ly8gU2V0IHRoZSBhcHByb3ByaWF0ZSBydWxlcyBmb3Igc3RyZXRjaC9yb3VuZC9yZXBlYXQgb2Yg dGhlIHNsaWNlcy4KKyAgICAgICAgICAgIG1hcE5pbmVQaWVjZUltYWdlUmVwZWF0KGN1cnJlbnQs IGltYWdlKTsKICAgICAgICAgfQogICAgIH0KIApkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvQ2hh bmdlTG9nIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCmluZGV4IGJhM2I2MmM5YzM2ODkwNzY2ODYz YTI3YjM2ZmM2ZWY2YjhkOTUyNDcuLmJjOTYwZjY0OTE4MDJhZmU0NThjOGRhODMxMzFlYjA1MjE1 ZjA1OGMgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL0NoYW5nZUxvZworKysgYi9MYXlvdXRUZXN0 cy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNSBAQAorMjAxMi0wMS0yNSAgQWxleGlzIE1lbmFyZCAg PGFsZXhpcy5tZW5hcmRAb3BlbmJvc3NhLm9yZz4KKworICAgICAgICBib3JkZXItaW1hZ2Ugc2hv dWxkIG5vdCBjcmFzaCB3aGVuIHRoZSBzb3VyY2UgaXMgbm90IHNwZWNpZmllZC4KKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTc3MDAxCisKKyAgICAgICAg UmV2aWV3ZWQgYnkgQW5kcmVhcyBLbGluZy4KKworICAgICAgICBBZGQgYSBuZXcgdGVzdCB0byBj b3ZlciB0aGlzIGNyYXNoIHNwZWNpZmljYWxseS4KKworICAgICAgICAqIGZhc3QvY3NzL2JvcmRl ci1pbWFnZS1udWxsLWltYWdlLWNyYXNoLWV4cGVjdGVkLnR4dDogQWRkZWQuCisgICAgICAgICog ZmFzdC9jc3MvYm9yZGVyLWltYWdlLW51bGwtaW1hZ2UtY3Jhc2guaHRtbDogQWRkZWQuCisKIDIw MTItMDEtMjUgIE5vZWwgR29yZG9uICA8bm9lbC5nb3Jkb25AZ21haWwuY29tPgogCiAgICAgICAg IFtjaHJvbWl1bV0gZmFzdC9jc3MvdGV4dC1vdmVyZmxvdy1pbnB1dC5odG1sIHJlYmFzZWxpbmUK ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2Zhc3QvY3NzL2JvcmRlci1pbWFnZS1udWxsLWltYWdl LWNyYXNoLWV4cGVjdGVkLnR4dCBiL0xheW91dFRlc3RzL2Zhc3QvY3NzL2JvcmRlci1pbWFnZS1u dWxsLWltYWdlLWNyYXNoLWV4cGVjdGVkLnR4dApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi4xMTRhYmUxMGNhYmQ1NDhj YWEzMDI2YjYwMjJhNTdlZTYwZDBhZDQ1Ci0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMv ZmFzdC9jc3MvYm9yZGVyLWltYWdlLW51bGwtaW1hZ2UtY3Jhc2gtZXhwZWN0ZWQudHh0CkBAIC0w LDAgKzEsMTAgQEAKK1Rlc3RzIHRoYXQgc2hvcnRoYW5kIGJvcmRlci1pbWFnZSB3aXRoIGEgbnVs bCBpbWFnZSBkb2Vzbid0IGNyYXNoLgorCitPbiBzdWNjZXNzLCB5b3Ugd2lsbCBzZWUgYSBzZXJp ZXMgb2YgIlBBU1MiIG1lc3NhZ2VzLCBmb2xsb3dlZCBieSAiVEVTVCBDT01QTEVURSIuCisKKwor UEFTUyBjb21wdXRlZFN0eWxlLmdldFByb3BlcnR5VmFsdWUoJ2JvcmRlci1pbWFnZScpIGlzICdu b25lJworUEFTUyBzdWNjZXNzZnVsbHlQYXJzZWQgaXMgdHJ1ZQorCitURVNUIENPTVBMRVRFCisK ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2Zhc3QvY3NzL2JvcmRlci1pbWFnZS1udWxsLWltYWdl LWNyYXNoLmh0bWwgYi9MYXlvdXRUZXN0cy9mYXN0L2Nzcy9ib3JkZXItaW1hZ2UtbnVsbC1pbWFn ZS1jcmFzaC5odG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLmNlM2VkNThjNjYyMTM5OTAwY2JkNDEyZGQ4ZmVkNjcx ZDM4ZDZlMDMKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9mYXN0L2Nzcy9ib3JkZXIt aW1hZ2UtbnVsbC1pbWFnZS1jcmFzaC5odG1sCkBAIC0wLDAgKzEsMjcgQEAKKzwhRE9DVFlQRSBo dG1sPgorPGh0bWw+Cis8aGVhZD4KKzxtZXRhIGNoYXJzZXQ9InV0Zi04Ij4KKzxzY3JpcHQgc3Jj PSIuLi9qcy9yZXNvdXJjZXMvanMtdGVzdC1wcmUuanMiPjwvc2NyaXB0PgorPC9oZWFkPgorPGJv ZHk+Cis8c2NyaXB0PgorCitkZXNjcmlwdGlvbigiVGVzdHMgdGhhdCBzaG9ydGhhbmQgYm9yZGVy LWltYWdlIHdpdGggYSBudWxsIGltYWdlIGRvZXNuJ3QgY3Jhc2guIik7CisKK3ZhciB0ZXN0Q29u dGFpbmVyID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgiZGl2Iik7Citkb2N1bWVudC5ib2R5LmFw cGVuZENoaWxkKHRlc3RDb250YWluZXIpOworCit0ZXN0Q29udGFpbmVyLmlubmVySFRNTCA9ICc8 ZGl2IGlkPSJ0ZXN0Ij5oZWxsbzwvZGl2Pic7CisKK2UgPSBkb2N1bWVudC5nZXRFbGVtZW50QnlJ ZCgndGVzdCcpOworY29tcHV0ZWRTdHlsZSA9IHdpbmRvdy5nZXRDb21wdXRlZFN0eWxlKGUsIG51 bGwpOworZS5zdHlsZS5ib3JkZXJJbWFnZSA9ICIxMCUgZmlsbCI7CisKK3Nob3VsZEJlKCJjb21w dXRlZFN0eWxlLmdldFByb3BlcnR5VmFsdWUoJ2JvcmRlci1pbWFnZScpIiwgIidub25lJyIpOwor Citkb2N1bWVudC5ib2R5LnJlbW92ZUNoaWxkKHRlc3RDb250YWluZXIpOworPC9zY3JpcHQ+Cis8 c2NyaXB0IHNyYz0iLi4vanMvcmVzb3VyY2VzL2pzLXRlc3QtcG9zdC5qcyI+PC9zY3JpcHQ+Cis8 L2JvZHk+Cis8L2h0bWw+Cg==