132154 2014-04-24 16:32:00 -0700 [CSS Shapes] off-by-one error in Shape::createRasterShape() 2014-04-30 12:17:02 -0700 1 1 1 Unclassified WebKit CSS 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 giles_joplin giles_joplin bjonesbe commit-queue esprehn+autocc glenn kondapallykalyan oldest_to_newest 1003827 0 giles_joplin 2014-04-24 16:32:00 -0700 This bug was reported and fixed in Blink by David Vest: https://codereview.chromium.org/237123002/ The fix needs to be ported to WebKit. 1004696 1 230318 giles_joplin 2014-04-28 12:49:37 -0700 Created attachment 230318 Patch This is a port of a patch for a bug that was reported by and fixed in Blink by David Vest: https://codereview.chromium.org/237123002/. Shape::createRasterShape() now consistently reports "end-point exclusive" intervals. Before the patch an entire row of pixels was above the shape-image-threshold, the interval's end index was reported as image.width. Now it's image.width + 1, which is consistent with the way the end index is reported if the last above threshold pixel is within an image row. Two existing tests were revised to account for this change. 1004698 2 commit-queue 2014-04-28 12:51:58 -0700 Attachment 230318 did not pass style-queue: ERROR: Source/WebCore/rendering/shapes/RasterShape.cpp:173: Should have only a single space after a punctuation in a comment. [whitespace/comments] [5] Total errors found: 1 in 6 files If any of these errors are false positives, please file a bug against check-webkit-style. 1004702 3 230319 giles_joplin 2014-04-28 12:55:04 -0700 Created attachment 230319 Patch 1004732 4 230322 giles_joplin 2014-04-28 14:18:54 -0700 Created attachment 230322 Patch Fixed a typo. 1004951 5 230322 bjonesbe 2014-04-29 08:29:32 -0700 Comment on attachment 230322 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=230322&action=review > Source/WebCore/rendering/shapes/RasterShape.cpp:174 > + // Note: marginIntervals() returns "end-point exclusive" intervals. > + // The value of excludedInterval.x1() is the first index of an > + // above-threshold pixel within the y1 - y2 line. The value of x2 > + // is the 1+ the index of the last above-threshold pixel. I would remove this comment from here and put something similar to it inside of createRasterShape where the endpoint exclusive interval is actually created. > Source/WebCore/rendering/shapes/Shape.cpp:205 > + int endX = alphaAboveThreshold ? x + 1 : x; if alphaAboveThreshold, doesn't x == imageRect.width() - 1? It seems to me that it would be clearer to readers of the code if you said: int endX = alphaAboveThreshold ? imageRect.width() : x; Regardless, I think that comment about end point exclusive intervals would be better placed here than at the usage point of the function, since it is really explaining why you are doing this contortion with endX instead of just using x directly. 1004952 6 230322 bjonesbe 2014-04-29 08:29:34 -0700 Comment on attachment 230322 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=230322&action=review > Source/WebCore/rendering/shapes/RasterShape.cpp:174 > + // Note: marginIntervals() returns "end-point exclusive" intervals. > + // The value of excludedInterval.x1() is the first index of an > + // above-threshold pixel within the y1 - y2 line. The value of x2 > + // is the 1+ the index of the last above-threshold pixel. I would remove this comment from here and put something similar to it inside of createRasterShape where the endpoint exclusive interval is actually created. > Source/WebCore/rendering/shapes/Shape.cpp:205 > + int endX = alphaAboveThreshold ? x + 1 : x; if alphaAboveThreshold, doesn't x == imageRect.width() - 1? It seems to me that it would be clearer to readers of the code if you said: int endX = alphaAboveThreshold ? imageRect.width() : x; Regardless, I think that comment about end point exclusive intervals would be better placed here than at the usage point of the function, since it is really explaining why you are doing this contortion with endX instead of just using x directly. 1004960 7 230379 giles_joplin 2014-04-29 08:55:34 -0700 Created attachment 230379 Patch 1004962 8 230379 bjonesbe 2014-04-29 08:59:46 -0700 Comment on attachment 230379 Patch r=me 1004989 9 230379 commit-queue 2014-04-29 09:41:01 -0700 Comment on attachment 230379 Patch Clearing flags on attachment: 230379 Committed r167938: <http://trac.webkit.org/changeset/167938> 1004990 10 commit-queue 2014-04-29 09:41:04 -0700 All reviewed patches have been landed. Closing bug. 1005468 11 ddkilzer 2014-04-30 12:17:02 -0700 <rdar://problem/16772806> 230318 2014-04-28 12:49:37 -0700 2014-04-28 12:55:04 -0700 Patch tmp.patch text/plain 5436 giles_joplin ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCA3N2M1Yjk0Li43Mjk4MDE5IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTYgQEAKKzIwMTQtMDQt MjggIEhhbnMgTXVsbGVyICA8aG11bGxlckBhZG9iZS5jb20+CisKKyAgICAgICAgW0NTUyBTaGFw ZXNdIG9mZi1ieS1vbmUgZXJyb3IgaW4gU2hhcGU6OmNyZWF0ZVJhc3RlclNoYXBlKCkKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEzMjE1NAorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIENoYW5nZSB0d28gdGVz dHMgdGhhdCBoYWQgaW5jb3JyZWN0IFggdmFsdWVzIHRvIGFjY291bnQgZm9yIHRoZSBvZmYtYnkt b25lCisgICAgICAgIGluIFNoYXBlOjpjcmVhdGVSYXN0ZXJTaGFwZSgpLgorCisgICAgICAgICog ZmFzdC9zaGFwZXMvc2hhcGUtb3V0c2lkZS1mbG9hdHMvc2hhcGUtb3V0c2lkZS1pbnNlcnQtc3Zn LXNoYXBlLmh0bWw6CisgICAgICAgICogZmFzdC9zaGFwZXMvc2hhcGUtb3V0c2lkZS1mbG9hdHMv c2hhcGUtb3V0c2lkZS1saW5lYXItZ3JhZGllbnQtZXhwZWN0ZWQuaHRtbDoKKwogMjAxNC0wNC0y OCAgWGFiaWVyIFJvZHJpZ3VleiBDYWx2YXIgIDxjYWx2YXJpc0BpZ2FsaWEuY29tPgogCiAgICAg ICAgIFVucmV2aWV3ZWQgR1RLIGdhcmRlbmluZy4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2Zh c3Qvc2hhcGVzL3NoYXBlLW91dHNpZGUtZmxvYXRzL3NoYXBlLW91dHNpZGUtaW5zZXJ0LXN2Zy1z aGFwZS5odG1sIGIvTGF5b3V0VGVzdHMvZmFzdC9zaGFwZXMvc2hhcGUtb3V0c2lkZS1mbG9hdHMv c2hhcGUtb3V0c2lkZS1pbnNlcnQtc3ZnLXNoYXBlLmh0bWwKaW5kZXggZjdlZmZkNC4uZGU2OWY0 NSAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvZmFzdC9zaGFwZXMvc2hhcGUtb3V0c2lkZS1mbG9h dHMvc2hhcGUtb3V0c2lkZS1pbnNlcnQtc3ZnLXNoYXBlLmh0bWwKKysrIGIvTGF5b3V0VGVzdHMv ZmFzdC9zaGFwZXMvc2hhcGUtb3V0c2lkZS1mbG9hdHMvc2hhcGUtb3V0c2lkZS1pbnNlcnQtc3Zn LXNoYXBlLmh0bWwKQEAgLTExLDcgKzExLDcgQEAKICAgICB3aWR0aDogMTAwcHg7CiAgICAgaGVp Z2h0OiAxMDBweDsKICAgICBmbG9hdDogbGVmdDsKLSAgICAtd2Via2l0LXNoYXBlLW91dHNpZGU6 IHVybCgiZGF0YTppbWFnZS9zdmcreG1sO3V0ZjgsPHN2ZyB4bWxucz0naHR0cDovL3d3dy53My5v cmcvMjAwMC9zdmcnIHdpZHRoPScxMDBweCcgaGVpZ2h0PScxMDBweCc+PHJlY3QgeD0nMCcgeT0n NTAnIHdpZHRoPSc0OScgaGVpZ2h0PSc0OScgZmlsbD0nYmx1ZScvPjwvc3ZnPiIpOworICAgIC13 ZWJraXQtc2hhcGUtb3V0c2lkZTogdXJsKCJkYXRhOmltYWdlL3N2Zyt4bWw7dXRmOCw8c3ZnIHht bG5zPSdodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2Zycgd2lkdGg9JzEwMHB4JyBoZWlnaHQ9JzEw MHB4Jz48cmVjdCB4PScwJyB5PSc1MCcgd2lkdGg9JzUwJyBoZWlnaHQ9JzUwJyBmaWxsPSdibHVl Jy8+PC9zdmc+Iik7CiB9CiA8L3N0eWxlPgogPHNjcmlwdD4KZGlmZiAtLWdpdCBhL0xheW91dFRl c3RzL2Zhc3Qvc2hhcGVzL3NoYXBlLW91dHNpZGUtZmxvYXRzL3NoYXBlLW91dHNpZGUtbGluZWFy LWdyYWRpZW50LWV4cGVjdGVkLmh0bWwgYi9MYXlvdXRUZXN0cy9mYXN0L3NoYXBlcy9zaGFwZS1v dXRzaWRlLWZsb2F0cy9zaGFwZS1vdXRzaWRlLWxpbmVhci1ncmFkaWVudC1leHBlY3RlZC5odG1s CmluZGV4IDU3ODZmMmUuLjE0MjczMjMgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2Zhc3Qvc2hh cGVzL3NoYXBlLW91dHNpZGUtZmxvYXRzL3NoYXBlLW91dHNpZGUtbGluZWFyLWdyYWRpZW50LWV4 cGVjdGVkLmh0bWwKKysrIGIvTGF5b3V0VGVzdHMvZmFzdC9zaGFwZXMvc2hhcGUtb3V0c2lkZS1m bG9hdHMvc2hhcGUtb3V0c2lkZS1saW5lYXItZ3JhZGllbnQtZXhwZWN0ZWQuaHRtbApAQCAtNCw3 ICs0LDcgQEAKIDxzdHlsZT4KICNpbWFnZS1zaGFwZSB7CiAgICAgZmxvYXQ6IGxlZnQ7Ci0gICAg d2lkdGg6IDUxcHg7IC8qIHNoYXBlLW91dHNpZGUgaW50ZXJ2YWxzIGRlcml2ZWQgZnJvbSBpbWFn ZXMgYXJlIGVuZC1wb2ludCBleGNsdXNpdmUgKi8KKyAgICB3aWR0aDogNTBweDsKICAgICBoZWln aHQ6IDEwMHB4OwogfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cgYi9T b3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOTM5N2RjYS4uODY5NjQxMSAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxv ZwpAQCAtMSwzICsxLDI1IEBACisyMDE0LTA0LTI4ICBIYW5zIE11bGxlciAgPGhtdWxsZXJAYWRv YmUuY29tPgorCisgICAgICAgIFtDU1MgU2hhcGVzXSBvZmYtYnktb25lIGVycm9yIGluIFNoYXBl OjpjcmVhdGVSYXN0ZXJTaGFwZSgpCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0xMzIxNTQKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICBUaGlzIGlzIGEgcG9ydCBvZiBhIHBhdGNoIGZvciBhIGJ1ZyB0aGF0IHdh cyByZXBvcnRlZCBieSBhbmQgZml4ZWQgaW4gQmxpbmsgYnkKKyAgICAgICAgRGF2aWQgVmVzdDog aHR0cHM6Ly9jb2RlcmV2aWV3LmNocm9taXVtLm9yZy8yMzcxMjMwMDIvLiAgU2hhcGU6OmNyZWF0 ZVJhc3RlclNoYXBlKCkKKyAgICAgICAgbm93IGNvbnNpc3RlbnRseSByZXBvcnRzICJlbmQtcG9p bnQgZXhjbHVzaXZlIiBpbnRlcnZhbHMuIEJlZm9yZSB0aGUgcGF0Y2gKKyAgICAgICAgYW4gZW50 aXJlIHJvdyBvZiBwaXhlbHMgd2FzIGFib3ZlIHRoZSBzaGFwZS1pbWFnZS10aHJlc2hvbGQsIHRo ZSBpbnRlcnZhbCdzIGVuZAorICAgICAgICBpbmRleCB3YXMgcmVwb3J0ZWQgYXMgaW1hZ2Uud2lk dGguIE5vdyBpdCdzIGltYWdlLndpZHRoICsgMSwgd2hpY2ggaXMgY29uc2lzdGVudAorICAgICAg ICB3aXRoIHRoZSB3YXkgdGhlIGVuZCBpbmRleCBpcyByZXBvcnRlZCBpZiB0aGUgbGFzdCBhYm92 ZSB0aHJlc2hvbGQgcGl4ZWwgaXMgd2l0aGluCisgICAgICAgIGFuIGltYWdlIHJvdy4KKworICAg ICAgICBUd28gZXhpc3RpbmcgdGVzdHMgd2VyZSByZXZpc2VkIHRvIGFjY291bnQgZm9yIHRoaXMg Y2hhbmdlLgorCisgICAgICAgICogcmVuZGVyaW5nL3NoYXBlcy9SYXN0ZXJTaGFwZS5jcHA6Cisg ICAgICAgIChXZWJDb3JlOjpSYXN0ZXJTaGFwZTo6Z2V0RXhjbHVkZWRJbnRlcnZhbHMpOgorICAg ICAgICAqIHJlbmRlcmluZy9zaGFwZXMvU2hhcGUuY3BwOgorICAgICAgICAoV2ViQ29yZTo6U2hh cGU6OmNyZWF0ZVJhc3RlclNoYXBlKToKKwogMjAxNC0wNC0yOCAgTWFydGluIFJvYmluc29uICA8 bXJvYmluc29uQGlnYWxpYS5jb20+CiAKICAgICAgICAgW0dUS10gQnVpbHRpbiBjdXJzb3JzIGRv IG5vdCBwcm9wZXJseSBoYW5kbGUgdHJhbnNwYXJlbmN5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9yZW5kZXJpbmcvc2hhcGVzL1Jhc3RlclNoYXBlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3Jl bmRlcmluZy9zaGFwZXMvUmFzdGVyU2hhcGUuY3BwCmluZGV4IDljMGNlZGUuLmFjOGM3YzAgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zaGFwZXMvUmFzdGVyU2hhcGUuY3Bw CisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zaGFwZXMvUmFzdGVyU2hhcGUuY3BwCkBA IC0xNjgsNyArMTY4LDEyIEBAIHZvaWQgUmFzdGVyU2hhcGU6OmdldEV4Y2x1ZGVkSW50ZXJ2YWxz KExheW91dFVuaXQgbG9naWNhbFRvcCwgTGF5b3V0VW5pdCBsb2dpY2FsCiAgICAgZm9yIChpbnQg eSA9IHkxOyB5IDwgeTI7ICB5KyspCiAgICAgICAgIGV4Y2x1ZGVkSW50ZXJ2YWwudW5pdGUoaW50 ZXJ2YWxzLmludGVydmFsQXQoeSkpOwogCi0gICAgcmVzdWx0LmFwcGVuZChMaW5lU2VnbWVudChl eGNsdWRlZEludGVydmFsLngxKCksIGV4Y2x1ZGVkSW50ZXJ2YWwueDIoKSArIDEpKTsKKyAgICAv LyBOb3RlOiBtYXJnaW5JbnRlcnZhbHMoKSByZXR1cm5zICJlbmQtcG9pbnQgZXhjbHVzaXZlIiBp bnRlcnZhbHMuCisgICAgLy8gVGhlIHZhbHVlIG9mIGV4Y2x1ZGVkSW50ZXJ2YWwueDEoKSBpcyB0 aGUgZmlyc3QgaW5kZXggb2YgYW4gCisgICAgLy8gYWJvdmUtdGhyZXNob2xkIHBpeGVsIHdpdGhp biB0aGUgeTEgLSB5MiBsaW5lLiAgVGhlIHZhbHVlIG9mIHgyCisgICAgLy8gaXMgdGhlIDErIHRo ZSBpbmRleCBvZiB0aGUgbGFzdCBhYm92ZS10aHJlc2hvbGQgcGl4ZWwuCisKKyAgICByZXN1bHQu YXBwZW5kKExpbmVTZWdtZW50KGV4Y2x1ZGVkSW50ZXJ2YWwueDEoKSwgZXhjbHVkZWRJbnRlcnZh bC54MigpKSk7CiB9CiAKIH0gLy8gbmFtZXNwYWNlIFdlYkNvcmUKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL3JlbmRlcmluZy9zaGFwZXMvU2hhcGUuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVu ZGVyaW5nL3NoYXBlcy9TaGFwZS5jcHAKaW5kZXggZjZjMzE3ZS4uZjk5NjhmZSAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3NoYXBlcy9TaGFwZS5jcHAKKysrIGIvU291cmNl L1dlYkNvcmUvcmVuZGVyaW5nL3NoYXBlcy9TaGFwZS5jcHAKQEAgLTIwMiw3ICsyMDIsOCBAQCBz dGQ6OnVuaXF1ZV9wdHI8U2hhcGU+IFNoYXBlOjpjcmVhdGVSYXN0ZXJTaGFwZShJbWFnZSogaW1h Z2UsIGZsb2F0IHRocmVzaG9sZCwgYwogICAgICAgICAgICAgICAgICAgICBpZiAoc3RhcnRYID09 IC0xICYmIGFscGhhQWJvdmVUaHJlc2hvbGQpIHsKICAgICAgICAgICAgICAgICAgICAgICAgIHN0 YXJ0WCA9IHg7CiAgICAgICAgICAgICAgICAgICAgIH0gZWxzZSBpZiAoc3RhcnRYICE9IC0xICYm ICghYWxwaGFBYm92ZVRocmVzaG9sZCB8fCB4ID09IGltYWdlUmVjdC53aWR0aCgpIC0gMSkpIHsK LSAgICAgICAgICAgICAgICAgICAgICAgIGludGVydmFscy0+aW50ZXJ2YWxBdCh5ICsgaW1hZ2VS ZWN0LnkoKSkudW5pdGUoSW50U2hhcGVJbnRlcnZhbChzdGFydFggKyBpbWFnZVJlY3QueCgpLCB4 ICsgaW1hZ2VSZWN0LngoKSkpOworICAgICAgICAgICAgICAgICAgICAgICAgaW50IGVuZFggPSBh bHBoYUFib3ZlVGhyZXNob2xkID8geCArIDEgOiB4OworICAgICAgICAgICAgICAgICAgICAgICAg aW50ZXJ2YWxzLT5pbnRlcnZhbEF0KHkgKyBpbWFnZVJlY3QueSgpKS51bml0ZShJbnRTaGFwZUlu dGVydmFsKHN0YXJ0WCArIGltYWdlUmVjdC54KCksIGVuZFggKyBpbWFnZVJlY3QueCgpKSk7CiAg ICAgICAgICAgICAgICAgICAgICAgICBzdGFydFggPSAtMTsKICAgICAgICAgICAgICAgICAgICAg fQogICAgICAgICAgICAgICAgIH0K 230319 2014-04-28 12:55:04 -0700 2014-04-28 14:18:54 -0700 Patch tmp.patch text/plain 5436 giles_joplin ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCA3N2M1Yjk0Li43Mjk4MDE5IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTYgQEAKKzIwMTQtMDQt MjggIEhhbnMgTXVsbGVyICA8aG11bGxlckBhZG9iZS5jb20+CisKKyAgICAgICAgW0NTUyBTaGFw ZXNdIG9mZi1ieS1vbmUgZXJyb3IgaW4gU2hhcGU6OmNyZWF0ZVJhc3RlclNoYXBlKCkKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEzMjE1NAorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIENoYW5nZSB0d28gdGVz dHMgdGhhdCBoYWQgaW5jb3JyZWN0IFggdmFsdWVzIHRvIGFjY291bnQgZm9yIHRoZSBvZmYtYnkt b25lCisgICAgICAgIGluIFNoYXBlOjpjcmVhdGVSYXN0ZXJTaGFwZSgpLgorCisgICAgICAgICog ZmFzdC9zaGFwZXMvc2hhcGUtb3V0c2lkZS1mbG9hdHMvc2hhcGUtb3V0c2lkZS1pbnNlcnQtc3Zn LXNoYXBlLmh0bWw6CisgICAgICAgICogZmFzdC9zaGFwZXMvc2hhcGUtb3V0c2lkZS1mbG9hdHMv c2hhcGUtb3V0c2lkZS1saW5lYXItZ3JhZGllbnQtZXhwZWN0ZWQuaHRtbDoKKwogMjAxNC0wNC0y OCAgWGFiaWVyIFJvZHJpZ3VleiBDYWx2YXIgIDxjYWx2YXJpc0BpZ2FsaWEuY29tPgogCiAgICAg ICAgIFVucmV2aWV3ZWQgR1RLIGdhcmRlbmluZy4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2Zh c3Qvc2hhcGVzL3NoYXBlLW91dHNpZGUtZmxvYXRzL3NoYXBlLW91dHNpZGUtaW5zZXJ0LXN2Zy1z aGFwZS5odG1sIGIvTGF5b3V0VGVzdHMvZmFzdC9zaGFwZXMvc2hhcGUtb3V0c2lkZS1mbG9hdHMv c2hhcGUtb3V0c2lkZS1pbnNlcnQtc3ZnLXNoYXBlLmh0bWwKaW5kZXggZjdlZmZkNC4uZGU2OWY0 NSAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvZmFzdC9zaGFwZXMvc2hhcGUtb3V0c2lkZS1mbG9h dHMvc2hhcGUtb3V0c2lkZS1pbnNlcnQtc3ZnLXNoYXBlLmh0bWwKKysrIGIvTGF5b3V0VGVzdHMv ZmFzdC9zaGFwZXMvc2hhcGUtb3V0c2lkZS1mbG9hdHMvc2hhcGUtb3V0c2lkZS1pbnNlcnQtc3Zn LXNoYXBlLmh0bWwKQEAgLTExLDcgKzExLDcgQEAKICAgICB3aWR0aDogMTAwcHg7CiAgICAgaGVp Z2h0OiAxMDBweDsKICAgICBmbG9hdDogbGVmdDsKLSAgICAtd2Via2l0LXNoYXBlLW91dHNpZGU6 IHVybCgiZGF0YTppbWFnZS9zdmcreG1sO3V0ZjgsPHN2ZyB4bWxucz0naHR0cDovL3d3dy53My5v cmcvMjAwMC9zdmcnIHdpZHRoPScxMDBweCcgaGVpZ2h0PScxMDBweCc+PHJlY3QgeD0nMCcgeT0n NTAnIHdpZHRoPSc0OScgaGVpZ2h0PSc0OScgZmlsbD0nYmx1ZScvPjwvc3ZnPiIpOworICAgIC13 ZWJraXQtc2hhcGUtb3V0c2lkZTogdXJsKCJkYXRhOmltYWdlL3N2Zyt4bWw7dXRmOCw8c3ZnIHht bG5zPSdodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2Zycgd2lkdGg9JzEwMHB4JyBoZWlnaHQ9JzEw MHB4Jz48cmVjdCB4PScwJyB5PSc1MCcgd2lkdGg9JzUwJyBoZWlnaHQ9JzUwJyBmaWxsPSdibHVl Jy8+PC9zdmc+Iik7CiB9CiA8L3N0eWxlPgogPHNjcmlwdD4KZGlmZiAtLWdpdCBhL0xheW91dFRl c3RzL2Zhc3Qvc2hhcGVzL3NoYXBlLW91dHNpZGUtZmxvYXRzL3NoYXBlLW91dHNpZGUtbGluZWFy LWdyYWRpZW50LWV4cGVjdGVkLmh0bWwgYi9MYXlvdXRUZXN0cy9mYXN0L3NoYXBlcy9zaGFwZS1v dXRzaWRlLWZsb2F0cy9zaGFwZS1vdXRzaWRlLWxpbmVhci1ncmFkaWVudC1leHBlY3RlZC5odG1s CmluZGV4IDU3ODZmMmUuLjE0MjczMjMgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2Zhc3Qvc2hh cGVzL3NoYXBlLW91dHNpZGUtZmxvYXRzL3NoYXBlLW91dHNpZGUtbGluZWFyLWdyYWRpZW50LWV4 cGVjdGVkLmh0bWwKKysrIGIvTGF5b3V0VGVzdHMvZmFzdC9zaGFwZXMvc2hhcGUtb3V0c2lkZS1m bG9hdHMvc2hhcGUtb3V0c2lkZS1saW5lYXItZ3JhZGllbnQtZXhwZWN0ZWQuaHRtbApAQCAtNCw3 ICs0LDcgQEAKIDxzdHlsZT4KICNpbWFnZS1zaGFwZSB7CiAgICAgZmxvYXQ6IGxlZnQ7Ci0gICAg d2lkdGg6IDUxcHg7IC8qIHNoYXBlLW91dHNpZGUgaW50ZXJ2YWxzIGRlcml2ZWQgZnJvbSBpbWFn ZXMgYXJlIGVuZC1wb2ludCBleGNsdXNpdmUgKi8KKyAgICB3aWR0aDogNTBweDsKICAgICBoZWln aHQ6IDEwMHB4OwogfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cgYi9T b3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOTM5N2RjYS4uODY5NjQxMSAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxv ZwpAQCAtMSwzICsxLDI1IEBACisyMDE0LTA0LTI4ICBIYW5zIE11bGxlciAgPGhtdWxsZXJAYWRv YmUuY29tPgorCisgICAgICAgIFtDU1MgU2hhcGVzXSBvZmYtYnktb25lIGVycm9yIGluIFNoYXBl OjpjcmVhdGVSYXN0ZXJTaGFwZSgpCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0xMzIxNTQKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICBUaGlzIGlzIGEgcG9ydCBvZiBhIHBhdGNoIGZvciBhIGJ1ZyB0aGF0IHdh cyByZXBvcnRlZCBieSBhbmQgZml4ZWQgaW4gQmxpbmsgYnkKKyAgICAgICAgRGF2aWQgVmVzdDog aHR0cHM6Ly9jb2RlcmV2aWV3LmNocm9taXVtLm9yZy8yMzcxMjMwMDIvLiAgU2hhcGU6OmNyZWF0 ZVJhc3RlclNoYXBlKCkKKyAgICAgICAgbm93IGNvbnNpc3RlbnRseSByZXBvcnRzICJlbmQtcG9p bnQgZXhjbHVzaXZlIiBpbnRlcnZhbHMuIEJlZm9yZSB0aGUgcGF0Y2gKKyAgICAgICAgYW4gZW50 aXJlIHJvdyBvZiBwaXhlbHMgd2FzIGFib3ZlIHRoZSBzaGFwZS1pbWFnZS10aHJlc2hvbGQsIHRo ZSBpbnRlcnZhbCdzIGVuZAorICAgICAgICBpbmRleCB3YXMgcmVwb3J0ZWQgYXMgaW1hZ2Uud2lk dGguIE5vdyBpdCdzIGltYWdlLndpZHRoICsgMSwgd2hpY2ggaXMgY29uc2lzdGVudAorICAgICAg ICB3aXRoIHRoZSB3YXkgdGhlIGVuZCBpbmRleCBpcyByZXBvcnRlZCBpZiB0aGUgbGFzdCBhYm92 ZSB0aHJlc2hvbGQgcGl4ZWwgaXMgd2l0aGluCisgICAgICAgIGFuIGltYWdlIHJvdy4KKworICAg ICAgICBUd28gZXhpc3RpbmcgdGVzdHMgd2VyZSByZXZpc2VkIHRvIGFjY291bnQgZm9yIHRoaXMg Y2hhbmdlLgorCisgICAgICAgICogcmVuZGVyaW5nL3NoYXBlcy9SYXN0ZXJTaGFwZS5jcHA6Cisg ICAgICAgIChXZWJDb3JlOjpSYXN0ZXJTaGFwZTo6Z2V0RXhjbHVkZWRJbnRlcnZhbHMpOgorICAg ICAgICAqIHJlbmRlcmluZy9zaGFwZXMvU2hhcGUuY3BwOgorICAgICAgICAoV2ViQ29yZTo6U2hh cGU6OmNyZWF0ZVJhc3RlclNoYXBlKToKKwogMjAxNC0wNC0yOCAgTWFydGluIFJvYmluc29uICA8 bXJvYmluc29uQGlnYWxpYS5jb20+CiAKICAgICAgICAgW0dUS10gQnVpbHRpbiBjdXJzb3JzIGRv IG5vdCBwcm9wZXJseSBoYW5kbGUgdHJhbnNwYXJlbmN5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9yZW5kZXJpbmcvc2hhcGVzL1Jhc3RlclNoYXBlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3Jl bmRlcmluZy9zaGFwZXMvUmFzdGVyU2hhcGUuY3BwCmluZGV4IDljMGNlZGUuLjQwMjljZWMgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zaGFwZXMvUmFzdGVyU2hhcGUuY3Bw CisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zaGFwZXMvUmFzdGVyU2hhcGUuY3BwCkBA IC0xNjgsNyArMTY4LDEyIEBAIHZvaWQgUmFzdGVyU2hhcGU6OmdldEV4Y2x1ZGVkSW50ZXJ2YWxz KExheW91dFVuaXQgbG9naWNhbFRvcCwgTGF5b3V0VW5pdCBsb2dpY2FsCiAgICAgZm9yIChpbnQg eSA9IHkxOyB5IDwgeTI7ICB5KyspCiAgICAgICAgIGV4Y2x1ZGVkSW50ZXJ2YWwudW5pdGUoaW50 ZXJ2YWxzLmludGVydmFsQXQoeSkpOwogCi0gICAgcmVzdWx0LmFwcGVuZChMaW5lU2VnbWVudChl eGNsdWRlZEludGVydmFsLngxKCksIGV4Y2x1ZGVkSW50ZXJ2YWwueDIoKSArIDEpKTsKKyAgICAv LyBOb3RlOiBtYXJnaW5JbnRlcnZhbHMoKSByZXR1cm5zICJlbmQtcG9pbnQgZXhjbHVzaXZlIiBp bnRlcnZhbHMuCisgICAgLy8gVGhlIHZhbHVlIG9mIGV4Y2x1ZGVkSW50ZXJ2YWwueDEoKSBpcyB0 aGUgZmlyc3QgaW5kZXggb2YgYW4gCisgICAgLy8gYWJvdmUtdGhyZXNob2xkIHBpeGVsIHdpdGhp biB0aGUgeTEgLSB5MiBsaW5lLiBUaGUgdmFsdWUgb2YgeDIKKyAgICAvLyBpcyB0aGUgMSsgdGhl IGluZGV4IG9mIHRoZSBsYXN0IGFib3ZlLXRocmVzaG9sZCBwaXhlbC4KKworICAgIHJlc3VsdC5h cHBlbmQoTGluZVNlZ21lbnQoZXhjbHVkZWRJbnRlcnZhbC54MSgpLCBleGNsdWRlZEludGVydmFs LngyKCkpKW87CiB9CiAKIH0gLy8gbmFtZXNwYWNlIFdlYkNvcmUKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL3JlbmRlcmluZy9zaGFwZXMvU2hhcGUuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVu ZGVyaW5nL3NoYXBlcy9TaGFwZS5jcHAKaW5kZXggZjZjMzE3ZS4uZjk5NjhmZSAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3NoYXBlcy9TaGFwZS5jcHAKKysrIGIvU291cmNl L1dlYkNvcmUvcmVuZGVyaW5nL3NoYXBlcy9TaGFwZS5jcHAKQEAgLTIwMiw3ICsyMDIsOCBAQCBz dGQ6OnVuaXF1ZV9wdHI8U2hhcGU+IFNoYXBlOjpjcmVhdGVSYXN0ZXJTaGFwZShJbWFnZSogaW1h Z2UsIGZsb2F0IHRocmVzaG9sZCwgYwogICAgICAgICAgICAgICAgICAgICBpZiAoc3RhcnRYID09 IC0xICYmIGFscGhhQWJvdmVUaHJlc2hvbGQpIHsKICAgICAgICAgICAgICAgICAgICAgICAgIHN0 YXJ0WCA9IHg7CiAgICAgICAgICAgICAgICAgICAgIH0gZWxzZSBpZiAoc3RhcnRYICE9IC0xICYm ICghYWxwaGFBYm92ZVRocmVzaG9sZCB8fCB4ID09IGltYWdlUmVjdC53aWR0aCgpIC0gMSkpIHsK LSAgICAgICAgICAgICAgICAgICAgICAgIGludGVydmFscy0+aW50ZXJ2YWxBdCh5ICsgaW1hZ2VS ZWN0LnkoKSkudW5pdGUoSW50U2hhcGVJbnRlcnZhbChzdGFydFggKyBpbWFnZVJlY3QueCgpLCB4 ICsgaW1hZ2VSZWN0LngoKSkpOworICAgICAgICAgICAgICAgICAgICAgICAgaW50IGVuZFggPSBh bHBoYUFib3ZlVGhyZXNob2xkID8geCArIDEgOiB4OworICAgICAgICAgICAgICAgICAgICAgICAg aW50ZXJ2YWxzLT5pbnRlcnZhbEF0KHkgKyBpbWFnZVJlY3QueSgpKS51bml0ZShJbnRTaGFwZUlu dGVydmFsKHN0YXJ0WCArIGltYWdlUmVjdC54KCksIGVuZFggKyBpbWFnZVJlY3QueCgpKSk7CiAg ICAgICAgICAgICAgICAgICAgICAgICBzdGFydFggPSAtMTsKICAgICAgICAgICAgICAgICAgICAg fQogICAgICAgICAgICAgICAgIH0K 230322 2014-04-28 14:18:54 -0700 2014-04-29 08:55:34 -0700 Patch tmp.patch text/plain 5435 giles_joplin ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCA3N2M1Yjk0Li43Mjk4MDE5IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTYgQEAKKzIwMTQtMDQt MjggIEhhbnMgTXVsbGVyICA8aG11bGxlckBhZG9iZS5jb20+CisKKyAgICAgICAgW0NTUyBTaGFw ZXNdIG9mZi1ieS1vbmUgZXJyb3IgaW4gU2hhcGU6OmNyZWF0ZVJhc3RlclNoYXBlKCkKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEzMjE1NAorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIENoYW5nZSB0d28gdGVz dHMgdGhhdCBoYWQgaW5jb3JyZWN0IFggdmFsdWVzIHRvIGFjY291bnQgZm9yIHRoZSBvZmYtYnkt b25lCisgICAgICAgIGluIFNoYXBlOjpjcmVhdGVSYXN0ZXJTaGFwZSgpLgorCisgICAgICAgICog ZmFzdC9zaGFwZXMvc2hhcGUtb3V0c2lkZS1mbG9hdHMvc2hhcGUtb3V0c2lkZS1pbnNlcnQtc3Zn LXNoYXBlLmh0bWw6CisgICAgICAgICogZmFzdC9zaGFwZXMvc2hhcGUtb3V0c2lkZS1mbG9hdHMv c2hhcGUtb3V0c2lkZS1saW5lYXItZ3JhZGllbnQtZXhwZWN0ZWQuaHRtbDoKKwogMjAxNC0wNC0y OCAgWGFiaWVyIFJvZHJpZ3VleiBDYWx2YXIgIDxjYWx2YXJpc0BpZ2FsaWEuY29tPgogCiAgICAg ICAgIFVucmV2aWV3ZWQgR1RLIGdhcmRlbmluZy4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2Zh c3Qvc2hhcGVzL3NoYXBlLW91dHNpZGUtZmxvYXRzL3NoYXBlLW91dHNpZGUtaW5zZXJ0LXN2Zy1z aGFwZS5odG1sIGIvTGF5b3V0VGVzdHMvZmFzdC9zaGFwZXMvc2hhcGUtb3V0c2lkZS1mbG9hdHMv c2hhcGUtb3V0c2lkZS1pbnNlcnQtc3ZnLXNoYXBlLmh0bWwKaW5kZXggZjdlZmZkNC4uZGU2OWY0 NSAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvZmFzdC9zaGFwZXMvc2hhcGUtb3V0c2lkZS1mbG9h dHMvc2hhcGUtb3V0c2lkZS1pbnNlcnQtc3ZnLXNoYXBlLmh0bWwKKysrIGIvTGF5b3V0VGVzdHMv ZmFzdC9zaGFwZXMvc2hhcGUtb3V0c2lkZS1mbG9hdHMvc2hhcGUtb3V0c2lkZS1pbnNlcnQtc3Zn LXNoYXBlLmh0bWwKQEAgLTExLDcgKzExLDcgQEAKICAgICB3aWR0aDogMTAwcHg7CiAgICAgaGVp Z2h0OiAxMDBweDsKICAgICBmbG9hdDogbGVmdDsKLSAgICAtd2Via2l0LXNoYXBlLW91dHNpZGU6 IHVybCgiZGF0YTppbWFnZS9zdmcreG1sO3V0ZjgsPHN2ZyB4bWxucz0naHR0cDovL3d3dy53My5v cmcvMjAwMC9zdmcnIHdpZHRoPScxMDBweCcgaGVpZ2h0PScxMDBweCc+PHJlY3QgeD0nMCcgeT0n NTAnIHdpZHRoPSc0OScgaGVpZ2h0PSc0OScgZmlsbD0nYmx1ZScvPjwvc3ZnPiIpOworICAgIC13 ZWJraXQtc2hhcGUtb3V0c2lkZTogdXJsKCJkYXRhOmltYWdlL3N2Zyt4bWw7dXRmOCw8c3ZnIHht bG5zPSdodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2Zycgd2lkdGg9JzEwMHB4JyBoZWlnaHQ9JzEw MHB4Jz48cmVjdCB4PScwJyB5PSc1MCcgd2lkdGg9JzUwJyBoZWlnaHQ9JzUwJyBmaWxsPSdibHVl Jy8+PC9zdmc+Iik7CiB9CiA8L3N0eWxlPgogPHNjcmlwdD4KZGlmZiAtLWdpdCBhL0xheW91dFRl c3RzL2Zhc3Qvc2hhcGVzL3NoYXBlLW91dHNpZGUtZmxvYXRzL3NoYXBlLW91dHNpZGUtbGluZWFy LWdyYWRpZW50LWV4cGVjdGVkLmh0bWwgYi9MYXlvdXRUZXN0cy9mYXN0L3NoYXBlcy9zaGFwZS1v dXRzaWRlLWZsb2F0cy9zaGFwZS1vdXRzaWRlLWxpbmVhci1ncmFkaWVudC1leHBlY3RlZC5odG1s CmluZGV4IDU3ODZmMmUuLjE0MjczMjMgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2Zhc3Qvc2hh cGVzL3NoYXBlLW91dHNpZGUtZmxvYXRzL3NoYXBlLW91dHNpZGUtbGluZWFyLWdyYWRpZW50LWV4 cGVjdGVkLmh0bWwKKysrIGIvTGF5b3V0VGVzdHMvZmFzdC9zaGFwZXMvc2hhcGUtb3V0c2lkZS1m bG9hdHMvc2hhcGUtb3V0c2lkZS1saW5lYXItZ3JhZGllbnQtZXhwZWN0ZWQuaHRtbApAQCAtNCw3 ICs0LDcgQEAKIDxzdHlsZT4KICNpbWFnZS1zaGFwZSB7CiAgICAgZmxvYXQ6IGxlZnQ7Ci0gICAg d2lkdGg6IDUxcHg7IC8qIHNoYXBlLW91dHNpZGUgaW50ZXJ2YWxzIGRlcml2ZWQgZnJvbSBpbWFn ZXMgYXJlIGVuZC1wb2ludCBleGNsdXNpdmUgKi8KKyAgICB3aWR0aDogNTBweDsKICAgICBoZWln aHQ6IDEwMHB4OwogfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cgYi9T b3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOTM5N2RjYS4uODY5NjQxMSAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxv ZwpAQCAtMSwzICsxLDI1IEBACisyMDE0LTA0LTI4ICBIYW5zIE11bGxlciAgPGhtdWxsZXJAYWRv YmUuY29tPgorCisgICAgICAgIFtDU1MgU2hhcGVzXSBvZmYtYnktb25lIGVycm9yIGluIFNoYXBl OjpjcmVhdGVSYXN0ZXJTaGFwZSgpCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0xMzIxNTQKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICBUaGlzIGlzIGEgcG9ydCBvZiBhIHBhdGNoIGZvciBhIGJ1ZyB0aGF0IHdh cyByZXBvcnRlZCBieSBhbmQgZml4ZWQgaW4gQmxpbmsgYnkKKyAgICAgICAgRGF2aWQgVmVzdDog aHR0cHM6Ly9jb2RlcmV2aWV3LmNocm9taXVtLm9yZy8yMzcxMjMwMDIvLiAgU2hhcGU6OmNyZWF0 ZVJhc3RlclNoYXBlKCkKKyAgICAgICAgbm93IGNvbnNpc3RlbnRseSByZXBvcnRzICJlbmQtcG9p bnQgZXhjbHVzaXZlIiBpbnRlcnZhbHMuIEJlZm9yZSB0aGUgcGF0Y2gKKyAgICAgICAgYW4gZW50 aXJlIHJvdyBvZiBwaXhlbHMgd2FzIGFib3ZlIHRoZSBzaGFwZS1pbWFnZS10aHJlc2hvbGQsIHRo ZSBpbnRlcnZhbCdzIGVuZAorICAgICAgICBpbmRleCB3YXMgcmVwb3J0ZWQgYXMgaW1hZ2Uud2lk dGguIE5vdyBpdCdzIGltYWdlLndpZHRoICsgMSwgd2hpY2ggaXMgY29uc2lzdGVudAorICAgICAg ICB3aXRoIHRoZSB3YXkgdGhlIGVuZCBpbmRleCBpcyByZXBvcnRlZCBpZiB0aGUgbGFzdCBhYm92 ZSB0aHJlc2hvbGQgcGl4ZWwgaXMgd2l0aGluCisgICAgICAgIGFuIGltYWdlIHJvdy4KKworICAg ICAgICBUd28gZXhpc3RpbmcgdGVzdHMgd2VyZSByZXZpc2VkIHRvIGFjY291bnQgZm9yIHRoaXMg Y2hhbmdlLgorCisgICAgICAgICogcmVuZGVyaW5nL3NoYXBlcy9SYXN0ZXJTaGFwZS5jcHA6Cisg ICAgICAgIChXZWJDb3JlOjpSYXN0ZXJTaGFwZTo6Z2V0RXhjbHVkZWRJbnRlcnZhbHMpOgorICAg ICAgICAqIHJlbmRlcmluZy9zaGFwZXMvU2hhcGUuY3BwOgorICAgICAgICAoV2ViQ29yZTo6U2hh cGU6OmNyZWF0ZVJhc3RlclNoYXBlKToKKwogMjAxNC0wNC0yOCAgTWFydGluIFJvYmluc29uICA8 bXJvYmluc29uQGlnYWxpYS5jb20+CiAKICAgICAgICAgW0dUS10gQnVpbHRpbiBjdXJzb3JzIGRv IG5vdCBwcm9wZXJseSBoYW5kbGUgdHJhbnNwYXJlbmN5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9yZW5kZXJpbmcvc2hhcGVzL1Jhc3RlclNoYXBlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3Jl bmRlcmluZy9zaGFwZXMvUmFzdGVyU2hhcGUuY3BwCmluZGV4IDljMGNlZGUuLjA0YjQ2MjMgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zaGFwZXMvUmFzdGVyU2hhcGUuY3Bw CisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zaGFwZXMvUmFzdGVyU2hhcGUuY3BwCkBA IC0xNjgsNyArMTY4LDEyIEBAIHZvaWQgUmFzdGVyU2hhcGU6OmdldEV4Y2x1ZGVkSW50ZXJ2YWxz KExheW91dFVuaXQgbG9naWNhbFRvcCwgTGF5b3V0VW5pdCBsb2dpY2FsCiAgICAgZm9yIChpbnQg eSA9IHkxOyB5IDwgeTI7ICB5KyspCiAgICAgICAgIGV4Y2x1ZGVkSW50ZXJ2YWwudW5pdGUoaW50 ZXJ2YWxzLmludGVydmFsQXQoeSkpOwogCi0gICAgcmVzdWx0LmFwcGVuZChMaW5lU2VnbWVudChl eGNsdWRlZEludGVydmFsLngxKCksIGV4Y2x1ZGVkSW50ZXJ2YWwueDIoKSArIDEpKTsKKyAgICAv LyBOb3RlOiBtYXJnaW5JbnRlcnZhbHMoKSByZXR1cm5zICJlbmQtcG9pbnQgZXhjbHVzaXZlIiBp bnRlcnZhbHMuCisgICAgLy8gVGhlIHZhbHVlIG9mIGV4Y2x1ZGVkSW50ZXJ2YWwueDEoKSBpcyB0 aGUgZmlyc3QgaW5kZXggb2YgYW4gCisgICAgLy8gYWJvdmUtdGhyZXNob2xkIHBpeGVsIHdpdGhp biB0aGUgeTEgLSB5MiBsaW5lLiBUaGUgdmFsdWUgb2YgeDIKKyAgICAvLyBpcyB0aGUgMSsgdGhl IGluZGV4IG9mIHRoZSBsYXN0IGFib3ZlLXRocmVzaG9sZCBwaXhlbC4KKworICAgIHJlc3VsdC5h cHBlbmQoTGluZVNlZ21lbnQoZXhjbHVkZWRJbnRlcnZhbC54MSgpLCBleGNsdWRlZEludGVydmFs LngyKCkpKTsKIH0KIAogfSAvLyBuYW1lc3BhY2UgV2ViQ29yZQpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvcmVuZGVyaW5nL3NoYXBlcy9TaGFwZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5k ZXJpbmcvc2hhcGVzL1NoYXBlLmNwcAppbmRleCBmNmMzMTdlLi5mOTk2OGZlIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc2hhcGVzL1NoYXBlLmNwcAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9yZW5kZXJpbmcvc2hhcGVzL1NoYXBlLmNwcApAQCAtMjAyLDcgKzIwMiw4IEBAIHN0 ZDo6dW5pcXVlX3B0cjxTaGFwZT4gU2hhcGU6OmNyZWF0ZVJhc3RlclNoYXBlKEltYWdlKiBpbWFn ZSwgZmxvYXQgdGhyZXNob2xkLCBjCiAgICAgICAgICAgICAgICAgICAgIGlmIChzdGFydFggPT0g LTEgJiYgYWxwaGFBYm92ZVRocmVzaG9sZCkgewogICAgICAgICAgICAgICAgICAgICAgICAgc3Rh cnRYID0geDsKICAgICAgICAgICAgICAgICAgICAgfSBlbHNlIGlmIChzdGFydFggIT0gLTEgJiYg KCFhbHBoYUFib3ZlVGhyZXNob2xkIHx8IHggPT0gaW1hZ2VSZWN0LndpZHRoKCkgLSAxKSkgewot ICAgICAgICAgICAgICAgICAgICAgICAgaW50ZXJ2YWxzLT5pbnRlcnZhbEF0KHkgKyBpbWFnZVJl Y3QueSgpKS51bml0ZShJbnRTaGFwZUludGVydmFsKHN0YXJ0WCArIGltYWdlUmVjdC54KCksIHgg KyBpbWFnZVJlY3QueCgpKSk7CisgICAgICAgICAgICAgICAgICAgICAgICBpbnQgZW5kWCA9IGFs cGhhQWJvdmVUaHJlc2hvbGQgPyB4ICsgMSA6IHg7CisgICAgICAgICAgICAgICAgICAgICAgICBp bnRlcnZhbHMtPmludGVydmFsQXQoeSArIGltYWdlUmVjdC55KCkpLnVuaXRlKEludFNoYXBlSW50 ZXJ2YWwoc3RhcnRYICsgaW1hZ2VSZWN0LngoKSwgZW5kWCArIGltYWdlUmVjdC54KCkpKTsKICAg ICAgICAgICAgICAgICAgICAgICAgIHN0YXJ0WCA9IC0xOwogICAgICAgICAgICAgICAgICAgICB9 CiAgICAgICAgICAgICAgICAgfQo= 230379 2014-04-29 08:55:34 -0700 2014-04-29 09:41:01 -0700 Patch tmp.patch text/plain 5449 giles_joplin ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCA3N2M1Yjk0Li43Mjk4MDE5IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTYgQEAKKzIwMTQtMDQt MjggIEhhbnMgTXVsbGVyICA8aG11bGxlckBhZG9iZS5jb20+CisKKyAgICAgICAgW0NTUyBTaGFw ZXNdIG9mZi1ieS1vbmUgZXJyb3IgaW4gU2hhcGU6OmNyZWF0ZVJhc3RlclNoYXBlKCkKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEzMjE1NAorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIENoYW5nZSB0d28gdGVz dHMgdGhhdCBoYWQgaW5jb3JyZWN0IFggdmFsdWVzIHRvIGFjY291bnQgZm9yIHRoZSBvZmYtYnkt b25lCisgICAgICAgIGluIFNoYXBlOjpjcmVhdGVSYXN0ZXJTaGFwZSgpLgorCisgICAgICAgICog ZmFzdC9zaGFwZXMvc2hhcGUtb3V0c2lkZS1mbG9hdHMvc2hhcGUtb3V0c2lkZS1pbnNlcnQtc3Zn LXNoYXBlLmh0bWw6CisgICAgICAgICogZmFzdC9zaGFwZXMvc2hhcGUtb3V0c2lkZS1mbG9hdHMv c2hhcGUtb3V0c2lkZS1saW5lYXItZ3JhZGllbnQtZXhwZWN0ZWQuaHRtbDoKKwogMjAxNC0wNC0y OCAgWGFiaWVyIFJvZHJpZ3VleiBDYWx2YXIgIDxjYWx2YXJpc0BpZ2FsaWEuY29tPgogCiAgICAg ICAgIFVucmV2aWV3ZWQgR1RLIGdhcmRlbmluZy4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2Zh c3Qvc2hhcGVzL3NoYXBlLW91dHNpZGUtZmxvYXRzL3NoYXBlLW91dHNpZGUtaW5zZXJ0LXN2Zy1z aGFwZS5odG1sIGIvTGF5b3V0VGVzdHMvZmFzdC9zaGFwZXMvc2hhcGUtb3V0c2lkZS1mbG9hdHMv c2hhcGUtb3V0c2lkZS1pbnNlcnQtc3ZnLXNoYXBlLmh0bWwKaW5kZXggZjdlZmZkNC4uZGU2OWY0 NSAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvZmFzdC9zaGFwZXMvc2hhcGUtb3V0c2lkZS1mbG9h dHMvc2hhcGUtb3V0c2lkZS1pbnNlcnQtc3ZnLXNoYXBlLmh0bWwKKysrIGIvTGF5b3V0VGVzdHMv ZmFzdC9zaGFwZXMvc2hhcGUtb3V0c2lkZS1mbG9hdHMvc2hhcGUtb3V0c2lkZS1pbnNlcnQtc3Zn LXNoYXBlLmh0bWwKQEAgLTExLDcgKzExLDcgQEAKICAgICB3aWR0aDogMTAwcHg7CiAgICAgaGVp Z2h0OiAxMDBweDsKICAgICBmbG9hdDogbGVmdDsKLSAgICAtd2Via2l0LXNoYXBlLW91dHNpZGU6 IHVybCgiZGF0YTppbWFnZS9zdmcreG1sO3V0ZjgsPHN2ZyB4bWxucz0naHR0cDovL3d3dy53My5v cmcvMjAwMC9zdmcnIHdpZHRoPScxMDBweCcgaGVpZ2h0PScxMDBweCc+PHJlY3QgeD0nMCcgeT0n NTAnIHdpZHRoPSc0OScgaGVpZ2h0PSc0OScgZmlsbD0nYmx1ZScvPjwvc3ZnPiIpOworICAgIC13 ZWJraXQtc2hhcGUtb3V0c2lkZTogdXJsKCJkYXRhOmltYWdlL3N2Zyt4bWw7dXRmOCw8c3ZnIHht bG5zPSdodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2Zycgd2lkdGg9JzEwMHB4JyBoZWlnaHQ9JzEw MHB4Jz48cmVjdCB4PScwJyB5PSc1MCcgd2lkdGg9JzUwJyBoZWlnaHQ9JzUwJyBmaWxsPSdibHVl Jy8+PC9zdmc+Iik7CiB9CiA8L3N0eWxlPgogPHNjcmlwdD4KZGlmZiAtLWdpdCBhL0xheW91dFRl c3RzL2Zhc3Qvc2hhcGVzL3NoYXBlLW91dHNpZGUtZmxvYXRzL3NoYXBlLW91dHNpZGUtbGluZWFy LWdyYWRpZW50LWV4cGVjdGVkLmh0bWwgYi9MYXlvdXRUZXN0cy9mYXN0L3NoYXBlcy9zaGFwZS1v dXRzaWRlLWZsb2F0cy9zaGFwZS1vdXRzaWRlLWxpbmVhci1ncmFkaWVudC1leHBlY3RlZC5odG1s CmluZGV4IDU3ODZmMmUuLjE0MjczMjMgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2Zhc3Qvc2hh cGVzL3NoYXBlLW91dHNpZGUtZmxvYXRzL3NoYXBlLW91dHNpZGUtbGluZWFyLWdyYWRpZW50LWV4 cGVjdGVkLmh0bWwKKysrIGIvTGF5b3V0VGVzdHMvZmFzdC9zaGFwZXMvc2hhcGUtb3V0c2lkZS1m bG9hdHMvc2hhcGUtb3V0c2lkZS1saW5lYXItZ3JhZGllbnQtZXhwZWN0ZWQuaHRtbApAQCAtNCw3 ICs0LDcgQEAKIDxzdHlsZT4KICNpbWFnZS1zaGFwZSB7CiAgICAgZmxvYXQ6IGxlZnQ7Ci0gICAg d2lkdGg6IDUxcHg7IC8qIHNoYXBlLW91dHNpZGUgaW50ZXJ2YWxzIGRlcml2ZWQgZnJvbSBpbWFn ZXMgYXJlIGVuZC1wb2ludCBleGNsdXNpdmUgKi8KKyAgICB3aWR0aDogNTBweDsKICAgICBoZWln aHQ6IDEwMHB4OwogfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cgYi9T b3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOTM5N2RjYS4uODY5NjQxMSAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxv ZwpAQCAtMSwzICsxLDI1IEBACisyMDE0LTA0LTI4ICBIYW5zIE11bGxlciAgPGhtdWxsZXJAYWRv YmUuY29tPgorCisgICAgICAgIFtDU1MgU2hhcGVzXSBvZmYtYnktb25lIGVycm9yIGluIFNoYXBl OjpjcmVhdGVSYXN0ZXJTaGFwZSgpCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0xMzIxNTQKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICBUaGlzIGlzIGEgcG9ydCBvZiBhIHBhdGNoIGZvciBhIGJ1ZyB0aGF0IHdh cyByZXBvcnRlZCBieSBhbmQgZml4ZWQgaW4gQmxpbmsgYnkKKyAgICAgICAgRGF2aWQgVmVzdDog aHR0cHM6Ly9jb2RlcmV2aWV3LmNocm9taXVtLm9yZy8yMzcxMjMwMDIvLiAgU2hhcGU6OmNyZWF0 ZVJhc3RlclNoYXBlKCkKKyAgICAgICAgbm93IGNvbnNpc3RlbnRseSByZXBvcnRzICJlbmQtcG9p bnQgZXhjbHVzaXZlIiBpbnRlcnZhbHMuIEJlZm9yZSB0aGUgcGF0Y2gKKyAgICAgICAgYW4gZW50 aXJlIHJvdyBvZiBwaXhlbHMgd2FzIGFib3ZlIHRoZSBzaGFwZS1pbWFnZS10aHJlc2hvbGQsIHRo ZSBpbnRlcnZhbCdzIGVuZAorICAgICAgICBpbmRleCB3YXMgcmVwb3J0ZWQgYXMgaW1hZ2Uud2lk dGguIE5vdyBpdCdzIGltYWdlLndpZHRoICsgMSwgd2hpY2ggaXMgY29uc2lzdGVudAorICAgICAg ICB3aXRoIHRoZSB3YXkgdGhlIGVuZCBpbmRleCBpcyByZXBvcnRlZCBpZiB0aGUgbGFzdCBhYm92 ZSB0aHJlc2hvbGQgcGl4ZWwgaXMgd2l0aGluCisgICAgICAgIGFuIGltYWdlIHJvdy4KKworICAg ICAgICBUd28gZXhpc3RpbmcgdGVzdHMgd2VyZSByZXZpc2VkIHRvIGFjY291bnQgZm9yIHRoaXMg Y2hhbmdlLgorCisgICAgICAgICogcmVuZGVyaW5nL3NoYXBlcy9SYXN0ZXJTaGFwZS5jcHA6Cisg ICAgICAgIChXZWJDb3JlOjpSYXN0ZXJTaGFwZTo6Z2V0RXhjbHVkZWRJbnRlcnZhbHMpOgorICAg ICAgICAqIHJlbmRlcmluZy9zaGFwZXMvU2hhcGUuY3BwOgorICAgICAgICAoV2ViQ29yZTo6U2hh cGU6OmNyZWF0ZVJhc3RlclNoYXBlKToKKwogMjAxNC0wNC0yOCAgTWFydGluIFJvYmluc29uICA8 bXJvYmluc29uQGlnYWxpYS5jb20+CiAKICAgICAgICAgW0dUS10gQnVpbHRpbiBjdXJzb3JzIGRv IG5vdCBwcm9wZXJseSBoYW5kbGUgdHJhbnNwYXJlbmN5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9yZW5kZXJpbmcvc2hhcGVzL1Jhc3RlclNoYXBlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3Jl bmRlcmluZy9zaGFwZXMvUmFzdGVyU2hhcGUuY3BwCmluZGV4IDljMGNlZGUuLmFkN2RiY2IgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zaGFwZXMvUmFzdGVyU2hhcGUuY3Bw CisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zaGFwZXMvUmFzdGVyU2hhcGUuY3BwCkBA IC0xNjgsNyArMTY4LDcgQEAgdm9pZCBSYXN0ZXJTaGFwZTo6Z2V0RXhjbHVkZWRJbnRlcnZhbHMo TGF5b3V0VW5pdCBsb2dpY2FsVG9wLCBMYXlvdXRVbml0IGxvZ2ljYWwKICAgICBmb3IgKGludCB5 ID0geTE7IHkgPCB5MjsgIHkrKykKICAgICAgICAgZXhjbHVkZWRJbnRlcnZhbC51bml0ZShpbnRl cnZhbHMuaW50ZXJ2YWxBdCh5KSk7CiAKLSAgICByZXN1bHQuYXBwZW5kKExpbmVTZWdtZW50KGV4 Y2x1ZGVkSW50ZXJ2YWwueDEoKSwgZXhjbHVkZWRJbnRlcnZhbC54MigpICsgMSkpOworICAgIHJl c3VsdC5hcHBlbmQoTGluZVNlZ21lbnQoZXhjbHVkZWRJbnRlcnZhbC54MSgpLCBleGNsdWRlZElu dGVydmFsLngyKCkpKTsKIH0KIAogfSAvLyBuYW1lc3BhY2UgV2ViQ29yZQpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3NoYXBlcy9TaGFwZS5jcHAgYi9Tb3VyY2UvV2ViQ29y ZS9yZW5kZXJpbmcvc2hhcGVzL1NoYXBlLmNwcAppbmRleCBmNmMzMTdlLi44YzcxM2E0IDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc2hhcGVzL1NoYXBlLmNwcAorKysgYi9T b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc2hhcGVzL1NoYXBlLmNwcApAQCAtMjAyLDcgKzIwMiwx MSBAQCBzdGQ6OnVuaXF1ZV9wdHI8U2hhcGU+IFNoYXBlOjpjcmVhdGVSYXN0ZXJTaGFwZShJbWFn ZSogaW1hZ2UsIGZsb2F0IHRocmVzaG9sZCwgYwogICAgICAgICAgICAgICAgICAgICBpZiAoc3Rh cnRYID09IC0xICYmIGFscGhhQWJvdmVUaHJlc2hvbGQpIHsKICAgICAgICAgICAgICAgICAgICAg ICAgIHN0YXJ0WCA9IHg7CiAgICAgICAgICAgICAgICAgICAgIH0gZWxzZSBpZiAoc3RhcnRYICE9 IC0xICYmICghYWxwaGFBYm92ZVRocmVzaG9sZCB8fCB4ID09IGltYWdlUmVjdC53aWR0aCgpIC0g MSkpIHsKLSAgICAgICAgICAgICAgICAgICAgICAgIGludGVydmFscy0+aW50ZXJ2YWxBdCh5ICsg aW1hZ2VSZWN0LnkoKSkudW5pdGUoSW50U2hhcGVJbnRlcnZhbChzdGFydFggKyBpbWFnZVJlY3Qu eCgpLCB4ICsgaW1hZ2VSZWN0LngoKSkpOworICAgICAgICAgICAgICAgICAgICAgICAgLy8gV2Un cmUgY3JlYXRpbmcgImVuZC1wb2ludCBleGNsdXNpdmUiIGludGVydmFscyBoZXJlLiBUaGUgdmFs dWUgb2YgYW4gaW50ZXJ2YWwncyB4MSBpcworICAgICAgICAgICAgICAgICAgICAgICAgLy8gdGhl IGZpcnN0IGluZGV4IG9mIGFuIGFib3ZlLXRocmVzaG9sZCBwaXhlbCBmb3IgeSwgYW5kIHRoZSB2 YWx1ZSBvZiB4MiBpcyAxKyB0aGUgaW5kZXgKKyAgICAgICAgICAgICAgICAgICAgICAgIC8vIG9m IHRoZSBsYXN0IGFib3ZlLXRocmVzaG9sZCBwaXhlbC4KKyAgICAgICAgICAgICAgICAgICAgICAg IGludCBlbmRYID0gYWxwaGFBYm92ZVRocmVzaG9sZCA/IHggKyAxIDogeDsKKyAgICAgICAgICAg ICAgICAgICAgICAgIGludGVydmFscy0+aW50ZXJ2YWxBdCh5ICsgaW1hZ2VSZWN0LnkoKSkudW5p dGUoSW50U2hhcGVJbnRlcnZhbChzdGFydFggKyBpbWFnZVJlY3QueCgpLCBlbmRYICsgaW1hZ2VS ZWN0LngoKSkpOwogICAgICAgICAgICAgICAgICAgICAgICAgc3RhcnRYID0gLTE7CiAgICAgICAg ICAgICAgICAgICAgIH0KICAgICAgICAgICAgICAgICB9Cg==