111780 2013-03-07 15:21:09 -0800 Check to ensure MultisampleRenderbuffer creation succeeds 2013-03-14 16:35:42 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 112217 1 bajones bajones buildbot dino gman kbr rniwa webkit-ews webkit.review.bot zmo oldest_to_newest 850525 0 bajones 2013-03-07 15:21:09 -0800 Check to ensure MultisampleRenderbuffer creation succeeds 850526 1 192092 bajones 2013-03-07 15:21:44 -0800 Created attachment 192092 Patch 850529 2 bajones 2013-03-07 15:24:43 -0800 This will allow us to re-enable WebGL antialiasing on AMD Macs while we wait for a driver fix. 850532 3 192092 webkit-ews 2013-03-07 15:26:48 -0800 Comment on attachment 192092 Patch Attachment 192092 did not pass qt-wk2-ews (qt): Output: http://webkit-commit-queue.appspot.com/results/17070270 850533 4 192092 webkit-ews 2013-03-07 15:27:42 -0800 Comment on attachment 192092 Patch Attachment 192092 did not pass qt-ews (qt): Output: http://webkit-commit-queue.appspot.com/results/17024054 850539 5 192095 bajones 2013-03-07 15:33:27 -0800 Created attachment 192095 Patch 850550 6 192095 webkit-ews 2013-03-07 15:39:16 -0800 Comment on attachment 192095 Patch Attachment 192095 did not pass qt-ews (qt): Output: http://webkit-commit-queue.appspot.com/results/17075184 850555 7 192095 webkit-ews 2013-03-07 15:41:41 -0800 Comment on attachment 192095 Patch Attachment 192095 did not pass qt-wk2-ews (qt): Output: http://webkit-commit-queue.appspot.com/results/17038111 850567 8 192095 kbr 2013-03-07 15:47:14 -0800 Comment on attachment 192095 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=192095&action=review Looks pretty good overall but a few changes are needed. Also, please ensure you've tested this with multisampling re-enabled on all GPU types on OS X. > Source/WebCore/ChangeLog:8 > + No new tests. Why not? Please describe the issue and workaround, and why an automated test can't be written if necessary. Please also indicate what testing was done for this patch. > Source/WebCore/platform/graphics/gpu/DrawingBuffer.cpp:193 > +// TODO(bajones): This can be removed once renderbufferStorageMultisample starts reporting GL_OUT_OF_MEMORY properly Nit: please use periods after sentences, here and throughout the patch. > Source/WebCore/platform/graphics/gpu/DrawingBuffer.cpp:205 > + uint32 pixel = 0; Please use an unsigned char[4] instead of a uint32 to avoid byte ordering problems. > Source/WebCore/platform/graphics/gpu/DrawingBuffer.cpp:310 > +#if PLATFORM(MAC) This won't take effect for the Chromium port. For that port you need to use PLATFORM(CHROMIUM) and OS(DARWIN). Just using OS(DARWIN) may be the best way to ensure this runs on all WebKit ports on the Mac. It would be better if you could figure out a way to turn this into a run-time check that runs only on the appropriate GPUs. 851537 9 192291 bajones 2013-03-08 15:01:13 -0800 Created attachment 192291 Patch 851539 10 192291 dino 2013-03-08 15:05:14 -0800 Comment on attachment 192291 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=192291&action=review > Source/WebCore/platform/graphics/gpu/DrawingBuffer.cpp:193 > +// TODO(bajones): This can be removed once renderbufferStorageMultisample starts reporting GL_OUT_OF_MEMORY properly. We don't normally use names in comments, and WebKit tends to use "FIXME:" rather than TODO. 851540 11 192292 bajones 2013-03-08 15:08:12 -0800 Created attachment 192292 Patch 851580 12 192292 webkit.review.bot 2013-03-08 15:49:23 -0800 Comment on attachment 192292 Patch Clearing flags on attachment: 192292 Committed r145280: <http://trac.webkit.org/changeset/145280> 851581 13 webkit.review.bot 2013-03-08 15:49:26 -0800 All reviewed patches have been landed. Closing bug. 853960 14 webkit.review.bot 2013-03-12 18:10:03 -0700 Re-opened since this is blocked by bug 112217 854102 15 192292 buildbot 2013-03-13 00:46:01 -0700 Comment on attachment 192292 Patch Attachment 192292 did not pass mac-wk2-ews (mac-wk2): Output: http://webkit-commit-queue.appspot.com/results/17136144 New failing tests: xmlviewer/extensions-api.html 855500 16 193187 bajones 2013-03-14 14:45:03 -0700 Created attachment 193187 Patch 855503 17 bajones 2013-03-14 14:48:01 -0700 Issue breaking the tests was that glColorMask or GL_SCISSOR state could interfere with the validation check by preventing the correct color from being written. Updated patch ensures valid state before testing. 855524 18 193187 kbr 2013-03-14 15:37:55 -0700 Comment on attachment 193187 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=193187&action=review Good catch. Couple of questions. > Source/WebCore/ChangeLog:-6566 > - Don't remove the old ChangeLog entry. > Source/WebCore/platform/graphics/gpu/DrawingBuffer.cpp:202 > + m_context->colorMask(true, true, true, true); Don't you also need to restore the user's color mask afterward? 855529 19 193187 bajones 2013-03-14 15:48:28 -0700 Comment on attachment 193187 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=193187&action=review >> Source/WebCore/ChangeLog:-6566 >> - > > Don't remove the old ChangeLog entry. Okay, thanks. Wasn't sure what the protocol was in this case. >> Source/WebCore/platform/graphics/gpu/DrawingBuffer.cpp:202 >> + m_context->colorMask(true, true, true, true); > > Don't you also need to restore the user's color mask afterward? If so then we're already broken. reset() does the same thing (Line 342) without ever restoring it. Perhaps this is a bug? 855534 20 193187 kbr 2013-03-14 16:01:11 -0700 Comment on attachment 193187 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=193187&action=review Looks fine modulo the ChangeLog entry. >>> Source/WebCore/platform/graphics/gpu/DrawingBuffer.cpp:202 >>> + m_context->colorMask(true, true, true, true); >> >> Don't you also need to restore the user's color mask afterward? > > If so then we're already broken. reset() does the same thing (Line 342) without ever restoring it. Perhaps this is a bug? Looking again, WebGLRenderingContext::restoreStateAfterClear resets the color mask, so this is OK. 855535 21 193196 bajones 2013-03-14 16:05:27 -0700 Created attachment 193196 Patch 855539 22 193196 webkit.review.bot 2013-03-14 16:08:59 -0700 Comment on attachment 193196 Patch Rejecting attachment 193196 from commit-queue. bajones@chromium.org does not have committer permissions according to http://trac.webkit.org/browser/trunk/Tools/Scripts/webkitpy/common/config/committers.py. - If you do not have committer rights please read http://webkit.org/coding/contributing.html for instructions on how to use bugzilla flags. - If you have committer rights please correct the error in Tools/Scripts/webkitpy/common/config/committers.py by adding yourself to the file (no review needed). The commit-queue restarts itself every 2 hours. After restart the commit-queue will correctly respect your committer rights. 855562 23 193196 webkit.review.bot 2013-03-14 16:35:37 -0700 Comment on attachment 193196 Patch Clearing flags on attachment: 193196 Committed r145856: <http://trac.webkit.org/changeset/145856> 855563 24 webkit.review.bot 2013-03-14 16:35:42 -0700 All reviewed patches have been landed. Closing bug. 192092 2013-03-07 15:21:44 -0800 2013-03-07 15:33:25 -0800 Patch bug-111780-20130307151748.patch text/plain 4806 bajones U3VidmVyc2lvbiBSZXZpc2lvbjogMTQ1MDkwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggN2Q1NTg4NjNiMGJkYmNh ZmJhMDNkODY3N2E1MDU2MTIzOGMwZDE1MC4uZmM3M2YxN2Y0N2U2YTM4YjkyODkwZDJmODBiMDYw ZmQwZGFmMDdhYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDEzLTAzLTA3ICBCcmFu ZG9uIEpvbmVzICA8YmFqb25lc0Bnb29nbGUuY29tPgorCisgICAgICAgIENoZWNrIHRvIGVuc3Vy ZSBNdWx0aXNhbXBsZVJlbmRlcmJ1ZmZlciBjcmVhdGlvbiBzdWNjZWVkcworICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTExNzgwCisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgTm8gbmV3IHRlc3RzLgorCisgICAg ICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvZ3B1L0RyYXdpbmdCdWZmZXIuY3BwOgorICAgICAgICAo V2ViQ29yZSk6CisgICAgICAgIChXZWJDb3JlOjpEcmF3aW5nQnVmZmVyOjpjaGVja0J1ZmZlcklu dGVncml0eSk6CisgICAgICAgIChXZWJDb3JlOjpEcmF3aW5nQnVmZmVyOjpyZXNldCk6CisgICAg ICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvZ3B1L0RyYXdpbmdCdWZmZXIuaDoKKyAgICAgICAgKERy YXdpbmdCdWZmZXIpOgorCiAyMDEzLTAzLTA3ICBWc2V2b2xvZCBWbGFzb3YgIDx2c2V2aWtAY2hy b21pdW0ub3JnPgogCiAgICAgICAgIFdlYiBJbnNwZWN0b3I6IFN0eWxlcyBzaWRlYmFyIHBhbmUg dG9vbGJhciBkaXNhcHBlYXJzIGluIGhvcml6b250YWwgc3BsaXQgbW9kZS4KZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dwdS9EcmF3aW5nQnVmZmVyLmNwcCBi L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dwdS9EcmF3aW5nQnVmZmVyLmNwcApp bmRleCBiZDQxMjlhM2E2ZTk5ZmY4ZWUwOWQ1YmY5NzcwMTJmNzIxNmViY2QxLi41NDVmZjQ4MjI5 NzM1MDRkNmVhOWFlOWQyMTlmNzZiZjk4ZDBmY2NjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9ncmFwaGljcy9ncHUvRHJhd2luZ0J1ZmZlci5jcHAKKysrIGIvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3B1L0RyYXdpbmdCdWZmZXIuY3BwCkBAIC0xODksNiAr MTg5LDI1IEBAIHZvaWQgRHJhd2luZ0J1ZmZlcjo6Y2xlYXJGcmFtZWJ1ZmZlcnMoR0MzRGJpdGZp ZWxkIGNsZWFyTWFzaykKICAgICB9CiB9CiAKKy8vIE9ubHkgd2F5IHRvIGVuc3VyZSB0aGF0IHdl J3JlIG5vdCBnZXR0aW5nIGEgYmFkIGZyYW1lYnVmZmVyIG9uIHNvbWUgQU1EL09TWCBkZXZpY2Vz CisvLyBUT0RPKGJham9uZXMpOiBUaGlzIGNhbiBiZSByZW1vdmVkIG9uY2UgcmVuZGVyYnVmZmVy U3RvcmFnZU11bHRpc2FtcGxlIHN0YXJ0cyByZXBvcnRpbmcgR0xfT1VUX09GX01FTU9SWSBwcm9w ZXJseQorYm9vbCBEcmF3aW5nQnVmZmVyOjpjaGVja0J1ZmZlckludGVncml0eSgpCit7CisgICAg aWYgKCFtX211bHRpc2FtcGxlRkJPKQorICAgICAgICByZXR1cm4gdHJ1ZTsKKworICAgIG1fY29u dGV4dC0+YmluZEZyYW1lYnVmZmVyKEdyYXBoaWNzQ29udGV4dDNEOjpGUkFNRUJVRkZFUiwgbV9t dWx0aXNhbXBsZUZCTyk7CisgICAgbV9jb250ZXh0LT5jbGVhckNvbG9yKDEuMGYsIDAuMGYsIDEu MGYsIDEuMGYpOworICAgIG1fY29udGV4dC0+Y2xlYXIoR3JhcGhpY3NDb250ZXh0M0Q6OkNPTE9S X0JVRkZFUl9CSVQpOworCisgICAgY29tbWl0KDAsIDAsIDEsIDEpOworCisgICAgdWludDMyIHBp eGVsID0gMDsKKyAgICBtX2NvbnRleHQtPnJlYWRQaXhlbHMoMCwgMCwgMSwgMSwgR3JhcGhpY3ND b250ZXh0M0Q6OlJHQkEsIEdyYXBoaWNzQ29udGV4dDNEOjpVTlNJR05FRF9CWVRFLCAmcGl4ZWwp OworCisgICAgcmV0dXJuIHBpeGVsID09IDB4RkZGRjAwRkY7Cit9CisKIGJvb2wgRHJhd2luZ0J1 ZmZlcjo6cmVzZXQoY29uc3QgSW50U2l6ZSYgbmV3U2l6ZSkKIHsKICAgICBpZiAoIW1fY29udGV4 dCkKQEAgLTIzOCw3ICsyNTcsNiBAQCBib29sIERyYXdpbmdCdWZmZXI6OnJlc2V0KGNvbnN0IElu dFNpemUmIG5ld1NpemUpCiAgICAgICAgICAgICBpbnRlcm5hbFJlbmRlcmJ1ZmZlckZvcm1hdCA9 IEV4dGVuc2lvbnMzRDo6UkdCOF9PRVM7CiAgICAgICAgIH0KIAotCiAgICAgICAgIGRvIHsKICAg ICAgICAgICAgIG1fc2l6ZSA9IGFkanVzdGVkU2l6ZTsKICAgICAgICAgICAgIC8vIHJlc2l6ZSBt dWx0aXNhbXBsZSBGQk8KQEAgLTI1Miw2ICsyNzAsMTIgQEAgYm9vbCBEcmF3aW5nQnVmZmVyOjpy ZXNldChjb25zdCBJbnRTaXplJiBuZXdTaXplKQogCiAgICAgICAgICAgICAgICAgbV9jb250ZXh0 LT5iaW5kUmVuZGVyYnVmZmVyKEdyYXBoaWNzQ29udGV4dDNEOjpSRU5ERVJCVUZGRVIsIG1fbXVs dGlzYW1wbGVDb2xvckJ1ZmZlcik7CiAgICAgICAgICAgICAgICAgbV9jb250ZXh0LT5nZXRFeHRl bnNpb25zKCktPnJlbmRlcmJ1ZmZlclN0b3JhZ2VNdWx0aXNhbXBsZShHcmFwaGljc0NvbnRleHQz RDo6UkVOREVSQlVGRkVSLCBzYW1wbGVDb3VudCwgaW50ZXJuYWxSZW5kZXJidWZmZXJGb3JtYXQs IG1fc2l6ZS53aWR0aCgpLCBtX3NpemUuaGVpZ2h0KCkpOworCisgICAgICAgICAgICAgICAgaWYg KG1fY29udGV4dC0+Z2V0RXJyb3IoKSA9PSBHcmFwaGljc0NvbnRleHQzRDo6T1VUX09GX01FTU9S WSkgeworICAgICAgICAgICAgICAgICAgICBhZGp1c3RlZFNpemUuc2NhbGUoc19yZXNvdXJjZUFk anVzdGVkUmF0aW8pOworICAgICAgICAgICAgICAgICAgICBjb250aW51ZTsKKyAgICAgICAgICAg ICAgICB9CisKICAgICAgICAgICAgICAgICBtX2NvbnRleHQtPmZyYW1lYnVmZmVyUmVuZGVyYnVm ZmVyKEdyYXBoaWNzQ29udGV4dDNEOjpGUkFNRUJVRkZFUiwgR3JhcGhpY3NDb250ZXh0M0Q6OkNP TE9SX0FUVEFDSE1FTlQwLCBHcmFwaGljc0NvbnRleHQzRDo6UkVOREVSQlVGRkVSLCBtX211bHRp c2FtcGxlQ29sb3JCdWZmZXIpOwogICAgICAgICAgICAgICAgIHJlc2l6ZURlcHRoU3RlbmNpbChz YW1wbGVDb3VudCk7CiAgICAgICAgICAgICAgICAgaWYgKG1fY29udGV4dC0+Y2hlY2tGcmFtZWJ1 ZmZlclN0YXR1cyhHcmFwaGljc0NvbnRleHQzRDo6RlJBTUVCVUZGRVIpICE9IEdyYXBoaWNzQ29u dGV4dDNEOjpGUkFNRUJVRkZFUl9DT01QTEVURSkgewpAQCAtMjc4LDkgKzMwMiwyMCBAQCBib29s IERyYXdpbmdCdWZmZXI6OnJlc2V0KGNvbnN0IEludFNpemUmIG5ld1NpemUpCiAKICAgICAgICAg ICAgIGlmICghbXVsdGlzYW1wbGUoKSkKICAgICAgICAgICAgICAgICByZXNpemVEZXB0aFN0ZW5j aWwoMCk7Ci0gICAgICAgICAgICBpZiAobV9jb250ZXh0LT5jaGVja0ZyYW1lYnVmZmVyU3RhdHVz KEdyYXBoaWNzQ29udGV4dDNEOjpGUkFNRUJVRkZFUikgPT0gR3JhcGhpY3NDb250ZXh0M0Q6OkZS QU1FQlVGRkVSX0NPTVBMRVRFKQotICAgICAgICAgICAgICAgIGJyZWFrOwotICAgICAgICAgICAg YWRqdXN0ZWRTaXplLnNjYWxlKHNfcmVzb3VyY2VBZGp1c3RlZFJhdGlvKTsKKyAgICAgICAgICAg IGlmIChtX2NvbnRleHQtPmNoZWNrRnJhbWVidWZmZXJTdGF0dXMoR3JhcGhpY3NDb250ZXh0M0Q6 OkZSQU1FQlVGRkVSKSAhPSBHcmFwaGljc0NvbnRleHQzRDo6RlJBTUVCVUZGRVJfQ09NUExFVEUp IHsKKyAgICAgICAgICAgICAgICBhZGp1c3RlZFNpemUuc2NhbGUoc19yZXNvdXJjZUFkanVzdGVk UmF0aW8pOworICAgICAgICAgICAgICAgIGNvbnRpbnVlOworICAgICAgICAgICAgfQorCisjaWYg UExBVEZPUk0oTUFDKQorICAgICAgICAgICAgLy8gVE9ETyhiYWpvbmVzKTogVGhpcyBjYW4gYmUg cmVtb3ZlZCBvbmNlIHJlbmRlcmJ1ZmZlclN0b3JhZ2VNdWx0aXNhbXBsZSBzdGFydHMgcmVwb3J0 aW5nIEdMX09VVF9PRl9NRU1PUlkgcHJvcGVybHkgb24gT1NYCisgICAgICAgICAgICBpZiAoIWNo ZWNrQnVmZmVySW50ZWdyaXR5KCkpIHsKKyAgICAgICAgICAgICAgICBhZGp1c3RlZFNpemUuc2Nh bGUoc19yZXNvdXJjZUFkanVzdGVkUmF0aW8pOworICAgICAgICAgICAgICAgIGNvbnRpbnVlOwor ICAgICAgICAgICAgfQorI2VuZGlmCisKKyAgICAgICAgICAgIGJyZWFrOwogCiAgICAgICAgIH0g d2hpbGUgKCFhZGp1c3RlZFNpemUuaXNFbXB0eSgpKTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3B1L0RyYXdpbmdCdWZmZXIuaCBiL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dwdS9EcmF3aW5nQnVmZmVyLmgKaW5kZXggNjFhYTFjZTZi ZWU3ZmY3MDM3MzFiZTg4ZjNjMzE2NGI2MWI4MzJiMC4uYjQ0NjEwMTIwNjc3MTNkNTFhNWExYjcw ZmQwMTExYzYyZmYyMWY3NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3Jh cGhpY3MvZ3B1L0RyYXdpbmdCdWZmZXIuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9n cmFwaGljcy9ncHUvRHJhd2luZ0J1ZmZlci5oCkBAIC0xNDAsNiArMTQwLDggQEAgcHJpdmF0ZToK IAogICAgIHZvaWQgaW5pdGlhbGl6ZShjb25zdCBJbnRTaXplJik7CiAKKyAgICBib29sIGNoZWNr QnVmZmVySW50ZWdyaXR5KCk7CisKICAgICBQcmVzZXJ2ZURyYXdpbmdCdWZmZXIgbV9wcmVzZXJ2 ZURyYXdpbmdCdWZmZXI7CiAgICAgQWxwaGFSZXF1aXJlbWVudCBtX2FscGhhOwogICAgIGJvb2wg bV9zY2lzc29yRW5hYmxlZDsK 192095 2013-03-07 15:33:27 -0800 2013-03-08 15:01:10 -0800 Patch bug-111780-20130307152931.patch text/plain 4771 bajones U3VidmVyc2lvbiBSZXZpc2lvbjogMTQ1MTQzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZTczY2E1YjE0MzU0MTA2 MGMzMjE5Nzg1ODE0YmFiMTEzODNhYjZlZC4uZDdjOGExZGU3NTQ3YTllOGVlMmFiZWE0ODRjNzMw MTRmNjQ0YzUxNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDEzLTAzLTA3ICBCcmFu ZG9uIEpvbmVzICA8YmFqb25lc0Bnb29nbGUuY29tPgorCisgICAgICAgIENoZWNrIHRvIGVuc3Vy ZSBNdWx0aXNhbXBsZVJlbmRlcmJ1ZmZlciBjcmVhdGlvbiBzdWNjZWVkcworICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTExNzgwCisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgTm8gbmV3IHRlc3RzLgorCisgICAg ICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvZ3B1L0RyYXdpbmdCdWZmZXIuY3BwOgorICAgICAgICAo V2ViQ29yZSk6CisgICAgICAgIChXZWJDb3JlOjpEcmF3aW5nQnVmZmVyOjpjaGVja0J1ZmZlcklu dGVncml0eSk6CisgICAgICAgIChXZWJDb3JlOjpEcmF3aW5nQnVmZmVyOjpyZXNldCk6CisgICAg ICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvZ3B1L0RyYXdpbmdCdWZmZXIuaDoKKyAgICAgICAgKERy YXdpbmdCdWZmZXIpOgorCiAyMDEzLTAzLTA3ICBBbGV4ZXkgUHJvc2t1cnlha292ICA8YXBAYXBw bGUuY29tPgogCiAgICAgICAgIEZvcm1EYXRhIHNob3VsZCBhbGxvdyBzZXR0aW5nIGZpbGVuYW1l IHRvIGVtcHR5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9n cHUvRHJhd2luZ0J1ZmZlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9n cHUvRHJhd2luZ0J1ZmZlci5jcHAKaW5kZXggYmQ0MTI5YTNhNmU5OWZmOGVlMDlkNWJmOTc3MDEy ZjcyMTZlYmNkMS4uNTQ1ZmY0ODIyOTczNTA0ZDZlYTlhZTlkMjE5Zjc2YmY5OGQwZmNjYyAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3B1L0RyYXdpbmdCdWZm ZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dwdS9EcmF3aW5n QnVmZmVyLmNwcApAQCAtMTg5LDYgKzE4OSwyNSBAQCB2b2lkIERyYXdpbmdCdWZmZXI6OmNsZWFy RnJhbWVidWZmZXJzKEdDM0RiaXRmaWVsZCBjbGVhck1hc2spCiAgICAgfQogfQogCisvLyBPbmx5 IHdheSB0byBlbnN1cmUgdGhhdCB3ZSdyZSBub3QgZ2V0dGluZyBhIGJhZCBmcmFtZWJ1ZmZlciBv biBzb21lIEFNRC9PU1ggZGV2aWNlcworLy8gVE9ETyhiYWpvbmVzKTogVGhpcyBjYW4gYmUgcmVt b3ZlZCBvbmNlIHJlbmRlcmJ1ZmZlclN0b3JhZ2VNdWx0aXNhbXBsZSBzdGFydHMgcmVwb3J0aW5n IEdMX09VVF9PRl9NRU1PUlkgcHJvcGVybHkKK2Jvb2wgRHJhd2luZ0J1ZmZlcjo6Y2hlY2tCdWZm ZXJJbnRlZ3JpdHkoKQoreworICAgIGlmICghbV9tdWx0aXNhbXBsZUZCTykKKyAgICAgICAgcmV0 dXJuIHRydWU7CisKKyAgICBtX2NvbnRleHQtPmJpbmRGcmFtZWJ1ZmZlcihHcmFwaGljc0NvbnRl eHQzRDo6RlJBTUVCVUZGRVIsIG1fbXVsdGlzYW1wbGVGQk8pOworICAgIG1fY29udGV4dC0+Y2xl YXJDb2xvcigxLjBmLCAwLjBmLCAxLjBmLCAxLjBmKTsKKyAgICBtX2NvbnRleHQtPmNsZWFyKEdy YXBoaWNzQ29udGV4dDNEOjpDT0xPUl9CVUZGRVJfQklUKTsKKworICAgIGNvbW1pdCgwLCAwLCAx LCAxKTsKKworICAgIHVpbnQzMiBwaXhlbCA9IDA7CisgICAgbV9jb250ZXh0LT5yZWFkUGl4ZWxz KDAsIDAsIDEsIDEsIEdyYXBoaWNzQ29udGV4dDNEOjpSR0JBLCBHcmFwaGljc0NvbnRleHQzRDo6 VU5TSUdORURfQllURSwgJnBpeGVsKTsKKworICAgIHJldHVybiBwaXhlbCA9PSAweEZGRkYwMEZG OworfQorCiBib29sIERyYXdpbmdCdWZmZXI6OnJlc2V0KGNvbnN0IEludFNpemUmIG5ld1NpemUp CiB7CiAgICAgaWYgKCFtX2NvbnRleHQpCkBAIC0yMzgsNyArMjU3LDYgQEAgYm9vbCBEcmF3aW5n QnVmZmVyOjpyZXNldChjb25zdCBJbnRTaXplJiBuZXdTaXplKQogICAgICAgICAgICAgaW50ZXJu YWxSZW5kZXJidWZmZXJGb3JtYXQgPSBFeHRlbnNpb25zM0Q6OlJHQjhfT0VTOwogICAgICAgICB9 CiAKLQogICAgICAgICBkbyB7CiAgICAgICAgICAgICBtX3NpemUgPSBhZGp1c3RlZFNpemU7CiAg ICAgICAgICAgICAvLyByZXNpemUgbXVsdGlzYW1wbGUgRkJPCkBAIC0yNTIsNiArMjcwLDEyIEBA IGJvb2wgRHJhd2luZ0J1ZmZlcjo6cmVzZXQoY29uc3QgSW50U2l6ZSYgbmV3U2l6ZSkKIAogICAg ICAgICAgICAgICAgIG1fY29udGV4dC0+YmluZFJlbmRlcmJ1ZmZlcihHcmFwaGljc0NvbnRleHQz RDo6UkVOREVSQlVGRkVSLCBtX211bHRpc2FtcGxlQ29sb3JCdWZmZXIpOwogICAgICAgICAgICAg ICAgIG1fY29udGV4dC0+Z2V0RXh0ZW5zaW9ucygpLT5yZW5kZXJidWZmZXJTdG9yYWdlTXVsdGlz YW1wbGUoR3JhcGhpY3NDb250ZXh0M0Q6OlJFTkRFUkJVRkZFUiwgc2FtcGxlQ291bnQsIGludGVy bmFsUmVuZGVyYnVmZmVyRm9ybWF0LCBtX3NpemUud2lkdGgoKSwgbV9zaXplLmhlaWdodCgpKTsK KworICAgICAgICAgICAgICAgIGlmIChtX2NvbnRleHQtPmdldEVycm9yKCkgPT0gR3JhcGhpY3ND b250ZXh0M0Q6Ok9VVF9PRl9NRU1PUlkpIHsKKyAgICAgICAgICAgICAgICAgICAgYWRqdXN0ZWRT aXplLnNjYWxlKHNfcmVzb3VyY2VBZGp1c3RlZFJhdGlvKTsKKyAgICAgICAgICAgICAgICAgICAg Y29udGludWU7CisgICAgICAgICAgICAgICAgfQorCiAgICAgICAgICAgICAgICAgbV9jb250ZXh0 LT5mcmFtZWJ1ZmZlclJlbmRlcmJ1ZmZlcihHcmFwaGljc0NvbnRleHQzRDo6RlJBTUVCVUZGRVIs IEdyYXBoaWNzQ29udGV4dDNEOjpDT0xPUl9BVFRBQ0hNRU5UMCwgR3JhcGhpY3NDb250ZXh0M0Q6 OlJFTkRFUkJVRkZFUiwgbV9tdWx0aXNhbXBsZUNvbG9yQnVmZmVyKTsKICAgICAgICAgICAgICAg ICByZXNpemVEZXB0aFN0ZW5jaWwoc2FtcGxlQ291bnQpOwogICAgICAgICAgICAgICAgIGlmICht X2NvbnRleHQtPmNoZWNrRnJhbWVidWZmZXJTdGF0dXMoR3JhcGhpY3NDb250ZXh0M0Q6OkZSQU1F QlVGRkVSKSAhPSBHcmFwaGljc0NvbnRleHQzRDo6RlJBTUVCVUZGRVJfQ09NUExFVEUpIHsKQEAg LTI3OCw5ICszMDIsMjAgQEAgYm9vbCBEcmF3aW5nQnVmZmVyOjpyZXNldChjb25zdCBJbnRTaXpl JiBuZXdTaXplKQogCiAgICAgICAgICAgICBpZiAoIW11bHRpc2FtcGxlKCkpCiAgICAgICAgICAg ICAgICAgcmVzaXplRGVwdGhTdGVuY2lsKDApOwotICAgICAgICAgICAgaWYgKG1fY29udGV4dC0+ Y2hlY2tGcmFtZWJ1ZmZlclN0YXR1cyhHcmFwaGljc0NvbnRleHQzRDo6RlJBTUVCVUZGRVIpID09 IEdyYXBoaWNzQ29udGV4dDNEOjpGUkFNRUJVRkZFUl9DT01QTEVURSkKLSAgICAgICAgICAgICAg ICBicmVhazsKLSAgICAgICAgICAgIGFkanVzdGVkU2l6ZS5zY2FsZShzX3Jlc291cmNlQWRqdXN0 ZWRSYXRpbyk7CisgICAgICAgICAgICBpZiAobV9jb250ZXh0LT5jaGVja0ZyYW1lYnVmZmVyU3Rh dHVzKEdyYXBoaWNzQ29udGV4dDNEOjpGUkFNRUJVRkZFUikgIT0gR3JhcGhpY3NDb250ZXh0M0Q6 OkZSQU1FQlVGRkVSX0NPTVBMRVRFKSB7CisgICAgICAgICAgICAgICAgYWRqdXN0ZWRTaXplLnNj YWxlKHNfcmVzb3VyY2VBZGp1c3RlZFJhdGlvKTsKKyAgICAgICAgICAgICAgICBjb250aW51ZTsK KyAgICAgICAgICAgIH0KKworI2lmIFBMQVRGT1JNKE1BQykKKyAgICAgICAgICAgIC8vIFRPRE8o YmFqb25lcyk6IFRoaXMgY2FuIGJlIHJlbW92ZWQgb25jZSByZW5kZXJidWZmZXJTdG9yYWdlTXVs dGlzYW1wbGUgc3RhcnRzIHJlcG9ydGluZyBHTF9PVVRfT0ZfTUVNT1JZIHByb3Blcmx5IG9uIE9T WAorICAgICAgICAgICAgaWYgKCFjaGVja0J1ZmZlckludGVncml0eSgpKSB7CisgICAgICAgICAg ICAgICAgYWRqdXN0ZWRTaXplLnNjYWxlKHNfcmVzb3VyY2VBZGp1c3RlZFJhdGlvKTsKKyAgICAg ICAgICAgICAgICBjb250aW51ZTsKKyAgICAgICAgICAgIH0KKyNlbmRpZgorCisgICAgICAgICAg ICBicmVhazsKIAogICAgICAgICB9IHdoaWxlICghYWRqdXN0ZWRTaXplLmlzRW1wdHkoKSk7CiAK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dwdS9EcmF3aW5n QnVmZmVyLmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9ncHUvRHJhd2luZ0J1 ZmZlci5oCmluZGV4IDYxYWExY2U2YmVlN2ZmNzAzNzMxYmU4OGYzYzMxNjRiNjFiODMyYjAuLmI0 NDYxMDEyMDY3NzEzZDUxYTVhMWI3MGZkMDExMWM2MmZmMjFmNzYgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dwdS9EcmF3aW5nQnVmZmVyLmgKKysrIGIvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3B1L0RyYXdpbmdCdWZmZXIuaApAQCAtMTQw LDYgKzE0MCw4IEBAIHByaXZhdGU6CiAKICAgICB2b2lkIGluaXRpYWxpemUoY29uc3QgSW50U2l6 ZSYpOwogCisgICAgYm9vbCBjaGVja0J1ZmZlckludGVncml0eSgpOworCiAgICAgUHJlc2VydmVE cmF3aW5nQnVmZmVyIG1fcHJlc2VydmVEcmF3aW5nQnVmZmVyOwogICAgIEFscGhhUmVxdWlyZW1l bnQgbV9hbHBoYTsKICAgICBib29sIG1fc2Npc3NvckVuYWJsZWQ7Cg== 192291 2013-03-08 15:01:13 -0800 2013-03-08 15:08:10 -0800 Patch bug-111780-20130308145716.patch text/plain 5322 bajones U3VidmVyc2lvbiBSZXZpc2lvbjogMTQ1MjcxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNGU1NjVlN2UwMTMwNmUw OWI1ZWI5ZWE4OThkODdlNjQ3YzAwNjk4My4uNzZhYjBjNTMxNDYzY2Y0YjZlMWVkNjA0YTBlZTFi ODk2MTBmNmMxMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI1IEBACisyMDEzLTAzLTA4ICBCcmFu ZG9uIEpvbmVzICA8YmFqb25lc0Bnb29nbGUuY29tPgorCisgICAgICAgIENoZWNrIHRvIGVuc3Vy ZSBNdWx0aXNhbXBsZVJlbmRlcmJ1ZmZlciBjcmVhdGlvbiBzdWNjZWVkcworICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTExNzgwCisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgT24gT1NYIHN5c3RlbXMgdXNpbmcg QU1EIGdyYXBoaWNzIGNoaXBzIHRoZSBhbGxvY2F0aW9uIG9mIGxhcmdlCisgICAgICAgIE11bHRp c2FtcGxlIFJlbmRlcmJ1ZmZlcnMgaW4gQ2hyb21pdW0gd291bGQgZmFpbCB3aXRob3V0IGFueSBp bmRpY2F0aW9uCisgICAgICAgIG9mIGZhaWx1cmUuIEF0dGVtcHRpbmcgdG8gZHJhdyB0byB0aGUg YnVmZmVyIHJlc3VsdGVkIGluIGdhcmJhZ2UgYmVpbmcKKyAgICAgICAgcmVuZGVyZWQgb25zY3Jl ZW4uIFRoaXMgY291bGQgYmUgcmVwcm9kdWNlZCBieSBvcGVuaW5nIGEgZnVsbC1wYWdlCisgICAg ICAgIFdlYkdMIGFwcCBhbmQgcHJlc3NpbmcgKENvbW1hbmQgKyAiLSIpIHNldmVyYWwgdGltZXMu IFRoaXMgcGF0Y2ggYWRkcyBhbgorICAgICAgICBhZGRpdGlvbmFsIGNoZWNrIGR1cmluZyBEcmF3 aW5nQnVmZmVyIHJlc2l6ZSB0byB2ZXJpZnkgdGhhdCB0aGUgcmVzaXplZAorICAgICAgICBidWZm ZXIgaXMgdmFsaWQuIAorCisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvZ3B1L0RyYXdpbmdC dWZmZXIuY3BwOgorICAgICAgICAoV2ViQ29yZSk6CisgICAgICAgIChXZWJDb3JlOjpEcmF3aW5n QnVmZmVyOjpjaGVja0J1ZmZlckludGVncml0eSk6CisgICAgICAgIChXZWJDb3JlOjpEcmF3aW5n QnVmZmVyOjpyZXNldCk6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvZ3B1L0RyYXdpbmdC dWZmZXIuaDoKKyAgICAgICAgKERyYXdpbmdCdWZmZXIpOgorCiAyMDEzLTAzLTA4ICBNaWtlIFdl c3QgIDxta3dzdEBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgQ1NQOiAnZXZhbCgpJyBpcyBibG9j a2VkIGluIHJlcG9ydC1vbmx5IG1vZGUuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9ncmFwaGljcy9ncHUvRHJhd2luZ0J1ZmZlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9ncmFwaGljcy9ncHUvRHJhd2luZ0J1ZmZlci5jcHAKaW5kZXggYmQ0MTI5YTNhNmU5OWZm OGVlMDlkNWJmOTc3MDEyZjcyMTZlYmNkMS4uMzc5YjI3ZTFmZDliNThmMDRhNzljOGMwODU4NDYw ZjQyYjI1ZWM4MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mv Z3B1L0RyYXdpbmdCdWZmZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBo aWNzL2dwdS9EcmF3aW5nQnVmZmVyLmNwcApAQCAtMTg5LDYgKzE4OSwyNSBAQCB2b2lkIERyYXdp bmdCdWZmZXI6OmNsZWFyRnJhbWVidWZmZXJzKEdDM0RiaXRmaWVsZCBjbGVhck1hc2spCiAgICAg fQogfQogCisvLyBPbmx5IHdheSB0byBlbnN1cmUgdGhhdCB3ZSdyZSBub3QgZ2V0dGluZyBhIGJh ZCBmcmFtZWJ1ZmZlciBvbiBzb21lIEFNRC9PU1ggZGV2aWNlcy4KKy8vIFRPRE8oYmFqb25lcyk6 IFRoaXMgY2FuIGJlIHJlbW92ZWQgb25jZSByZW5kZXJidWZmZXJTdG9yYWdlTXVsdGlzYW1wbGUg c3RhcnRzIHJlcG9ydGluZyBHTF9PVVRfT0ZfTUVNT1JZIHByb3Blcmx5LgorYm9vbCBEcmF3aW5n QnVmZmVyOjpjaGVja0J1ZmZlckludGVncml0eSgpCit7CisgICAgaWYgKCFtX211bHRpc2FtcGxl RkJPKQorICAgICAgICByZXR1cm4gdHJ1ZTsKKworICAgIG1fY29udGV4dC0+YmluZEZyYW1lYnVm ZmVyKEdyYXBoaWNzQ29udGV4dDNEOjpGUkFNRUJVRkZFUiwgbV9tdWx0aXNhbXBsZUZCTyk7Cisg ICAgbV9jb250ZXh0LT5jbGVhckNvbG9yKDEuMGYsIDAuMGYsIDEuMGYsIDEuMGYpOworICAgIG1f Y29udGV4dC0+Y2xlYXIoR3JhcGhpY3NDb250ZXh0M0Q6OkNPTE9SX0JVRkZFUl9CSVQpOworCisg ICAgY29tbWl0KDAsIDAsIDEsIDEpOworCisgICAgdW5zaWduZWQgY2hhciBwaXhlbFs0XSA9IHsw LCAwLCAwLCAwfTsKKyAgICBtX2NvbnRleHQtPnJlYWRQaXhlbHMoMCwgMCwgMSwgMSwgR3JhcGhp Y3NDb250ZXh0M0Q6OlJHQkEsIEdyYXBoaWNzQ29udGV4dDNEOjpVTlNJR05FRF9CWVRFLCAmcGl4 ZWwpOworCisgICAgcmV0dXJuIChwaXhlbFswXSA9PSAweEZGICYmIHBpeGVsWzFdID09IDB4MDAg JiYgcGl4ZWxbMl0gPT0gMHhGRiAmJiBwaXhlbFszXSA9PSAweEZGKTsKK30KKwogYm9vbCBEcmF3 aW5nQnVmZmVyOjpyZXNldChjb25zdCBJbnRTaXplJiBuZXdTaXplKQogewogICAgIGlmICghbV9j b250ZXh0KQpAQCAtMjM4LDcgKzI1Nyw2IEBAIGJvb2wgRHJhd2luZ0J1ZmZlcjo6cmVzZXQoY29u c3QgSW50U2l6ZSYgbmV3U2l6ZSkKICAgICAgICAgICAgIGludGVybmFsUmVuZGVyYnVmZmVyRm9y bWF0ID0gRXh0ZW5zaW9uczNEOjpSR0I4X09FUzsKICAgICAgICAgfQogCi0KICAgICAgICAgZG8g ewogICAgICAgICAgICAgbV9zaXplID0gYWRqdXN0ZWRTaXplOwogICAgICAgICAgICAgLy8gcmVz aXplIG11bHRpc2FtcGxlIEZCTwpAQCAtMjUyLDYgKzI3MCwxMiBAQCBib29sIERyYXdpbmdCdWZm ZXI6OnJlc2V0KGNvbnN0IEludFNpemUmIG5ld1NpemUpCiAKICAgICAgICAgICAgICAgICBtX2Nv bnRleHQtPmJpbmRSZW5kZXJidWZmZXIoR3JhcGhpY3NDb250ZXh0M0Q6OlJFTkRFUkJVRkZFUiwg bV9tdWx0aXNhbXBsZUNvbG9yQnVmZmVyKTsKICAgICAgICAgICAgICAgICBtX2NvbnRleHQtPmdl dEV4dGVuc2lvbnMoKS0+cmVuZGVyYnVmZmVyU3RvcmFnZU11bHRpc2FtcGxlKEdyYXBoaWNzQ29u dGV4dDNEOjpSRU5ERVJCVUZGRVIsIHNhbXBsZUNvdW50LCBpbnRlcm5hbFJlbmRlcmJ1ZmZlckZv cm1hdCwgbV9zaXplLndpZHRoKCksIG1fc2l6ZS5oZWlnaHQoKSk7CisKKyAgICAgICAgICAgICAg ICBpZiAobV9jb250ZXh0LT5nZXRFcnJvcigpID09IEdyYXBoaWNzQ29udGV4dDNEOjpPVVRfT0Zf TUVNT1JZKSB7CisgICAgICAgICAgICAgICAgICAgIGFkanVzdGVkU2l6ZS5zY2FsZShzX3Jlc291 cmNlQWRqdXN0ZWRSYXRpbyk7CisgICAgICAgICAgICAgICAgICAgIGNvbnRpbnVlOworICAgICAg ICAgICAgICAgIH0KKwogICAgICAgICAgICAgICAgIG1fY29udGV4dC0+ZnJhbWVidWZmZXJSZW5k ZXJidWZmZXIoR3JhcGhpY3NDb250ZXh0M0Q6OkZSQU1FQlVGRkVSLCBHcmFwaGljc0NvbnRleHQz RDo6Q09MT1JfQVRUQUNITUVOVDAsIEdyYXBoaWNzQ29udGV4dDNEOjpSRU5ERVJCVUZGRVIsIG1f bXVsdGlzYW1wbGVDb2xvckJ1ZmZlcik7CiAgICAgICAgICAgICAgICAgcmVzaXplRGVwdGhTdGVu Y2lsKHNhbXBsZUNvdW50KTsKICAgICAgICAgICAgICAgICBpZiAobV9jb250ZXh0LT5jaGVja0Zy YW1lYnVmZmVyU3RhdHVzKEdyYXBoaWNzQ29udGV4dDNEOjpGUkFNRUJVRkZFUikgIT0gR3JhcGhp Y3NDb250ZXh0M0Q6OkZSQU1FQlVGRkVSX0NPTVBMRVRFKSB7CkBAIC0yNzgsOSArMzAyLDIwIEBA IGJvb2wgRHJhd2luZ0J1ZmZlcjo6cmVzZXQoY29uc3QgSW50U2l6ZSYgbmV3U2l6ZSkKIAogICAg ICAgICAgICAgaWYgKCFtdWx0aXNhbXBsZSgpKQogICAgICAgICAgICAgICAgIHJlc2l6ZURlcHRo U3RlbmNpbCgwKTsKLSAgICAgICAgICAgIGlmIChtX2NvbnRleHQtPmNoZWNrRnJhbWVidWZmZXJT dGF0dXMoR3JhcGhpY3NDb250ZXh0M0Q6OkZSQU1FQlVGRkVSKSA9PSBHcmFwaGljc0NvbnRleHQz RDo6RlJBTUVCVUZGRVJfQ09NUExFVEUpCi0gICAgICAgICAgICAgICAgYnJlYWs7Ci0gICAgICAg ICAgICBhZGp1c3RlZFNpemUuc2NhbGUoc19yZXNvdXJjZUFkanVzdGVkUmF0aW8pOworICAgICAg ICAgICAgaWYgKG1fY29udGV4dC0+Y2hlY2tGcmFtZWJ1ZmZlclN0YXR1cyhHcmFwaGljc0NvbnRl eHQzRDo6RlJBTUVCVUZGRVIpICE9IEdyYXBoaWNzQ29udGV4dDNEOjpGUkFNRUJVRkZFUl9DT01Q TEVURSkgeworICAgICAgICAgICAgICAgIGFkanVzdGVkU2l6ZS5zY2FsZShzX3Jlc291cmNlQWRq dXN0ZWRSYXRpbyk7CisgICAgICAgICAgICAgICAgY29udGludWU7CisgICAgICAgICAgICB9CisK KyNpZiBPUyhEQVJXSU4pCisgICAgICAgICAgICAvLyBUT0RPKGJham9uZXMpOiBUaGlzIGNhbiBi ZSByZW1vdmVkIG9uY2UgcmVuZGVyYnVmZmVyU3RvcmFnZU11bHRpc2FtcGxlIHN0YXJ0cyByZXBv cnRpbmcgR0xfT1VUX09GX01FTU9SWSBwcm9wZXJseSBvbiBPU1guCisgICAgICAgICAgICBpZiAo IWNoZWNrQnVmZmVySW50ZWdyaXR5KCkpIHsKKyAgICAgICAgICAgICAgICBhZGp1c3RlZFNpemUu c2NhbGUoc19yZXNvdXJjZUFkanVzdGVkUmF0aW8pOworICAgICAgICAgICAgICAgIGNvbnRpbnVl OworICAgICAgICAgICAgfQorI2VuZGlmCisKKyAgICAgICAgICAgIGJyZWFrOwogCiAgICAgICAg IH0gd2hpbGUgKCFhZGp1c3RlZFNpemUuaXNFbXB0eSgpKTsKIApkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3B1L0RyYXdpbmdCdWZmZXIuaCBiL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dwdS9EcmF3aW5nQnVmZmVyLmgKaW5kZXggNjFhYTFj ZTZiZWU3ZmY3MDM3MzFiZTg4ZjNjMzE2NGI2MWI4MzJiMC4uYjQ0NjEwMTIwNjc3MTNkNTFhNWEx YjcwZmQwMTExYzYyZmYyMWY3NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v Z3JhcGhpY3MvZ3B1L0RyYXdpbmdCdWZmZXIuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9ncmFwaGljcy9ncHUvRHJhd2luZ0J1ZmZlci5oCkBAIC0xNDAsNiArMTQwLDggQEAgcHJpdmF0 ZToKIAogICAgIHZvaWQgaW5pdGlhbGl6ZShjb25zdCBJbnRTaXplJik7CiAKKyAgICBib29sIGNo ZWNrQnVmZmVySW50ZWdyaXR5KCk7CisKICAgICBQcmVzZXJ2ZURyYXdpbmdCdWZmZXIgbV9wcmVz ZXJ2ZURyYXdpbmdCdWZmZXI7CiAgICAgQWxwaGFSZXF1aXJlbWVudCBtX2FscGhhOwogICAgIGJv b2wgbV9zY2lzc29yRW5hYmxlZDsK 192292 2013-03-08 15:08:12 -0800 2013-03-14 14:45:01 -0700 Patch bug-111780-20130308150415.patch text/plain 5304 bajones U3VidmVyc2lvbiBSZXZpc2lvbjogMTQ1MjcxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNGU1NjVlN2UwMTMwNmUw OWI1ZWI5ZWE4OThkODdlNjQ3YzAwNjk4My4uNDljZGE0ZGQ1MDZiNzhkNzllMmIxNDdiYzk4MzJl NjE5ZDcxYTA4ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI1IEBACisyMDEzLTAzLTA4ICBCcmFu ZG9uIEpvbmVzICA8YmFqb25lc0Bnb29nbGUuY29tPgorCisgICAgICAgIENoZWNrIHRvIGVuc3Vy ZSBNdWx0aXNhbXBsZVJlbmRlcmJ1ZmZlciBjcmVhdGlvbiBzdWNjZWVkcworICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTExNzgwCisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgRGVhbiBKYWNrc29uLgorCisgICAgICAgIE9uIE9TWCBzeXN0ZW1zIHVzaW5nIEFN RCBncmFwaGljcyBjaGlwcyB0aGUgYWxsb2NhdGlvbiBvZiBsYXJnZQorICAgICAgICBNdWx0aXNh bXBsZSBSZW5kZXJidWZmZXJzIGluIENocm9taXVtIHdvdWxkIGZhaWwgd2l0aG91dCBhbnkgaW5k aWNhdGlvbgorICAgICAgICBvZiBmYWlsdXJlLiBBdHRlbXB0aW5nIHRvIGRyYXcgdG8gdGhlIGJ1 ZmZlciByZXN1bHRlZCBpbiBnYXJiYWdlIGJlaW5nCisgICAgICAgIHJlbmRlcmVkIG9uc2NyZWVu LiBUaGlzIGNvdWxkIGJlIHJlcHJvZHVjZWQgYnkgb3BlbmluZyBhIGZ1bGwtcGFnZQorICAgICAg ICBXZWJHTCBhcHAgYW5kIHByZXNzaW5nIChDb21tYW5kICsgIi0iKSBzZXZlcmFsIHRpbWVzLiBU aGlzIHBhdGNoIGFkZHMgYW4KKyAgICAgICAgYWRkaXRpb25hbCBjaGVjayBkdXJpbmcgRHJhd2lu Z0J1ZmZlciByZXNpemUgdG8gdmVyaWZ5IHRoYXQgdGhlIHJlc2l6ZWQKKyAgICAgICAgYnVmZmVy IGlzIHZhbGlkLiAKKworICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2dwdS9EcmF3aW5nQnVm ZmVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmUpOgorICAgICAgICAoV2ViQ29yZTo6RHJhd2luZ0J1 ZmZlcjo6Y2hlY2tCdWZmZXJJbnRlZ3JpdHkpOgorICAgICAgICAoV2ViQ29yZTo6RHJhd2luZ0J1 ZmZlcjo6cmVzZXQpOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2dwdS9EcmF3aW5nQnVm ZmVyLmg6CisgICAgICAgIChEcmF3aW5nQnVmZmVyKToKKwogMjAxMy0wMy0wOCAgTWlrZSBXZXN0 ICA8bWt3c3RAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIENTUDogJ2V2YWwoKScgaXMgYmxvY2tl ZCBpbiByZXBvcnQtb25seSBtb2RlLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vZ3JhcGhpY3MvZ3B1L0RyYXdpbmdCdWZmZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vZ3JhcGhpY3MvZ3B1L0RyYXdpbmdCdWZmZXIuY3BwCmluZGV4IGJkNDEyOWEzYTZlOTlmZjhl ZTA5ZDViZjk3NzAxMmY3MjE2ZWJjZDEuLjY1MTIxNDNiMTgzN2IzODllMjQ5YjZjNDk4ZDIxZThm OWZmZTdmZTQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dw dS9EcmF3aW5nQnVmZmVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGlj cy9ncHUvRHJhd2luZ0J1ZmZlci5jcHAKQEAgLTE4OSw2ICsxODksMjUgQEAgdm9pZCBEcmF3aW5n QnVmZmVyOjpjbGVhckZyYW1lYnVmZmVycyhHQzNEYml0ZmllbGQgY2xlYXJNYXNrKQogICAgIH0K IH0KIAorLy8gT25seSB3YXkgdG8gZW5zdXJlIHRoYXQgd2UncmUgbm90IGdldHRpbmcgYSBiYWQg ZnJhbWVidWZmZXIgb24gc29tZSBBTUQvT1NYIGRldmljZXMuCisvLyBGSVhNRTogVGhpcyBjYW4g YmUgcmVtb3ZlZCBvbmNlIHJlbmRlcmJ1ZmZlclN0b3JhZ2VNdWx0aXNhbXBsZSBzdGFydHMgcmVw b3J0aW5nIEdMX09VVF9PRl9NRU1PUlkgcHJvcGVybHkuCitib29sIERyYXdpbmdCdWZmZXI6OmNo ZWNrQnVmZmVySW50ZWdyaXR5KCkKK3sKKyAgICBpZiAoIW1fbXVsdGlzYW1wbGVGQk8pCisgICAg ICAgIHJldHVybiB0cnVlOworCisgICAgbV9jb250ZXh0LT5iaW5kRnJhbWVidWZmZXIoR3JhcGhp Y3NDb250ZXh0M0Q6OkZSQU1FQlVGRkVSLCBtX211bHRpc2FtcGxlRkJPKTsKKyAgICBtX2NvbnRl eHQtPmNsZWFyQ29sb3IoMS4wZiwgMC4wZiwgMS4wZiwgMS4wZik7CisgICAgbV9jb250ZXh0LT5j bGVhcihHcmFwaGljc0NvbnRleHQzRDo6Q09MT1JfQlVGRkVSX0JJVCk7CisKKyAgICBjb21taXQo MCwgMCwgMSwgMSk7CisKKyAgICB1bnNpZ25lZCBjaGFyIHBpeGVsWzRdID0gezAsIDAsIDAsIDB9 OworICAgIG1fY29udGV4dC0+cmVhZFBpeGVscygwLCAwLCAxLCAxLCBHcmFwaGljc0NvbnRleHQz RDo6UkdCQSwgR3JhcGhpY3NDb250ZXh0M0Q6OlVOU0lHTkVEX0JZVEUsICZwaXhlbCk7CisKKyAg ICByZXR1cm4gKHBpeGVsWzBdID09IDB4RkYgJiYgcGl4ZWxbMV0gPT0gMHgwMCAmJiBwaXhlbFsy XSA9PSAweEZGICYmIHBpeGVsWzNdID09IDB4RkYpOworfQorCiBib29sIERyYXdpbmdCdWZmZXI6 OnJlc2V0KGNvbnN0IEludFNpemUmIG5ld1NpemUpCiB7CiAgICAgaWYgKCFtX2NvbnRleHQpCkBA IC0yMzgsNyArMjU3LDYgQEAgYm9vbCBEcmF3aW5nQnVmZmVyOjpyZXNldChjb25zdCBJbnRTaXpl JiBuZXdTaXplKQogICAgICAgICAgICAgaW50ZXJuYWxSZW5kZXJidWZmZXJGb3JtYXQgPSBFeHRl bnNpb25zM0Q6OlJHQjhfT0VTOwogICAgICAgICB9CiAKLQogICAgICAgICBkbyB7CiAgICAgICAg ICAgICBtX3NpemUgPSBhZGp1c3RlZFNpemU7CiAgICAgICAgICAgICAvLyByZXNpemUgbXVsdGlz YW1wbGUgRkJPCkBAIC0yNTIsNiArMjcwLDEyIEBAIGJvb2wgRHJhd2luZ0J1ZmZlcjo6cmVzZXQo Y29uc3QgSW50U2l6ZSYgbmV3U2l6ZSkKIAogICAgICAgICAgICAgICAgIG1fY29udGV4dC0+Ymlu ZFJlbmRlcmJ1ZmZlcihHcmFwaGljc0NvbnRleHQzRDo6UkVOREVSQlVGRkVSLCBtX211bHRpc2Ft cGxlQ29sb3JCdWZmZXIpOwogICAgICAgICAgICAgICAgIG1fY29udGV4dC0+Z2V0RXh0ZW5zaW9u cygpLT5yZW5kZXJidWZmZXJTdG9yYWdlTXVsdGlzYW1wbGUoR3JhcGhpY3NDb250ZXh0M0Q6OlJF TkRFUkJVRkZFUiwgc2FtcGxlQ291bnQsIGludGVybmFsUmVuZGVyYnVmZmVyRm9ybWF0LCBtX3Np emUud2lkdGgoKSwgbV9zaXplLmhlaWdodCgpKTsKKworICAgICAgICAgICAgICAgIGlmIChtX2Nv bnRleHQtPmdldEVycm9yKCkgPT0gR3JhcGhpY3NDb250ZXh0M0Q6Ok9VVF9PRl9NRU1PUlkpIHsK KyAgICAgICAgICAgICAgICAgICAgYWRqdXN0ZWRTaXplLnNjYWxlKHNfcmVzb3VyY2VBZGp1c3Rl ZFJhdGlvKTsKKyAgICAgICAgICAgICAgICAgICAgY29udGludWU7CisgICAgICAgICAgICAgICAg fQorCiAgICAgICAgICAgICAgICAgbV9jb250ZXh0LT5mcmFtZWJ1ZmZlclJlbmRlcmJ1ZmZlcihH cmFwaGljc0NvbnRleHQzRDo6RlJBTUVCVUZGRVIsIEdyYXBoaWNzQ29udGV4dDNEOjpDT0xPUl9B VFRBQ0hNRU5UMCwgR3JhcGhpY3NDb250ZXh0M0Q6OlJFTkRFUkJVRkZFUiwgbV9tdWx0aXNhbXBs ZUNvbG9yQnVmZmVyKTsKICAgICAgICAgICAgICAgICByZXNpemVEZXB0aFN0ZW5jaWwoc2FtcGxl Q291bnQpOwogICAgICAgICAgICAgICAgIGlmIChtX2NvbnRleHQtPmNoZWNrRnJhbWVidWZmZXJT dGF0dXMoR3JhcGhpY3NDb250ZXh0M0Q6OkZSQU1FQlVGRkVSKSAhPSBHcmFwaGljc0NvbnRleHQz RDo6RlJBTUVCVUZGRVJfQ09NUExFVEUpIHsKQEAgLTI3OCw5ICszMDIsMjAgQEAgYm9vbCBEcmF3 aW5nQnVmZmVyOjpyZXNldChjb25zdCBJbnRTaXplJiBuZXdTaXplKQogCiAgICAgICAgICAgICBp ZiAoIW11bHRpc2FtcGxlKCkpCiAgICAgICAgICAgICAgICAgcmVzaXplRGVwdGhTdGVuY2lsKDAp OwotICAgICAgICAgICAgaWYgKG1fY29udGV4dC0+Y2hlY2tGcmFtZWJ1ZmZlclN0YXR1cyhHcmFw aGljc0NvbnRleHQzRDo6RlJBTUVCVUZGRVIpID09IEdyYXBoaWNzQ29udGV4dDNEOjpGUkFNRUJV RkZFUl9DT01QTEVURSkKLSAgICAgICAgICAgICAgICBicmVhazsKLSAgICAgICAgICAgIGFkanVz dGVkU2l6ZS5zY2FsZShzX3Jlc291cmNlQWRqdXN0ZWRSYXRpbyk7CisgICAgICAgICAgICBpZiAo bV9jb250ZXh0LT5jaGVja0ZyYW1lYnVmZmVyU3RhdHVzKEdyYXBoaWNzQ29udGV4dDNEOjpGUkFN RUJVRkZFUikgIT0gR3JhcGhpY3NDb250ZXh0M0Q6OkZSQU1FQlVGRkVSX0NPTVBMRVRFKSB7Cisg ICAgICAgICAgICAgICAgYWRqdXN0ZWRTaXplLnNjYWxlKHNfcmVzb3VyY2VBZGp1c3RlZFJhdGlv KTsKKyAgICAgICAgICAgICAgICBjb250aW51ZTsKKyAgICAgICAgICAgIH0KKworI2lmIE9TKERB UldJTikKKyAgICAgICAgICAgIC8vIEZJWE1FOiBUaGlzIGNhbiBiZSByZW1vdmVkIG9uY2UgcmVu ZGVyYnVmZmVyU3RvcmFnZU11bHRpc2FtcGxlIHN0YXJ0cyByZXBvcnRpbmcgR0xfT1VUX09GX01F TU9SWSBwcm9wZXJseSBvbiBPU1guCisgICAgICAgICAgICBpZiAoIWNoZWNrQnVmZmVySW50ZWdy aXR5KCkpIHsKKyAgICAgICAgICAgICAgICBhZGp1c3RlZFNpemUuc2NhbGUoc19yZXNvdXJjZUFk anVzdGVkUmF0aW8pOworICAgICAgICAgICAgICAgIGNvbnRpbnVlOworICAgICAgICAgICAgfQor I2VuZGlmCisKKyAgICAgICAgICAgIGJyZWFrOwogCiAgICAgICAgIH0gd2hpbGUgKCFhZGp1c3Rl ZFNpemUuaXNFbXB0eSgpKTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v Z3JhcGhpY3MvZ3B1L0RyYXdpbmdCdWZmZXIuaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dy YXBoaWNzL2dwdS9EcmF3aW5nQnVmZmVyLmgKaW5kZXggNjFhYTFjZTZiZWU3ZmY3MDM3MzFiZTg4 ZjNjMzE2NGI2MWI4MzJiMC4uYjQ0NjEwMTIwNjc3MTNkNTFhNWExYjcwZmQwMTExYzYyZmYyMWY3 NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3B1L0RyYXdp bmdCdWZmZXIuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9ncHUvRHJh d2luZ0J1ZmZlci5oCkBAIC0xNDAsNiArMTQwLDggQEAgcHJpdmF0ZToKIAogICAgIHZvaWQgaW5p dGlhbGl6ZShjb25zdCBJbnRTaXplJik7CiAKKyAgICBib29sIGNoZWNrQnVmZmVySW50ZWdyaXR5 KCk7CisKICAgICBQcmVzZXJ2ZURyYXdpbmdCdWZmZXIgbV9wcmVzZXJ2ZURyYXdpbmdCdWZmZXI7 CiAgICAgQWxwaGFSZXF1aXJlbWVudCBtX2FscGhhOwogICAgIGJvb2wgbV9zY2lzc29yRW5hYmxl ZDsK 193187 2013-03-14 14:45:03 -0700 2013-03-14 16:05:23 -0700 Patch bug-111780-20130314144059.patch text/plain 6797 bajones U3VidmVyc2lvbiBSZXZpc2lvbjogMTQ1ODI5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggM2E3ZWM0MjU5ZmUxOWNi ZTkyOTA5NWNmNzI4YzkwM2Y2OWI1NjlmZi4uYTFiZjQxNTNhZTA2NmJmYTc0ZDQzNjZlNjJhZDFk NjI2MDhmYWQxMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI1IEBACisyMDEzLTAzLTE0ICBCcmFu ZG9uIEpvbmVzICA8YmFqb25lc0Bnb29nbGUuY29tPgorCisgICAgICAgIENoZWNrIHRvIGVuc3Vy ZSBNdWx0aXNhbXBsZVJlbmRlcmJ1ZmZlciBjcmVhdGlvbiBzdWNjZWVkcworICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTExNzgwCisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgT24gT1NYIHN5c3RlbXMgdXNpbmcg QU1EIGdyYXBoaWNzIGNoaXBzIHRoZSBhbGxvY2F0aW9uIG9mIGxhcmdlCisgICAgICAgIE11bHRp c2FtcGxlIFJlbmRlcmJ1ZmZlcnMgaW4gQ2hyb21pdW0gd291bGQgZmFpbCB3aXRob3V0IGFueSBp bmRpY2F0aW9uCisgICAgICAgIG9mIGZhaWx1cmUuIEF0dGVtcHRpbmcgdG8gZHJhdyB0byB0aGUg YnVmZmVyIHJlc3VsdGVkIGluIGdhcmJhZ2UgYmVpbmcKKyAgICAgICAgcmVuZGVyZWQgb25zY3Jl ZW4uIFRoaXMgY291bGQgYmUgcmVwcm9kdWNlZCBieSBvcGVuaW5nIGEgZnVsbC1wYWdlCisgICAg ICAgIFdlYkdMIGFwcCBhbmQgcHJlc3NpbmcgKENvbW1hbmQgKyAiLSIpIHNldmVyYWwgdGltZXMu IFRoaXMgcGF0Y2ggYWRkcyBhbgorICAgICAgICBhZGRpdGlvbmFsIGNoZWNrIGR1cmluZyBEcmF3 aW5nQnVmZmVyIHJlc2l6ZSB0byB2ZXJpZnkgdGhhdCB0aGUgcmVzaXplZAorICAgICAgICBidWZm ZXIgaXMgdmFsaWQuIAorCisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvZ3B1L0RyYXdpbmdC dWZmZXIuY3BwOgorICAgICAgICAoV2ViQ29yZSk6CisgICAgICAgIChXZWJDb3JlOjpEcmF3aW5n QnVmZmVyOjpjaGVja0J1ZmZlckludGVncml0eSk6CisgICAgICAgIChXZWJDb3JlOjpEcmF3aW5n QnVmZmVyOjpyZXNldCk6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvZ3B1L0RyYXdpbmdC dWZmZXIuaDoKKyAgICAgICAgKERyYXdpbmdCdWZmZXIpOgorCiAyMDEzLTAzLTE0ICBKZXN1cyBT YW5jaGV6LVBhbGVuY2lhICA8amVzdXMucGFsZW5jaWFAb3BlbmJvc3NhLm9yZz4KIAogICAgICAg ICBNb3ZlIHBsYXRmb3JtLXNwZWNpZmljIHR5cGVkZWZzIHRvIFBsYXRmb3JtTWVudURlc2NyaXB0 aW9uLmgKQEAgLTY1NDIsMjggKzY1NjQsNiBAQAogICAgICAgICAoV2ViQ29yZTo6VG9rZW5QcmVs b2FkU2Nhbm5lcjo6U3RhcnRUYWdTY2FubmVyOjpwcm9jZXNzQXR0cmlidXRlKToKICAgICAgICAg KiBodG1sL3BhcnNlci9IVE1MUHJlbG9hZFNjYW5uZXIuaDoKIAotMjAxMy0wMy0wOCAgQnJhbmRv biBKb25lcyAgPGJham9uZXNAZ29vZ2xlLmNvbT4KLQotICAgICAgICBDaGVjayB0byBlbnN1cmUg TXVsdGlzYW1wbGVSZW5kZXJidWZmZXIgY3JlYXRpb24gc3VjY2VlZHMKLSAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTExMTc4MAotCi0gICAgICAgIFJldmll d2VkIGJ5IERlYW4gSmFja3Nvbi4KLQotICAgICAgICBPbiBPU1ggc3lzdGVtcyB1c2luZyBBTUQg Z3JhcGhpY3MgY2hpcHMgdGhlIGFsbG9jYXRpb24gb2YgbGFyZ2UKLSAgICAgICAgTXVsdGlzYW1w bGUgUmVuZGVyYnVmZmVycyBpbiBDaHJvbWl1bSB3b3VsZCBmYWlsIHdpdGhvdXQgYW55IGluZGlj YXRpb24KLSAgICAgICAgb2YgZmFpbHVyZS4gQXR0ZW1wdGluZyB0byBkcmF3IHRvIHRoZSBidWZm ZXIgcmVzdWx0ZWQgaW4gZ2FyYmFnZSBiZWluZwotICAgICAgICByZW5kZXJlZCBvbnNjcmVlbi4g VGhpcyBjb3VsZCBiZSByZXByb2R1Y2VkIGJ5IG9wZW5pbmcgYSBmdWxsLXBhZ2UKLSAgICAgICAg V2ViR0wgYXBwIGFuZCBwcmVzc2luZyAoQ29tbWFuZCArICItIikgc2V2ZXJhbCB0aW1lcy4gVGhp cyBwYXRjaCBhZGRzIGFuCi0gICAgICAgIGFkZGl0aW9uYWwgY2hlY2sgZHVyaW5nIERyYXdpbmdC dWZmZXIgcmVzaXplIHRvIHZlcmlmeSB0aGF0IHRoZSByZXNpemVkCi0gICAgICAgIGJ1ZmZlciBp cyB2YWxpZC4gCi0KLSAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9ncHUvRHJhd2luZ0J1ZmZl ci5jcHA6Ci0gICAgICAgIChXZWJDb3JlKToKLSAgICAgICAgKFdlYkNvcmU6OkRyYXdpbmdCdWZm ZXI6OmNoZWNrQnVmZmVySW50ZWdyaXR5KToKLSAgICAgICAgKFdlYkNvcmU6OkRyYXdpbmdCdWZm ZXI6OnJlc2V0KToKLSAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9ncHUvRHJhd2luZ0J1ZmZl ci5oOgotICAgICAgICAoRHJhd2luZ0J1ZmZlcik6Ci0KIDIwMTMtMDMtMDggIEhhcmFsZCBBbHZl c3RyYW5kICA8aHRhQGNocm9taXVtLm9yZz4KIAogICAgICAgICBJbXBsZW1lbnRlZCBuZXcgQVBJ IGZvciBSVENTdGF0c1JlcG9ydCBvYmplY3QuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9ncmFwaGljcy9ncHUvRHJhd2luZ0J1ZmZlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9ncmFwaGljcy9ncHUvRHJhd2luZ0J1ZmZlci5jcHAKaW5kZXggYmQ0MTI5YTNhNmU5 OWZmOGVlMDlkNWJmOTc3MDEyZjcyMTZlYmNkMS4uNDkxN2IwOTJmNGIyNzA2ZDU3Njg1MTFmOWRm ZTc5NzA3YWQ3MzU5YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp Y3MvZ3B1L0RyYXdpbmdCdWZmZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dy YXBoaWNzL2dwdS9EcmF3aW5nQnVmZmVyLmNwcApAQCAtMTg5LDYgKzE4OSwzMyBAQCB2b2lkIERy YXdpbmdCdWZmZXI6OmNsZWFyRnJhbWVidWZmZXJzKEdDM0RiaXRmaWVsZCBjbGVhck1hc2spCiAg ICAgfQogfQogCisvLyBPbmx5IHdheSB0byBlbnN1cmUgdGhhdCB3ZSdyZSBub3QgZ2V0dGluZyBh IGJhZCBmcmFtZWJ1ZmZlciBvbiBzb21lIEFNRC9PU1ggZGV2aWNlcy4KKy8vIEZJWE1FOiBUaGlz IGNhbiBiZSByZW1vdmVkIG9uY2UgcmVuZGVyYnVmZmVyU3RvcmFnZU11bHRpc2FtcGxlIHN0YXJ0 cyByZXBvcnRpbmcgR0xfT1VUX09GX01FTU9SWSBwcm9wZXJseS4KK2Jvb2wgRHJhd2luZ0J1ZmZl cjo6Y2hlY2tCdWZmZXJJbnRlZ3JpdHkoKQoreworICAgIGlmICghbV9tdWx0aXNhbXBsZUZCTykK KyAgICAgICAgcmV0dXJuIHRydWU7CisKKyAgICBpZiAobV9zY2lzc29yRW5hYmxlZCkKKyAgICAg ICAgbV9jb250ZXh0LT5kaXNhYmxlKEdyYXBoaWNzQ29udGV4dDNEOjpTQ0lTU09SX1RFU1QpOwor CisgICAgbV9jb250ZXh0LT5jb2xvck1hc2sodHJ1ZSwgdHJ1ZSwgdHJ1ZSwgdHJ1ZSk7CisKKyAg ICBtX2NvbnRleHQtPmJpbmRGcmFtZWJ1ZmZlcihHcmFwaGljc0NvbnRleHQzRDo6RlJBTUVCVUZG RVIsIG1fbXVsdGlzYW1wbGVGQk8pOworICAgIG1fY29udGV4dC0+Y2xlYXJDb2xvcigxLjBmLCAw LjBmLCAxLjBmLCAxLjBmKTsKKyAgICBtX2NvbnRleHQtPmNsZWFyKEdyYXBoaWNzQ29udGV4dDNE OjpDT0xPUl9CVUZGRVJfQklUKTsKKworICAgIGNvbW1pdCgwLCAwLCAxLCAxKTsKKworICAgIHVu c2lnbmVkIGNoYXIgcGl4ZWxbNF0gPSB7MCwgMCwgMCwgMH07CisgICAgbV9jb250ZXh0LT5yZWFk UGl4ZWxzKDAsIDAsIDEsIDEsIEdyYXBoaWNzQ29udGV4dDNEOjpSR0JBLCBHcmFwaGljc0NvbnRl eHQzRDo6VU5TSUdORURfQllURSwgJnBpeGVsKTsKKworICAgIGlmIChtX3NjaXNzb3JFbmFibGVk KQorICAgICAgICBtX2NvbnRleHQtPmVuYWJsZShHcmFwaGljc0NvbnRleHQzRDo6U0NJU1NPUl9U RVNUKTsKKworICAgIHJldHVybiAocGl4ZWxbMF0gPT0gMHhGRiAmJiBwaXhlbFsxXSA9PSAweDAw ICYmIHBpeGVsWzJdID09IDB4RkYgJiYgcGl4ZWxbM10gPT0gMHhGRik7Cit9CisKIGJvb2wgRHJh d2luZ0J1ZmZlcjo6cmVzZXQoY29uc3QgSW50U2l6ZSYgbmV3U2l6ZSkKIHsKICAgICBpZiAoIW1f Y29udGV4dCkKQEAgLTIzOCw3ICsyNjUsNiBAQCBib29sIERyYXdpbmdCdWZmZXI6OnJlc2V0KGNv bnN0IEludFNpemUmIG5ld1NpemUpCiAgICAgICAgICAgICBpbnRlcm5hbFJlbmRlcmJ1ZmZlckZv cm1hdCA9IEV4dGVuc2lvbnMzRDo6UkdCOF9PRVM7CiAgICAgICAgIH0KIAotCiAgICAgICAgIGRv IHsKICAgICAgICAgICAgIG1fc2l6ZSA9IGFkanVzdGVkU2l6ZTsKICAgICAgICAgICAgIC8vIHJl c2l6ZSBtdWx0aXNhbXBsZSBGQk8KQEAgLTI1Miw2ICsyNzgsMTIgQEAgYm9vbCBEcmF3aW5nQnVm ZmVyOjpyZXNldChjb25zdCBJbnRTaXplJiBuZXdTaXplKQogCiAgICAgICAgICAgICAgICAgbV9j b250ZXh0LT5iaW5kUmVuZGVyYnVmZmVyKEdyYXBoaWNzQ29udGV4dDNEOjpSRU5ERVJCVUZGRVIs IG1fbXVsdGlzYW1wbGVDb2xvckJ1ZmZlcik7CiAgICAgICAgICAgICAgICAgbV9jb250ZXh0LT5n ZXRFeHRlbnNpb25zKCktPnJlbmRlcmJ1ZmZlclN0b3JhZ2VNdWx0aXNhbXBsZShHcmFwaGljc0Nv bnRleHQzRDo6UkVOREVSQlVGRkVSLCBzYW1wbGVDb3VudCwgaW50ZXJuYWxSZW5kZXJidWZmZXJG b3JtYXQsIG1fc2l6ZS53aWR0aCgpLCBtX3NpemUuaGVpZ2h0KCkpOworCisgICAgICAgICAgICAg ICAgaWYgKG1fY29udGV4dC0+Z2V0RXJyb3IoKSA9PSBHcmFwaGljc0NvbnRleHQzRDo6T1VUX09G X01FTU9SWSkgeworICAgICAgICAgICAgICAgICAgICBhZGp1c3RlZFNpemUuc2NhbGUoc19yZXNv dXJjZUFkanVzdGVkUmF0aW8pOworICAgICAgICAgICAgICAgICAgICBjb250aW51ZTsKKyAgICAg ICAgICAgICAgICB9CisKICAgICAgICAgICAgICAgICBtX2NvbnRleHQtPmZyYW1lYnVmZmVyUmVu ZGVyYnVmZmVyKEdyYXBoaWNzQ29udGV4dDNEOjpGUkFNRUJVRkZFUiwgR3JhcGhpY3NDb250ZXh0 M0Q6OkNPTE9SX0FUVEFDSE1FTlQwLCBHcmFwaGljc0NvbnRleHQzRDo6UkVOREVSQlVGRkVSLCBt X211bHRpc2FtcGxlQ29sb3JCdWZmZXIpOwogICAgICAgICAgICAgICAgIHJlc2l6ZURlcHRoU3Rl bmNpbChzYW1wbGVDb3VudCk7CiAgICAgICAgICAgICAgICAgaWYgKG1fY29udGV4dC0+Y2hlY2tG cmFtZWJ1ZmZlclN0YXR1cyhHcmFwaGljc0NvbnRleHQzRDo6RlJBTUVCVUZGRVIpICE9IEdyYXBo aWNzQ29udGV4dDNEOjpGUkFNRUJVRkZFUl9DT01QTEVURSkgewpAQCAtMjc4LDkgKzMxMCwyMCBA QCBib29sIERyYXdpbmdCdWZmZXI6OnJlc2V0KGNvbnN0IEludFNpemUmIG5ld1NpemUpCiAKICAg ICAgICAgICAgIGlmICghbXVsdGlzYW1wbGUoKSkKICAgICAgICAgICAgICAgICByZXNpemVEZXB0 aFN0ZW5jaWwoMCk7Ci0gICAgICAgICAgICBpZiAobV9jb250ZXh0LT5jaGVja0ZyYW1lYnVmZmVy U3RhdHVzKEdyYXBoaWNzQ29udGV4dDNEOjpGUkFNRUJVRkZFUikgPT0gR3JhcGhpY3NDb250ZXh0 M0Q6OkZSQU1FQlVGRkVSX0NPTVBMRVRFKQotICAgICAgICAgICAgICAgIGJyZWFrOwotICAgICAg ICAgICAgYWRqdXN0ZWRTaXplLnNjYWxlKHNfcmVzb3VyY2VBZGp1c3RlZFJhdGlvKTsKKyAgICAg ICAgICAgIGlmIChtX2NvbnRleHQtPmNoZWNrRnJhbWVidWZmZXJTdGF0dXMoR3JhcGhpY3NDb250 ZXh0M0Q6OkZSQU1FQlVGRkVSKSAhPSBHcmFwaGljc0NvbnRleHQzRDo6RlJBTUVCVUZGRVJfQ09N UExFVEUpIHsKKyAgICAgICAgICAgICAgICBhZGp1c3RlZFNpemUuc2NhbGUoc19yZXNvdXJjZUFk anVzdGVkUmF0aW8pOworICAgICAgICAgICAgICAgIGNvbnRpbnVlOworICAgICAgICAgICAgfQor CisjaWYgT1MoREFSV0lOKQorICAgICAgICAgICAgLy8gRklYTUU6IFRoaXMgY2FuIGJlIHJlbW92 ZWQgb25jZSByZW5kZXJidWZmZXJTdG9yYWdlTXVsdGlzYW1wbGUgc3RhcnRzIHJlcG9ydGluZyBH TF9PVVRfT0ZfTUVNT1JZIHByb3Blcmx5IG9uIE9TWC4KKyAgICAgICAgICAgIGlmICghY2hlY2tC dWZmZXJJbnRlZ3JpdHkoKSkgeworICAgICAgICAgICAgICAgIGFkanVzdGVkU2l6ZS5zY2FsZShz X3Jlc291cmNlQWRqdXN0ZWRSYXRpbyk7CisgICAgICAgICAgICAgICAgY29udGludWU7CisgICAg ICAgICAgICB9CisjZW5kaWYKKworICAgICAgICAgICAgYnJlYWs7CiAKICAgICAgICAgfSB3aGls ZSAoIWFkanVzdGVkU2l6ZS5pc0VtcHR5KCkpOwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9ncmFwaGljcy9ncHUvRHJhd2luZ0J1ZmZlci5oIGIvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vZ3JhcGhpY3MvZ3B1L0RyYXdpbmdCdWZmZXIuaAppbmRleCA2MWFhMWNlNmJlZTdm ZjcwMzczMWJlODhmM2MzMTY0YjYxYjgzMmIwLi5iNDQ2MTAxMjA2NzcxM2Q1MWE1YTFiNzBmZDAx MTFjNjJmZjIxZjc2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGlj cy9ncHUvRHJhd2luZ0J1ZmZlci5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBo aWNzL2dwdS9EcmF3aW5nQnVmZmVyLmgKQEAgLTE0MCw2ICsxNDAsOCBAQCBwcml2YXRlOgogCiAg ICAgdm9pZCBpbml0aWFsaXplKGNvbnN0IEludFNpemUmKTsKIAorICAgIGJvb2wgY2hlY2tCdWZm ZXJJbnRlZ3JpdHkoKTsKKwogICAgIFByZXNlcnZlRHJhd2luZ0J1ZmZlciBtX3ByZXNlcnZlRHJh d2luZ0J1ZmZlcjsKICAgICBBbHBoYVJlcXVpcmVtZW50IG1fYWxwaGE7CiAgICAgYm9vbCBtX3Nj aXNzb3JFbmFibGVkOwo= 193196 2013-03-14 16:05:27 -0700 2013-03-14 16:35:37 -0700 Patch bug-111780-20130314160123.patch text/plain 5579 bajones U3VidmVyc2lvbiBSZXZpc2lvbjogMTQ1ODI5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggM2E3ZWM0MjU5ZmUxOWNi ZTkyOTA5NWNmNzI4YzkwM2Y2OWI1NjlmZi4uNTJiZDAwODdiY2I2ZmIzOTc3NWIzMjMzMGY4Yjlm NDRkMDNhNzkwYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI1IEBACisyMDEzLTAzLTE0ICBCcmFu ZG9uIEpvbmVzICA8YmFqb25lc0Bnb29nbGUuY29tPgorCisgICAgICAgIENoZWNrIHRvIGVuc3Vy ZSBNdWx0aXNhbXBsZVJlbmRlcmJ1ZmZlciBjcmVhdGlvbiBzdWNjZWVkcworICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTExNzgwCisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgS2VubmV0aCBSdXNzZWxsLgorCisgICAgICAgIE9uIE9TWCBzeXN0ZW1zIHVzaW5n IEFNRCBncmFwaGljcyBjaGlwcyB0aGUgYWxsb2NhdGlvbiBvZiBsYXJnZQorICAgICAgICBNdWx0 aXNhbXBsZSBSZW5kZXJidWZmZXJzIGluIENocm9taXVtIHdvdWxkIGZhaWwgd2l0aG91dCBhbnkg aW5kaWNhdGlvbgorICAgICAgICBvZiBmYWlsdXJlLiBBdHRlbXB0aW5nIHRvIGRyYXcgdG8gdGhl IGJ1ZmZlciByZXN1bHRlZCBpbiBnYXJiYWdlIGJlaW5nCisgICAgICAgIHJlbmRlcmVkIG9uc2Ny ZWVuLiBUaGlzIGNvdWxkIGJlIHJlcHJvZHVjZWQgYnkgb3BlbmluZyBhIGZ1bGwtcGFnZQorICAg ICAgICBXZWJHTCBhcHAgYW5kIHByZXNzaW5nIChDb21tYW5kICsgIi0iKSBzZXZlcmFsIHRpbWVz LiBUaGlzIHBhdGNoIGFkZHMgYW4KKyAgICAgICAgYWRkaXRpb25hbCBjaGVjayBkdXJpbmcgRHJh d2luZ0J1ZmZlciByZXNpemUgdG8gdmVyaWZ5IHRoYXQgdGhlIHJlc2l6ZWQKKyAgICAgICAgYnVm ZmVyIGlzIHZhbGlkLiAKKworICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2dwdS9EcmF3aW5n QnVmZmVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmUpOgorICAgICAgICAoV2ViQ29yZTo6RHJhd2lu Z0J1ZmZlcjo6Y2hlY2tCdWZmZXJJbnRlZ3JpdHkpOgorICAgICAgICAoV2ViQ29yZTo6RHJhd2lu Z0J1ZmZlcjo6cmVzZXQpOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2dwdS9EcmF3aW5n QnVmZmVyLmg6CisgICAgICAgIChEcmF3aW5nQnVmZmVyKToKKwogMjAxMy0wMy0xNCAgSmVzdXMg U2FuY2hlei1QYWxlbmNpYSAgPGplc3VzLnBhbGVuY2lhQG9wZW5ib3NzYS5vcmc+CiAKICAgICAg ICAgTW92ZSBwbGF0Zm9ybS1zcGVjaWZpYyB0eXBlZGVmcyB0byBQbGF0Zm9ybU1lbnVEZXNjcmlw dGlvbi5oCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9ncHUv RHJhd2luZ0J1ZmZlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9ncHUv RHJhd2luZ0J1ZmZlci5jcHAKaW5kZXggYmQ0MTI5YTNhNmU5OWZmOGVlMDlkNWJmOTc3MDEyZjcy MTZlYmNkMS4uNDkxN2IwOTJmNGIyNzA2ZDU3Njg1MTFmOWRmZTc5NzA3YWQ3MzU5YSAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3B1L0RyYXdpbmdCdWZmZXIu Y3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dwdS9EcmF3aW5nQnVm ZmVyLmNwcApAQCAtMTg5LDYgKzE4OSwzMyBAQCB2b2lkIERyYXdpbmdCdWZmZXI6OmNsZWFyRnJh bWVidWZmZXJzKEdDM0RiaXRmaWVsZCBjbGVhck1hc2spCiAgICAgfQogfQogCisvLyBPbmx5IHdh eSB0byBlbnN1cmUgdGhhdCB3ZSdyZSBub3QgZ2V0dGluZyBhIGJhZCBmcmFtZWJ1ZmZlciBvbiBz b21lIEFNRC9PU1ggZGV2aWNlcy4KKy8vIEZJWE1FOiBUaGlzIGNhbiBiZSByZW1vdmVkIG9uY2Ug cmVuZGVyYnVmZmVyU3RvcmFnZU11bHRpc2FtcGxlIHN0YXJ0cyByZXBvcnRpbmcgR0xfT1VUX09G X01FTU9SWSBwcm9wZXJseS4KK2Jvb2wgRHJhd2luZ0J1ZmZlcjo6Y2hlY2tCdWZmZXJJbnRlZ3Jp dHkoKQoreworICAgIGlmICghbV9tdWx0aXNhbXBsZUZCTykKKyAgICAgICAgcmV0dXJuIHRydWU7 CisKKyAgICBpZiAobV9zY2lzc29yRW5hYmxlZCkKKyAgICAgICAgbV9jb250ZXh0LT5kaXNhYmxl KEdyYXBoaWNzQ29udGV4dDNEOjpTQ0lTU09SX1RFU1QpOworCisgICAgbV9jb250ZXh0LT5jb2xv ck1hc2sodHJ1ZSwgdHJ1ZSwgdHJ1ZSwgdHJ1ZSk7CisKKyAgICBtX2NvbnRleHQtPmJpbmRGcmFt ZWJ1ZmZlcihHcmFwaGljc0NvbnRleHQzRDo6RlJBTUVCVUZGRVIsIG1fbXVsdGlzYW1wbGVGQk8p OworICAgIG1fY29udGV4dC0+Y2xlYXJDb2xvcigxLjBmLCAwLjBmLCAxLjBmLCAxLjBmKTsKKyAg ICBtX2NvbnRleHQtPmNsZWFyKEdyYXBoaWNzQ29udGV4dDNEOjpDT0xPUl9CVUZGRVJfQklUKTsK KworICAgIGNvbW1pdCgwLCAwLCAxLCAxKTsKKworICAgIHVuc2lnbmVkIGNoYXIgcGl4ZWxbNF0g PSB7MCwgMCwgMCwgMH07CisgICAgbV9jb250ZXh0LT5yZWFkUGl4ZWxzKDAsIDAsIDEsIDEsIEdy YXBoaWNzQ29udGV4dDNEOjpSR0JBLCBHcmFwaGljc0NvbnRleHQzRDo6VU5TSUdORURfQllURSwg JnBpeGVsKTsKKworICAgIGlmIChtX3NjaXNzb3JFbmFibGVkKQorICAgICAgICBtX2NvbnRleHQt PmVuYWJsZShHcmFwaGljc0NvbnRleHQzRDo6U0NJU1NPUl9URVNUKTsKKworICAgIHJldHVybiAo cGl4ZWxbMF0gPT0gMHhGRiAmJiBwaXhlbFsxXSA9PSAweDAwICYmIHBpeGVsWzJdID09IDB4RkYg JiYgcGl4ZWxbM10gPT0gMHhGRik7Cit9CisKIGJvb2wgRHJhd2luZ0J1ZmZlcjo6cmVzZXQoY29u c3QgSW50U2l6ZSYgbmV3U2l6ZSkKIHsKICAgICBpZiAoIW1fY29udGV4dCkKQEAgLTIzOCw3ICsy NjUsNiBAQCBib29sIERyYXdpbmdCdWZmZXI6OnJlc2V0KGNvbnN0IEludFNpemUmIG5ld1NpemUp CiAgICAgICAgICAgICBpbnRlcm5hbFJlbmRlcmJ1ZmZlckZvcm1hdCA9IEV4dGVuc2lvbnMzRDo6 UkdCOF9PRVM7CiAgICAgICAgIH0KIAotCiAgICAgICAgIGRvIHsKICAgICAgICAgICAgIG1fc2l6 ZSA9IGFkanVzdGVkU2l6ZTsKICAgICAgICAgICAgIC8vIHJlc2l6ZSBtdWx0aXNhbXBsZSBGQk8K QEAgLTI1Miw2ICsyNzgsMTIgQEAgYm9vbCBEcmF3aW5nQnVmZmVyOjpyZXNldChjb25zdCBJbnRT aXplJiBuZXdTaXplKQogCiAgICAgICAgICAgICAgICAgbV9jb250ZXh0LT5iaW5kUmVuZGVyYnVm ZmVyKEdyYXBoaWNzQ29udGV4dDNEOjpSRU5ERVJCVUZGRVIsIG1fbXVsdGlzYW1wbGVDb2xvckJ1 ZmZlcik7CiAgICAgICAgICAgICAgICAgbV9jb250ZXh0LT5nZXRFeHRlbnNpb25zKCktPnJlbmRl cmJ1ZmZlclN0b3JhZ2VNdWx0aXNhbXBsZShHcmFwaGljc0NvbnRleHQzRDo6UkVOREVSQlVGRkVS LCBzYW1wbGVDb3VudCwgaW50ZXJuYWxSZW5kZXJidWZmZXJGb3JtYXQsIG1fc2l6ZS53aWR0aCgp LCBtX3NpemUuaGVpZ2h0KCkpOworCisgICAgICAgICAgICAgICAgaWYgKG1fY29udGV4dC0+Z2V0 RXJyb3IoKSA9PSBHcmFwaGljc0NvbnRleHQzRDo6T1VUX09GX01FTU9SWSkgeworICAgICAgICAg ICAgICAgICAgICBhZGp1c3RlZFNpemUuc2NhbGUoc19yZXNvdXJjZUFkanVzdGVkUmF0aW8pOwor ICAgICAgICAgICAgICAgICAgICBjb250aW51ZTsKKyAgICAgICAgICAgICAgICB9CisKICAgICAg ICAgICAgICAgICBtX2NvbnRleHQtPmZyYW1lYnVmZmVyUmVuZGVyYnVmZmVyKEdyYXBoaWNzQ29u dGV4dDNEOjpGUkFNRUJVRkZFUiwgR3JhcGhpY3NDb250ZXh0M0Q6OkNPTE9SX0FUVEFDSE1FTlQw LCBHcmFwaGljc0NvbnRleHQzRDo6UkVOREVSQlVGRkVSLCBtX211bHRpc2FtcGxlQ29sb3JCdWZm ZXIpOwogICAgICAgICAgICAgICAgIHJlc2l6ZURlcHRoU3RlbmNpbChzYW1wbGVDb3VudCk7CiAg ICAgICAgICAgICAgICAgaWYgKG1fY29udGV4dC0+Y2hlY2tGcmFtZWJ1ZmZlclN0YXR1cyhHcmFw aGljc0NvbnRleHQzRDo6RlJBTUVCVUZGRVIpICE9IEdyYXBoaWNzQ29udGV4dDNEOjpGUkFNRUJV RkZFUl9DT01QTEVURSkgewpAQCAtMjc4LDkgKzMxMCwyMCBAQCBib29sIERyYXdpbmdCdWZmZXI6 OnJlc2V0KGNvbnN0IEludFNpemUmIG5ld1NpemUpCiAKICAgICAgICAgICAgIGlmICghbXVsdGlz YW1wbGUoKSkKICAgICAgICAgICAgICAgICByZXNpemVEZXB0aFN0ZW5jaWwoMCk7Ci0gICAgICAg ICAgICBpZiAobV9jb250ZXh0LT5jaGVja0ZyYW1lYnVmZmVyU3RhdHVzKEdyYXBoaWNzQ29udGV4 dDNEOjpGUkFNRUJVRkZFUikgPT0gR3JhcGhpY3NDb250ZXh0M0Q6OkZSQU1FQlVGRkVSX0NPTVBM RVRFKQotICAgICAgICAgICAgICAgIGJyZWFrOwotICAgICAgICAgICAgYWRqdXN0ZWRTaXplLnNj YWxlKHNfcmVzb3VyY2VBZGp1c3RlZFJhdGlvKTsKKyAgICAgICAgICAgIGlmIChtX2NvbnRleHQt PmNoZWNrRnJhbWVidWZmZXJTdGF0dXMoR3JhcGhpY3NDb250ZXh0M0Q6OkZSQU1FQlVGRkVSKSAh PSBHcmFwaGljc0NvbnRleHQzRDo6RlJBTUVCVUZGRVJfQ09NUExFVEUpIHsKKyAgICAgICAgICAg ICAgICBhZGp1c3RlZFNpemUuc2NhbGUoc19yZXNvdXJjZUFkanVzdGVkUmF0aW8pOworICAgICAg ICAgICAgICAgIGNvbnRpbnVlOworICAgICAgICAgICAgfQorCisjaWYgT1MoREFSV0lOKQorICAg ICAgICAgICAgLy8gRklYTUU6IFRoaXMgY2FuIGJlIHJlbW92ZWQgb25jZSByZW5kZXJidWZmZXJT dG9yYWdlTXVsdGlzYW1wbGUgc3RhcnRzIHJlcG9ydGluZyBHTF9PVVRfT0ZfTUVNT1JZIHByb3Bl cmx5IG9uIE9TWC4KKyAgICAgICAgICAgIGlmICghY2hlY2tCdWZmZXJJbnRlZ3JpdHkoKSkgewor ICAgICAgICAgICAgICAgIGFkanVzdGVkU2l6ZS5zY2FsZShzX3Jlc291cmNlQWRqdXN0ZWRSYXRp byk7CisgICAgICAgICAgICAgICAgY29udGludWU7CisgICAgICAgICAgICB9CisjZW5kaWYKKwor ICAgICAgICAgICAgYnJlYWs7CiAKICAgICAgICAgfSB3aGlsZSAoIWFkanVzdGVkU2l6ZS5pc0Vt cHR5KCkpOwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9n cHUvRHJhd2luZ0J1ZmZlci5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3B1 L0RyYXdpbmdCdWZmZXIuaAppbmRleCA2MWFhMWNlNmJlZTdmZjcwMzczMWJlODhmM2MzMTY0YjYx YjgzMmIwLi5iNDQ2MTAxMjA2NzcxM2Q1MWE1YTFiNzBmZDAxMTFjNjJmZjIxZjc2IDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9ncHUvRHJhd2luZ0J1ZmZlci5o CisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dwdS9EcmF3aW5nQnVmZmVy LmgKQEAgLTE0MCw2ICsxNDAsOCBAQCBwcml2YXRlOgogCiAgICAgdm9pZCBpbml0aWFsaXplKGNv bnN0IEludFNpemUmKTsKIAorICAgIGJvb2wgY2hlY2tCdWZmZXJJbnRlZ3JpdHkoKTsKKwogICAg IFByZXNlcnZlRHJhd2luZ0J1ZmZlciBtX3ByZXNlcnZlRHJhd2luZ0J1ZmZlcjsKICAgICBBbHBo YVJlcXVpcmVtZW50IG1fYWxwaGE7CiAgICAgYm9vbCBtX3NjaXNzb3JFbmFibGVkOwo=