54820 2011-02-19 23:40:42 -0800 REGRESSION: Knob of a disabled range control is draggable 2011-07-27 02:15:44 -0700 1 1 1 Unclassified WebKit Forms 528+ (Nightly build) Mac OS X 10.6 RESOLVED FIXED data:text/html,<input type=range disabled> Regression P1 Normal --- 1 ap webkit-unassigned adele christopher.reiss dglazkov ian shinyak tkent webkit.review.bot oldest_to_newest 354256 0 ap 2011-02-19 23:40:42 -0800 See bug URL. I can drag the knob as if the control was not disabled. Has the range control been rewritten to use shadow DOM? 354703 1 christopher.reiss 2011-02-21 11:18:08 -0800 Having a look, same problem in QtTestBrowser, not in Chrome ... 356298 2 christopher.reiss 2011-02-23 12:19:13 -0800 looks like this fixes it. how does one write a layout test for such a thing ? Index: Source/WebCore/html/shadow/SliderThumbElement.cpp =================================================================== --- Source/WebCore/html/shadow/SliderThumbElement.cpp (revision 78999) +++ Source/WebCore/html/shadow/SliderThumbElement.cpp (working copy) @@ -158,6 +158,12 @@ return; } + HTMLInputElement* input = static_cast<HTMLInputElement*>(shadowHost()); + if (input->isReadOnlyFormControl() || !input->isEnabledFormControl() ) { + HTMLDivElement::defaultEventHandler(event); + return; + } + MouseEvent* mouseEvent = static_cast<MouseEvent*>(event); bool isLeftButton = mouseEvent->button() == LeftButton; const AtomicString& eventType = event->type(); 356309 3 dglazkov 2011-02-23 12:32:12 -0800 (In reply to comment #2) > looks like this fixes it. how does one write a layout test for such a thing ? > > > Index: Source/WebCore/html/shadow/SliderThumbElement.cpp > =================================================================== > --- Source/WebCore/html/shadow/SliderThumbElement.cpp (revision 78999) > +++ Source/WebCore/html/shadow/SliderThumbElement.cpp (working copy) > @@ -158,6 +158,12 @@ > return; > } > > + HTMLInputElement* input = static_cast<HTMLInputElement*>(shadowHost()); > + if (input->isReadOnlyFormControl() || !input->isEnabledFormControl() ) { > + HTMLDivElement::defaultEventHandler(event); > + return; > + } > + > MouseEvent* mouseEvent = static_cast<MouseEvent*>(event); > bool isLeftButton = mouseEvent->button() == LeftButton; > const AtomicString& eventType = event->type(); There are lots of examples in existing LayoutTests. For example: http://google.com/codesearch/p#OAMlx_jo-ck/src/third_party/WebKit/LayoutTests/fast/repaint/slider-thumb-drag-release.html&exact_package=chromium 356386 4 ap 2011-02-23 13:50:40 -0800 Can anything be done to make mistakes like this less likely to occur elsewhere? It doesn't seem like it should be the job of every element that may end up being in a shadow tree to check if the host is disabled. 356430 5 christopher.reiss 2011-02-23 14:39:06 -0800 Let me try putting the mouse-event/shadow logic in the parent object, RenderBlock ... 356432 6 dglazkov 2011-02-23 14:42:45 -0800 (In reply to comment #4) > Can anything be done to make mistakes like this less likely to occur elsewhere? It doesn't seem like it should be the job of every element that may end up being in a shadow tree to check if the host is disabled. This is a good question. Do shadow DOM subtrees of disabled hosts hear events? Hixie, WDYT? 441374 7 101808 shinyak 2011-07-23 06:12:15 -0700 Created attachment 101808 Patch 441400 8 ap 2011-07-23 10:41:59 -0700 > Can anything be done to make mistakes like this less likely to occur elsewhere? It doesn't seem like it should be the job of every element that may end up being in a shadow tree to check if the host is disabled. This question still stands. Also, what is the reason to add the checks in two places? 441528 9 shinyak 2011-07-24 18:36:29 -0700 (In reply to comment #8) > > Can anything be done to make mistakes like this less likely to occur elsewhere? It doesn't seem like it should be the job of every element that may end up being in a shadow tree to check if the host is disabled. > > This question still stands. > > Also, what is the reason to add the checks in two places? They were necessary to make the slider work correctly on Mac. Just adding the code in RangeThumbSlider cannot disable the slider correctly on Mac, the other platform can though. However, it is true that this patch does not answer the question. So I try to add some code in HTMLInputElement to disable shadow elements in all input type. 441530 10 tkent 2011-07-24 18:43:41 -0700 (In reply to comment #8) > Also, what is the reason to add the checks in two places? A change for RangeInputType.cpp disables moving the thumb by clicking on the track not on the thumb, and a change for SliderThumbElement.cpp disables dragging the thumb. Shinya, your test looks not to cover the former case. 442148 11 101979 shinyak 2011-07-26 01:08:23 -0700 Created attachment 101979 Patch 442149 12 shinyak 2011-07-26 01:11:36 -0700 kent, I've changed the test to cover the click on the knob and the click not on the knob. However I omitted vertical slider version, because I don't think it is necessary to cover this scenario. Alexey, > Do shadow DOM subtrees of disabled hosts hear events? Hixie, WDYT? This patch does not answer this question yet, however I prioritized fixing this regression bug. 442782 13 tkent 2011-07-27 01:15:13 -0700 (In reply to comment #12) > > Do shadow DOM subtrees of disabled hosts hear events? Hixie, WDYT? > > This patch does not answer this question yet, however I prioritized fixing this regression bug. I agree with Shinya. We should discuss it thoroughly in another bug. I don't think we should stop delivering events in such case. 442799 14 101979 webkit.review.bot 2011-07-27 02:15:35 -0700 Comment on attachment 101979 Patch Clearing flags on attachment: 101979 Committed r91827: <http://trac.webkit.org/changeset/91827> 442800 15 webkit.review.bot 2011-07-27 02:15:44 -0700 All reviewed patches have been landed. Closing bug. 101808 2011-07-23 06:12:15 -0700 2011-07-26 01:08:15 -0700 Patch bug-54820-20110723221214.patch text/plain 7491 shinyak U3VidmVyc2lvbiBSZXZpc2lvbjogOTE2MzEKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5n ZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCAyZmMyYmU5NDk4YTJjYTgwM2U3ZmI2 YTE3YmM5ZTFhNTVjOTJmZWY2Li4xNTMzYjIxMzE3OTIwMzQ0YTMzNjVmYWNlYWUwYWFlMTliMjQ1 ODY0IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMv Q2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAKKzIwMTEtMDctMjMgIFNoaW55YSBLYXdhbmFrYSAg PHNoaW55YWtAZ29vZ2xlLmNvbT4KKworICAgICAgICBLbm9iIG9mIGEgZGlzYWJsZWQgb3IgcmVh ZG9ubHkgcmFuZ2UgY29udHJvbCBzaG91bGQgbm90IGJlIGRyYWdnYWJsZS4KKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTU0ODIwCisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQWRkZWQgdGVzdHMgdG8gY29uZmly bSBkaXNhYmxlZCBvciByZWFkb25seSByYW5nZSBjb250cm9sIGlzIHVuZHJhZ2dhYmxlLgorCisg ICAgICAgICogZmFzdC9mb3Jtcy9yYW5nZS1kcmFnLWV4cGVjdGVkLnR4dDogQWRkZWQuCisgICAg ICAgICogZmFzdC9mb3Jtcy9yYW5nZS1kcmFnLmh0bWw6IEFkZGVkLgorCiAyMDExLTA3LTIyICBS eW9zdWtlIE5pd2EgIDxybml3YUB3ZWJraXQub3JnPgogCiAgICAgICAgIEFkZCBjcmFzaGluZyBh bmQgZmFpbGluZyBleHBlY3RhdGlvbnMgZm9yIGNhbnZhcyBhbmQgY3NzIHRlc3RzIGFmdGVyIHI5 MTYyOC4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2Zhc3QvZm9ybXMvcmFuZ2UtZHJhZy1leHBl Y3RlZC50eHQgYi9MYXlvdXRUZXN0cy9mYXN0L2Zvcm1zL3JhbmdlLWRyYWctZXhwZWN0ZWQudHh0 Cm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAuLjRjZjg1MzNkNDE0YzViN2ZlNDliZWFkMDk3MThhODhmMjQxN2QyMDIKLS0t IC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9mYXN0L2Zvcm1zL3JhbmdlLWRyYWctZXhwZWN0 ZWQudHh0CkBAIC0wLDAgKzEsMzAgQEAKK1Rlc3QgZm9yIGRyYWdnaW5nIG9wZXJhdGlvbnMgb2Yg PGlucHV0IHR5cGU9cmFuZ2U+CisKK1Rlc3RzIGZvciBhIGhvcml6b250YWwgcmFuZ2UKK1BBU1Mg aW5wdXQudmFsdWUgaXMgIjUwIgorcmVhZE9ubHk9ZmFsc2UsIGRpc2FibGVkPWZhbHNlCitQQVNT IGlucHV0LnZhbHVlIGlzICIxMDAiCitQQVNTIGNoYW5nZUV2ZW50Q291bnRlciBpcyA+PSBsYXN0 Q2hhbmdlRXZlbnRDb3VudGVyICsgMQorcmVhZE9ubHk9dHJ1ZQorUEFTUyBpbnB1dC52YWx1ZSBp cyAiNTAiCitQQVNTIGxhc3RDaGFuZ2VFdmVudENvdW50ZXIgaXMgY2hhbmdlRXZlbnRDb3VudGVy CitkaXNhYmxlZD10cnVlCitQQVNTIGlucHV0LnZhbHVlIGlzICI1MCIKK1BBU1MgbGFzdENoYW5n ZUV2ZW50Q291bnRlciBpcyBjaGFuZ2VFdmVudENvdW50ZXIKKworVGVzdHMgZm9yIGEgdmVydGlj YWwgcmFuZ2UKK1BBU1MgaW5wdXQudmFsdWUgaXMgIjUwIgorcmVhZE9ubHk9ZmFsc2UsIGRpc2Fi bGVkPWZhbHNlCitQQVNTIGlucHV0LnZhbHVlIGlzICIxMDAiCitQQVNTIGNoYW5nZUV2ZW50Q291 bnRlciBpcyA+PSBsYXN0Q2hhbmdlRXZlbnRDb3VudGVyICsgMQorcmVhZE9ubHk9dHJ1ZQorUEFT UyBpbnB1dC52YWx1ZSBpcyAiNTAiCitQQVNTIGxhc3RDaGFuZ2VFdmVudENvdW50ZXIgaXMgY2hh bmdlRXZlbnRDb3VudGVyCitkaXNhYmxlZD10cnVlCitQQVNTIGlucHV0LnZhbHVlIGlzICI1MCIK K1BBU1MgbGFzdENoYW5nZUV2ZW50Q291bnRlciBpcyBjaGFuZ2VFdmVudENvdW50ZXIKKworUEFT UyBzdWNjZXNzZnVsbHlQYXJzZWQgaXMgdHJ1ZQorCitURVNUIENPTVBMRVRFCisKZGlmZiAtLWdp dCBhL0xheW91dFRlc3RzL2Zhc3QvZm9ybXMvcmFuZ2UtZHJhZy5odG1sIGIvTGF5b3V0VGVzdHMv ZmFzdC9mb3Jtcy9yYW5nZS1kcmFnLmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uYzNkMzFkYzYwZmUxMDk0MGFj MmU0OGJlNjg1NjFhMWEzNGVmODRiNAotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2Zh c3QvZm9ybXMvcmFuZ2UtZHJhZy5odG1sCkBAIC0wLDAgKzEsODUgQEAKKzwhRE9DVFlQRSBIVE1M IFBVQkxJQyAiLS8vSUVURi8vRFREIEhUTUwvL0VOIj4KKzxodG1sPgorPGhlYWQ+Cis8bGluayBy ZWw9InN0eWxlc2hlZXQiIGhyZWY9Ii4uLy4uL2Zhc3QvanMvcmVzb3VyY2VzL2pzLXRlc3Qtc3R5 bGUuY3NzIj4KKzxzY3JpcHQgc3JjPSIuLi8uLi9mYXN0L2pzL3Jlc291cmNlcy9qcy10ZXN0LXBy ZS5qcyI+PC9zY3JpcHQ+Cis8L2hlYWQ+Cis8Ym9keT4KKzxwIGlkPSJkZXNjcmlwdGlvbiI+VGVz dCBmb3IgZHJhZ2dpbmcgb3BlcmF0aW9ucyBvZiAmbHQ7aW5wdXQgdHlwZT1yYW5nZSZndDs8L3A+ Cis8ZGl2IGlkPSJjb25zb2xlIj48L2Rpdj4KKzxzY3JpcHQ+CisKK3ZhciBjaGFuZ2VFdmVudENv dW50ZXIgPSAwOworZnVuY3Rpb24gaGFuZGxlQ2hhbmdlKCkgeworICAgIGNoYW5nZUV2ZW50Q291 bnRlcisrOworfQordmFyIGxhc3RDaGFuZ2VFdmVudENvdW50ZXIgPSBjaGFuZ2VFdmVudENvdW50 ZXI7CisKK2Z1bmN0aW9uIGRyYWdNb3VzZSh2ZXJ0aWNhbCkgeworICAgIHZhciBjZW50ZXJYID0g aW5wdXQub2Zmc2V0TGVmdCArIGlucHV0Lm9mZnNldFdpZHRoIC8gMjsKKyAgICB2YXIgY2VudGVy WSA9IGlucHV0Lm9mZnNldFRvcCArIGlucHV0Lm9mZnNldEhlaWdodCAvIDI7CisgICAgZXZlbnRT ZW5kZXIubW91c2VNb3ZlVG8oY2VudGVyWCwgY2VudGVyWSk7CisgICAgZXZlbnRTZW5kZXIubW91 c2VEb3duKCk7CisgICAgaWYgKHZlcnRpY2FsKQorICAgICAgICBldmVudFNlbmRlci5tb3VzZU1v dmVUbyhjZW50ZXJYLCBpbnB1dC5vZmZzZXRUb3ApOworICAgIGVsc2UKKyAgICAgICAgZXZlbnRT ZW5kZXIubW91c2VNb3ZlVG8oY2VudGVyWC5vZmZzZXRMZWZ0ICsgY2VudGVyWC5vZmZzZXRXaWR0 aCwgY2VudGVyWSk7CisgICAgZXZlbnRTZW5kZXIubW91c2VVcCgpOworfQorCitmdW5jdGlvbiB0 ZXN0SW5wdXQodmVydGljYWwpIHsKKyAgICBpZiAoIXdpbmRvdy5ldmVudFNlbmRlcikKKyAgICAg ICAgcmV0dXJuOworCisgICAgc2hvdWxkQmUoJ2lucHV0LnZhbHVlJywgJyI1MCInKTsKKyAgICBk ZWJ1ZygncmVhZE9ubHk9ZmFsc2UsIGRpc2FibGVkPWZhbHNlJyk7CisgICAgaW5wdXQudmFsdWVB c051bWJlciA9IDUwOworICAgIGxhc3RDaGFuZ2VFdmVudENvdW50ZXIgPSBjaGFuZ2VFdmVudENv dW50ZXI7CisgICAgZHJhZ01vdXNlKHZlcnRpY2FsKTsKKyAgICBzaG91bGRCZSgnaW5wdXQudmFs dWUnLCAnIjEwMCInKTsKKyAgICBzaG91bGRCZUdyZWF0ZXJUaGFuT3JFcXVhbCgnY2hhbmdlRXZl bnRDb3VudGVyJywgJ2xhc3RDaGFuZ2VFdmVudENvdW50ZXIgKyAxJyk7CisKKyAgICBkZWJ1Zygn cmVhZE9ubHk9dHJ1ZScpOworICAgIGlucHV0LmRpc2FibGVkID0gZmFsc2U7CisgICAgaW5wdXQu cmVhZE9ubHkgPSB0cnVlOworICAgIGlucHV0LnZhbHVlQXNOdW1iZXIgPSA1MDsKKyAgICBsYXN0 Q2hhbmdlRXZlbnRDb3VudGVyID0gY2hhbmdlRXZlbnRDb3VudGVyOworICAgIGRyYWdNb3VzZSh2 ZXJ0aWNhbCk7CisgICAgc2hvdWxkQmUoJ2lucHV0LnZhbHVlJywgJyI1MCInKTsKKyAgICBzaG91 bGRCZSgnbGFzdENoYW5nZUV2ZW50Q291bnRlcicsICdjaGFuZ2VFdmVudENvdW50ZXInKTsKKwor ICAgIGRlYnVnKCdkaXNhYmxlZD10cnVlJyk7CisgICAgaW5wdXQucmVhZE9ubHkgPSBmYWxzZTsK KyAgICBpbnB1dC5kaXNhYmxlZCA9IHRydWU7CisgICAgaW5wdXQudmFsdWVBc051bWJlciA9IDUw OworICAgIGxhc3RDaGFuZ2VFdmVudENvdW50ZXIgPSBjaGFuZ2VFdmVudENvdW50ZXI7CisgICAg ZHJhZ01vdXNlKHZlcnRpY2FsKTsKKyAgICBzaG91bGRCZSgnaW5wdXQudmFsdWUnLCAnIjUwIicp OworICAgIHNob3VsZEJlKCdsYXN0Q2hhbmdlRXZlbnRDb3VudGVyJywgJ2NoYW5nZUV2ZW50Q291 bnRlcicpOworfQorCit2YXIgcGFyZW50ID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgnZGl2Jyk7 Citkb2N1bWVudC5ib2R5LmFwcGVuZENoaWxkKHBhcmVudCk7CitwYXJlbnQuaW5uZXJIVE1MID0g JzxpbnB1dCB0eXBlPXJhbmdlIGlkPXJhbmdlMSBtaW49MCBtYXg9MTAwIHZhbHVlPTUwPicKKyAg ICArICc8aW5wdXQgdHlwZT1yYW5nZSBpZD1yYW5nZTIgbWluPTAgbWF4PTEwMCB2YWx1ZT01MCAn CisgICAgKyAnc3R5bGU9Ii13ZWJraXQtYXBwZWFyYW5jZTpzbGlkZXItdmVydGljYWw7IGhlaWdo dDogMTAwcHgiID4nOworCitkZWJ1ZygnVGVzdHMgZm9yIGEgaG9yaXpvbnRhbCByYW5nZScpOwor dmFyIGlucHV0ID0gZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoJ3JhbmdlMScpOworaW5wdXQub25j aGFuZ2UgPSBoYW5kbGVDaGFuZ2U7CitpbnB1dC5mb2N1cygpOwordGVzdElucHV0KGZhbHNlLCBm YWxzZSk7CitkZWJ1ZygnJyk7CisKK2RlYnVnKCdUZXN0cyBmb3IgYSB2ZXJ0aWNhbCByYW5nZScp OwordmFyIGlucHV0ID0gZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoJ3JhbmdlMicpOworaW5wdXQu b25jaGFuZ2UgPSBoYW5kbGVDaGFuZ2U7CitpbnB1dC5mb2N1cygpOwordGVzdElucHV0KHRydWUs IGZhbHNlKTsKK2RlYnVnKCcnKTsKKwordmFyIHN1Y2Nlc3NmdWxseVBhcnNlZCA9IHRydWU7Cis8 L3NjcmlwdD4KKzxzY3JpcHQgc3JjPSIuLi8uLi9mYXN0L2pzL3Jlc291cmNlcy9qcy10ZXN0LXBv c3QuanMiPjwvc2NyaXB0PgorPC9ib2R5PgorPC9odG1sPgpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCmluZGV4IGViNjc5Mzc5 NjIxNTJlNjJlMTBjNWFlY2QyODc0ZDljNmVlODNjOWQuLmFhMDg3MGYyNmQyY2ZkMTMyMzY2YWNh Yzc4YTc1ZGZkYzgzZDcwNGIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwor KysgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyMCBAQAorMjAxMS0wNy0y MyAgU2hpbnlhIEthd2FuYWthICA8c2hpbnlha0Bnb29nbGUuY29tPgorCisgICAgICAgIEtub2Ig b2YgYSBkaXNhYmxlZCBvciByZWFkb25seSByYW5nZSBjb250cm9sIHNob3VsZCBub3QgYmUgZHJh Z2dhYmxlLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 NTQ4MjAKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBN YWRlIGRpc2FibGVkIG9yIHJlYWRvbmx5IHJhbmdlIGNvbnRyb2wgdW5kcmFnZ2FibGUuCisKKyAg ICAgICAgVGVzdDogZmFzdC9mb3Jtcy9yYW5nZS1kcmFnLmh0bWwKKworICAgICAgICAqIGh0bWwv UmFuZ2VJbnB1dFR5cGUuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmFuZ2VJbnB1dFR5cGU6Omhh bmRsZU1vdXNlRG93bkV2ZW50KToKKyAgICAgICAgICBBZGRlZCBjaGVjayB0aGF0IHRoZSBlbGVt ZW50IGlzIHJlYWRvbmx5IG9yIGRpc2FibGVkLgorICAgICAgICAqIGh0bWwvc2hhZG93L1NsaWRl clRodW1iRWxlbWVudC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpTbGlkZXJUaHVtYkVsZW1lbnQ6 OmRlZmF1bHRFdmVudEhhbmRsZXIpOiBkaXR0by4KKwogMjAxMS0wNy0yMiAgSmFtZXMgUm9iaW5z b24gIDxqYW1lc3JAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFtjaHJvbWl1bV0gU2VwZXJhdGUg dGV4dHVyZSBtYW5hZ2VtZW50IGZvciBjb250ZW50cyB0ZXh0dXJlcyB2cyByZW5kZXIgc3VyZmFj ZSB0ZXh0dXJlcwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaHRtbC9SYW5nZUlucHV0VHlw ZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL1JhbmdlSW5wdXRUeXBlLmNwcAppbmRleCAyNmQy OTliMTNkODQ4NmI3MzkyNzA0YTc2OWZmOWFmOWIwY2Y5ZjgzLi5kNTAxNmFkZjViOWYwYjM3MTcx ZWQwMjMzNGZiZTE3YzZhMGJiOGIyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9odG1sL1Jh bmdlSW5wdXRUeXBlLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL1JhbmdlSW5wdXRUeXBl LmNwcApAQCAtMTUzLDYgKzE1Myw5IEBAIGRvdWJsZSBSYW5nZUlucHV0VHlwZTo6c3RlcFNjYWxl RmFjdG9yKCkgY29uc3QKIAogdm9pZCBSYW5nZUlucHV0VHlwZTo6aGFuZGxlTW91c2VEb3duRXZl bnQoTW91c2VFdmVudCogZXZlbnQpCiB7CisgICAgaWYgKGVsZW1lbnQoKS0+ZGlzYWJsZWQoKSB8 fCBlbGVtZW50KCktPnJlYWRPbmx5KCkpCisgICAgICAgIHJldHVybjsKKwogICAgIE5vZGUqIHRh cmdldE5vZGUgPSBldmVudC0+dGFyZ2V0KCktPnRvTm9kZSgpOwogICAgIGlmIChldmVudC0+YnV0 dG9uKCkgIT0gTGVmdEJ1dHRvbiB8fCAhdGFyZ2V0Tm9kZSB8fCAodGFyZ2V0Tm9kZSAhPSBlbGVt ZW50KCkgJiYgIXRhcmdldE5vZGUtPmlzRGVzY2VuZGFudE9mKGVsZW1lbnQoKS0+c2hhZG93Um9v dCgpKSkpCiAgICAgICAgIHJldHVybjsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2h0bWwv c2hhZG93L1NsaWRlclRodW1iRWxlbWVudC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL3NoYWRv dy9TbGlkZXJUaHVtYkVsZW1lbnQuY3BwCmluZGV4IDAzODkxN2UyZGVlMDQ5MzViODg3MjQwMzZm ZjI5N2E5NGQ4YWExMWMuLjgzOGZjNWVhZjliYzg5MzhkZTNjYWEyODYxMjFjZjA0NmViNjAyMzUg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvc2hhZG93L1NsaWRlclRodW1iRWxlbWVu dC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvaHRtbC9zaGFkb3cvU2xpZGVyVGh1bWJFbGVtZW50 LmNwcApAQCAtMjcwLDYgKzI3MCwxMiBAQCB2b2lkIFNsaWRlclRodW1iRWxlbWVudDo6ZGVmYXVs dEV2ZW50SGFuZGxlcihFdmVudCogZXZlbnQpCiAgICAgICAgIHJldHVybjsKICAgICB9CiAKKyAg ICBIVE1MSW5wdXRFbGVtZW50KiBpbnB1dCA9IGhvc3RJbnB1dCgpOworICAgIGlmICghaW5wdXQg fHwgaW5wdXQtPmlzUmVhZE9ubHlGb3JtQ29udHJvbCgpIHx8ICFpbnB1dC0+aXNFbmFibGVkRm9y bUNvbnRyb2woKSkgeworICAgICAgICBIVE1MRGl2RWxlbWVudDo6ZGVmYXVsdEV2ZW50SGFuZGxl cihldmVudCk7CisgICAgICAgIHJldHVybjsKKyAgICB9CisKICAgICBNb3VzZUV2ZW50KiBtb3Vz ZUV2ZW50ID0gc3RhdGljX2Nhc3Q8TW91c2VFdmVudCo+KGV2ZW50KTsKICAgICBib29sIGlzTGVm dEJ1dHRvbiA9IG1vdXNlRXZlbnQtPmJ1dHRvbigpID09IExlZnRCdXR0b247CiAgICAgY29uc3Qg QXRvbWljU3RyaW5nJiBldmVudFR5cGUgPSBldmVudC0+dHlwZSgpOwpAQCAtMzc0LDQgKzM4MCwz IEBAIGNvbnN0IEF0b21pY1N0cmluZyYgU2xpZGVyQ29udGFpbmVyRWxlbWVudDo6c2hhZG93UHNl dWRvSWQoKSBjb25zdAogfQogCiB9Ci0K 101979 2011-07-26 01:08:23 -0700 2011-07-27 02:15:35 -0700 Patch bug-54820-20110726170821.patch text/plain 8082 shinyak U3VidmVyc2lvbiBSZXZpc2lvbjogOTE3MzYKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5n ZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCAyY2M5OWY3NTU4YWU3YmM4MjAxMWUy YjlkMDEyZWUxMGIwMDAyZjlhLi4wMzU0MTIwMWE2OTk4OGY2ZmI0MTA2MjljNDg1ODNlNTkwN2Uy ZDIzIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMv Q2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAKKzIwMTEtMDctMjMgIFNoaW55YSBLYXdhbmFrYSAg PHNoaW55YWtAZ29vZ2xlLmNvbT4KKworICAgICAgICBLbm9iIG9mIGEgZGlzYWJsZWQgb3IgcmVh ZG9ubHkgcmFuZ2UgY29udHJvbCBzaG91bGQgbm90IGJlIGRyYWdnYWJsZS4KKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTU0ODIwCisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQWRkZWQgdGVzdHMgdG8gY29uZmly bSBkaXNhYmxlZCBvciByZWFkb25seSByYW5nZSBjb250cm9sIGlzIHVuZHJhZ2dhYmxlLgorCisg ICAgICAgICogZmFzdC9mb3Jtcy9yYW5nZS1kcmFnLWV4cGVjdGVkLnR4dDogQWRkZWQuCisgICAg ICAgICogZmFzdC9mb3Jtcy9yYW5nZS1kcmFnLmh0bWw6IEFkZGVkLgorCiAyMDExLTA3LTI1ICBB ZHJpZW5uZSBXYWxrZXIgIDxlbm5lQGdvb2dsZS5jb20+CiAKICAgICAgICAgW2Nocm9taXVtXSBN YXJrIGZhc3QvY3ljbGljLXByb3RvdHlwZXMuaHRtbCBhcyBhIGZsYWt5IGNyYXNoZXIuCmRpZmYg LS1naXQgYS9MYXlvdXRUZXN0cy9mYXN0L2Zvcm1zL3JhbmdlLWRyYWctZXhwZWN0ZWQudHh0IGIv TGF5b3V0VGVzdHMvZmFzdC9mb3Jtcy9yYW5nZS1kcmFnLWV4cGVjdGVkLnR4dApuZXcgZmlsZSBt b2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw Li41NzllMzZmZWQ4NGNhN2U3YTI5NzAwMWNiMmRiOTg4NTM4NTUyYjEzCi0tLSAvZGV2L251bGwK KysrIGIvTGF5b3V0VGVzdHMvZmFzdC9mb3Jtcy9yYW5nZS1kcmFnLWV4cGVjdGVkLnR4dApAQCAt MCwwICsxLDI4IEBACitUZXN0IGZvciBkcmFnZ2luZyBvcGVyYXRpb25zIG9mIDxpbnB1dCB0eXBl PXJhbmdlPgorCitUZXN0cyBmb3IgcmFuZ2UgZHJhZ2dpbmcgZnJvbSBjZW50ZXIuCityZWFkT25s eT1mYWxzZSwgZGlzYWJsZWQ9ZmFsc2UKK1BBU1MgaW5wdXQudmFsdWUgaXMgIjEwMCIKK1BBU1Mg Y2hhbmdlRXZlbnRDb3VudGVyIGlzID49IGxhc3RDaGFuZ2VFdmVudENvdW50ZXIgKyAxCityZWFk T25seT10cnVlCitQQVNTIGlucHV0LnZhbHVlIGlzICI1MCIKK1BBU1MgbGFzdENoYW5nZUV2ZW50 Q291bnRlciBpcyBjaGFuZ2VFdmVudENvdW50ZXIKK2Rpc2FibGVkPXRydWUKK1BBU1MgaW5wdXQu dmFsdWUgaXMgIjUwIgorUEFTUyBsYXN0Q2hhbmdlRXZlbnRDb3VudGVyIGlzIGNoYW5nZUV2ZW50 Q291bnRlcgorCitUZXN0cyBmb3IgcmFuZ2UgZHJhZ2dpbmcgZnJvbSBlZGdlCityZWFkT25seT1m YWxzZSwgZGlzYWJsZWQ9ZmFsc2UKK1BBU1MgaW5wdXQudmFsdWUgaXMgIjEwMCIKK1BBU1MgY2hh bmdlRXZlbnRDb3VudGVyIGlzID49IGxhc3RDaGFuZ2VFdmVudENvdW50ZXIgKyAxCityZWFkT25s eT10cnVlCitQQVNTIGlucHV0LnZhbHVlIGlzICI1MCIKK1BBU1MgbGFzdENoYW5nZUV2ZW50Q291 bnRlciBpcyBjaGFuZ2VFdmVudENvdW50ZXIKK2Rpc2FibGVkPXRydWUKK1BBU1MgaW5wdXQudmFs dWUgaXMgIjUwIgorUEFTUyBsYXN0Q2hhbmdlRXZlbnRDb3VudGVyIGlzIGNoYW5nZUV2ZW50Q291 bnRlcgorCitQQVNTIHN1Y2Nlc3NmdWxseVBhcnNlZCBpcyB0cnVlCisKK1RFU1QgQ09NUExFVEUK KwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZmFzdC9mb3Jtcy9yYW5nZS1kcmFnLmh0bWwgYi9M YXlvdXRUZXN0cy9mYXN0L2Zvcm1zL3JhbmdlLWRyYWcuaHRtbApuZXcgZmlsZSBtb2RlIDEwMDY0 NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi45YzI1OWUx NmZhMjQ3ZjI4YzBhZTcxODZhZjU3YjFjNDcwMGY2ZTQ1Ci0tLSAvZGV2L251bGwKKysrIGIvTGF5 b3V0VGVzdHMvZmFzdC9mb3Jtcy9yYW5nZS1kcmFnLmh0bWwKQEAgLTAsMCArMSw5MSBAQAorPCFE T0NUWVBFIEhUTUwgUFVCTElDICItLy9JRVRGLy9EVEQgSFRNTC8vRU4iPgorPGh0bWw+Cis8aGVh ZD4KKzxsaW5rIHJlbD0ic3R5bGVzaGVldCIgaHJlZj0iLi4vLi4vZmFzdC9qcy9yZXNvdXJjZXMv anMtdGVzdC1zdHlsZS5jc3MiPgorPHNjcmlwdCBzcmM9Ii4uLy4uL2Zhc3QvanMvcmVzb3VyY2Vz L2pzLXRlc3QtcHJlLmpzIj48L3NjcmlwdD4KKzwvaGVhZD4KKzxib2R5PgorPHAgaWQ9ImRlc2Ny aXB0aW9uIj5UZXN0IGZvciBkcmFnZ2luZyBvcGVyYXRpb25zIG9mICZsdDtpbnB1dCB0eXBlPXJh bmdlJmd0OzwvcD4KKzxkaXYgaWQ9ImNvbnNvbGUiPjwvZGl2PgorPHNjcmlwdD4KKwordmFyIGNo YW5nZUV2ZW50Q291bnRlciA9IDA7CitmdW5jdGlvbiBoYW5kbGVDaGFuZ2UoKSB7CisgICAgY2hh bmdlRXZlbnRDb3VudGVyKys7Cit9Cit2YXIgbGFzdENoYW5nZUV2ZW50Q291bnRlciA9IGNoYW5n ZUV2ZW50Q291bnRlcjsKKworZnVuY3Rpb24gZHJhZ01vdXNlRnJvbUNlbnRlcigpIHsKKyAgICB2 YXIgY2VudGVyWCA9IGlucHV0Lm9mZnNldExlZnQgKyBpbnB1dC5vZmZzZXRXaWR0aCAvIDI7Cisg ICAgdmFyIGNlbnRlclkgPSBpbnB1dC5vZmZzZXRUb3AgKyBpbnB1dC5vZmZzZXRIZWlnaHQgLyAy OworICAgIGV2ZW50U2VuZGVyLm1vdXNlTW92ZVRvKGNlbnRlclgsIGNlbnRlclkpOworICAgIGV2 ZW50U2VuZGVyLm1vdXNlRG93bigpOworICAgIGV2ZW50U2VuZGVyLm1vdXNlTW92ZVRvKGlucHV0 Lm9mZnNldExlZnQgKyBpbnB1dC5vZmZzZXRXaWR0aCwgY2VudGVyWSk7CisgICAgZXZlbnRTZW5k ZXIubW91c2VVcCgpOworfQorCitmdW5jdGlvbiBkcmFnTW91c2VGcm9tRWRnZSgpIHsKKyAgICB2 YXIgY2VudGVyWSA9IGlucHV0Lm9mZnNldFRvcCArIGlucHV0Lm9mZnNldEhlaWdodCAvIDI7CisK KyAgICBldmVudFNlbmRlci5tb3VzZU1vdmVUbyhpbnB1dC5vZmZzZXRMZWZ0ICsgMSwgY2VudGVy WSk7CisgICAgZXZlbnRTZW5kZXIubW91c2VEb3duKCk7CisgICAgZXZlbnRTZW5kZXIubW91c2VN b3ZlVG8oaW5wdXQub2Zmc2V0TGVmdCArIGlucHV0Lm9mZnNldFdpZHRoLCBjZW50ZXJZKTsKKyAg ICBldmVudFNlbmRlci5tb3VzZVVwKCk7Cit9CisKK2Z1bmN0aW9uIHRlc3RJbnB1dChkcmFnc0Zy b21FZGdlKSB7CisgICAgaWYgKCF3aW5kb3cuZXZlbnRTZW5kZXIpCisgICAgICAgIHJldHVybjsK KworICAgIHZhciBkcmFnTW91c2UgPSBkcmFnc0Zyb21FZGdlID8gZHJhZ01vdXNlRnJvbUVkZ2Ug OiBkcmFnTW91c2VGcm9tQ2VudGVyOworCisgICAgZGVidWcoJ3JlYWRPbmx5PWZhbHNlLCBkaXNh YmxlZD1mYWxzZScpOworICAgIGlucHV0LnZhbHVlQXNOdW1iZXIgPSA1MDsKKyAgICBsYXN0Q2hh bmdlRXZlbnRDb3VudGVyID0gY2hhbmdlRXZlbnRDb3VudGVyOworICAgIGRyYWdNb3VzZSgpOwor ICAgIHNob3VsZEJlKCdpbnB1dC52YWx1ZScsICciMTAwIicpOworICAgIHNob3VsZEJlR3JlYXRl clRoYW5PckVxdWFsKCdjaGFuZ2VFdmVudENvdW50ZXInLCAnbGFzdENoYW5nZUV2ZW50Q291bnRl ciArIDEnKTsKKworICAgIGRlYnVnKCdyZWFkT25seT10cnVlJyk7CisgICAgaW5wdXQuZGlzYWJs ZWQgPSBmYWxzZTsKKyAgICBpbnB1dC5yZWFkT25seSA9IHRydWU7CisgICAgaW5wdXQudmFsdWVB c051bWJlciA9IDUwOworICAgIGxhc3RDaGFuZ2VFdmVudENvdW50ZXIgPSBjaGFuZ2VFdmVudENv dW50ZXI7CisgICAgZHJhZ01vdXNlKCk7CisgICAgc2hvdWxkQmUoJ2lucHV0LnZhbHVlJywgJyI1 MCInKTsKKyAgICBzaG91bGRCZSgnbGFzdENoYW5nZUV2ZW50Q291bnRlcicsICdjaGFuZ2VFdmVu dENvdW50ZXInKTsKKworICAgIGRlYnVnKCdkaXNhYmxlZD10cnVlJyk7CisgICAgaW5wdXQucmVh ZE9ubHkgPSBmYWxzZTsKKyAgICBpbnB1dC5kaXNhYmxlZCA9IHRydWU7CisgICAgaW5wdXQudmFs dWVBc051bWJlciA9IDUwOworICAgIGxhc3RDaGFuZ2VFdmVudENvdW50ZXIgPSBjaGFuZ2VFdmVu dENvdW50ZXI7CisgICAgZHJhZ01vdXNlKCk7CisgICAgc2hvdWxkQmUoJ2lucHV0LnZhbHVlJywg JyI1MCInKTsKKyAgICBzaG91bGRCZSgnbGFzdENoYW5nZUV2ZW50Q291bnRlcicsICdjaGFuZ2VF dmVudENvdW50ZXInKTsKK30KKwordmFyIHBhcmVudCA9IGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQo J2RpdicpOworZG9jdW1lbnQuYm9keS5hcHBlbmRDaGlsZChwYXJlbnQpOworcGFyZW50LmlubmVy SFRNTCA9ICc8aW5wdXQgdHlwZT1yYW5nZSBpZD1yYW5nZTEgbWluPTAgbWF4PTEwMCB2YWx1ZT01 MD4nICsKKyc8aW5wdXQgdHlwZT1yYW5nZSBpZD1yYW5nZTIgbWluPTAgbWF4PTEwMCB2YWx1ZT01 MD4nOworCitkZWJ1ZygnVGVzdHMgZm9yIHJhbmdlIGRyYWdnaW5nIGZyb20gY2VudGVyLicpOwor dmFyIGlucHV0ID0gZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoJ3JhbmdlMScpOworaW5wdXQub25j aGFuZ2UgPSBoYW5kbGVDaGFuZ2U7CitpbnB1dC5mb2N1cygpOwordGVzdElucHV0KGZhbHNlKTsK K2RlYnVnKCcnKTsKKworZGVidWcoJ1Rlc3RzIGZvciByYW5nZSBkcmFnZ2luZyBmcm9tIGVkZ2Un KTsKK3ZhciBpbnB1dCA9IGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCdyYW5nZTInKTsKK2lucHV0 Lm9uY2hhbmdlID0gaGFuZGxlQ2hhbmdlOworaW5wdXQuZm9jdXMoKTsKK3Rlc3RJbnB1dCh0cnVl KTsKK2RlYnVnKCcnKTsKKwordmFyIHN1Y2Nlc3NmdWxseVBhcnNlZCA9IHRydWU7Cis8L3Njcmlw dD4KKzxzY3JpcHQgc3JjPSIuLi8uLi9mYXN0L2pzL3Jlc291cmNlcy9qcy10ZXN0LXBvc3QuanMi Pjwvc2NyaXB0PgorPC9ib2R5PgorPC9odG1sPgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv Q2hhbmdlTG9nIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCmluZGV4IDU3ZjY2NGUzODY3YzYz OGU5MWQzNDc1MTQwNWNkZWU2NzI5MWE4YzUuLmMyYmFlYzliNzBlYjZkZjZlZmUwYzE0NGQ5NDVm MzgyNmJhM2VmOTAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9T b3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyMCBAQAorMjAxMS0wNy0yMyAgU2hp bnlhIEthd2FuYWthICA8c2hpbnlha0Bnb29nbGUuY29tPgorCisgICAgICAgIEtub2Igb2YgYSBk aXNhYmxlZCBvciByZWFkb25seSByYW5nZSBjb250cm9sIHNob3VsZCBub3QgYmUgZHJhZ2dhYmxl LgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTQ4MjAK KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBNYWRlIGRp c2FibGVkIG9yIHJlYWRvbmx5IHJhbmdlIGNvbnRyb2wgdW5kcmFnZ2FibGUuCisKKyAgICAgICAg VGVzdDogZmFzdC9mb3Jtcy9yYW5nZS1kcmFnLmh0bWwKKworICAgICAgICAqIGh0bWwvUmFuZ2VJ bnB1dFR5cGUuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmFuZ2VJbnB1dFR5cGU6OmhhbmRsZU1v dXNlRG93bkV2ZW50KToKKyAgICAgICAgICBBZGRlZCBjaGVjayB0aGF0IHRoZSBlbGVtZW50IGlz IHJlYWRvbmx5IG9yIGRpc2FibGVkLgorICAgICAgICAqIGh0bWwvc2hhZG93L1NsaWRlclRodW1i RWxlbWVudC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpTbGlkZXJUaHVtYkVsZW1lbnQ6OmRlZmF1 bHRFdmVudEhhbmRsZXIpOiBkaXR0by4KKwogMjAxMS0wNy0yNSAgQWwgUGF0cmljayAgPGFwYXRy aWNrQGNocm9taXVtLm9yZz4KIAogICAgICAgICBSZW1vdmVkIHN1cHBvcnQgZm9yIHRoZSBHTF9s YXRjaF9DSFJPTUlVTSBleHRlbnNpb24gd2hpY2ggQ2hyb21pdW0gbm8gbG9uZ2VyIHN1cHBvcnRz LgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaHRtbC9SYW5nZUlucHV0VHlwZS5jcHAgYi9T b3VyY2UvV2ViQ29yZS9odG1sL1JhbmdlSW5wdXRUeXBlLmNwcAppbmRleCAyNmQyOTliMTNkODQ4 NmI3MzkyNzA0YTc2OWZmOWFmOWIwY2Y5ZjgzLi4yOTkwNjk3MDU2NThjZGEwZGRlYjMyMTRlOTEw YzdlYzI1Mzc4NTc4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9odG1sL1JhbmdlSW5wdXRU eXBlLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL1JhbmdlSW5wdXRUeXBlLmNwcApAQCAt MTUzLDYgKzE1Myw5IEBAIGRvdWJsZSBSYW5nZUlucHV0VHlwZTo6c3RlcFNjYWxlRmFjdG9yKCkg Y29uc3QKIAogdm9pZCBSYW5nZUlucHV0VHlwZTo6aGFuZGxlTW91c2VEb3duRXZlbnQoTW91c2VF dmVudCogZXZlbnQpCiB7CisgICAgaWYgKGVsZW1lbnQoKS0+ZGlzYWJsZWQoKSB8fCBlbGVtZW50 KCktPnJlYWRPbmx5KCkpCisgICAgICAgIHJldHVybjsKKwogICAgIE5vZGUqIHRhcmdldE5vZGUg PSBldmVudC0+dGFyZ2V0KCktPnRvTm9kZSgpOwogICAgIGlmIChldmVudC0+YnV0dG9uKCkgIT0g TGVmdEJ1dHRvbiB8fCAhdGFyZ2V0Tm9kZSB8fCAodGFyZ2V0Tm9kZSAhPSBlbGVtZW50KCkgJiYg IXRhcmdldE5vZGUtPmlzRGVzY2VuZGFudE9mKGVsZW1lbnQoKS0+c2hhZG93Um9vdCgpKSkpCiAg ICAgICAgIHJldHVybjsKQEAgLTE2Niw2ICsxNjksNyBAQCB2b2lkIFJhbmdlSW5wdXRUeXBlOjpo YW5kbGVLZXlkb3duRXZlbnQoS2V5Ym9hcmRFdmVudCogZXZlbnQpCiB7CiAgICAgaWYgKGVsZW1l bnQoKS0+ZGlzYWJsZWQoKSB8fCBlbGVtZW50KCktPnJlYWRPbmx5KCkpCiAgICAgICAgIHJldHVy bjsKKwogICAgIGNvbnN0IFN0cmluZyYga2V5ID0gZXZlbnQtPmtleUlkZW50aWZpZXIoKTsKIAog ICAgIGRvdWJsZSBjdXJyZW50ID0gcGFyc2VUb0RvdWJsZShlbGVtZW50KCktPnZhbHVlKCksIG51 bWVyaWNfbGltaXRzPGRvdWJsZT46OnF1aWV0X05hTigpKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL2h0bWwvc2hhZG93L1NsaWRlclRodW1iRWxlbWVudC5jcHAgYi9Tb3VyY2UvV2ViQ29y ZS9odG1sL3NoYWRvdy9TbGlkZXJUaHVtYkVsZW1lbnQuY3BwCmluZGV4IDAzODkxN2UyZGVlMDQ5 MzViODg3MjQwMzZmZjI5N2E5NGQ4YWExMWMuLjNjZDM1MzUzYmQzMDEyMWQ2NTJlMDJmMmUwZTcx N2YyZTdlMGNkZjkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvc2hhZG93L1NsaWRl clRodW1iRWxlbWVudC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvaHRtbC9zaGFkb3cvU2xpZGVy VGh1bWJFbGVtZW50LmNwcApAQCAtMjcwLDYgKzI3MCwxNCBAQCB2b2lkIFNsaWRlclRodW1iRWxl bWVudDo6ZGVmYXVsdEV2ZW50SGFuZGxlcihFdmVudCogZXZlbnQpCiAgICAgICAgIHJldHVybjsK ICAgICB9CiAKKyAgICAvLyBGSVhNRTogU2hvdWxkIGhhbmRsZSB0aGlzIHJlYWRvbmx5L2Rpc2Fi bGVkIGNoZWNrIGluIG1vcmUgZ2VuZXJhbCB3YXkuCisgICAgLy8gTWlzc2luZyB0aGlzIGtpbmQg b2YgY2hlY2sgaXMgbGlrZWx5IHRvIG9jY3VyIGVsc2V3aGVyZSBpZiBhZGRpbmcgaXQgaW4gZWFj aCBzaGFkb3cgZWxlbWVudC4KKyAgICBIVE1MSW5wdXRFbGVtZW50KiBpbnB1dCA9IGhvc3RJbnB1 dCgpOworICAgIGlmICghaW5wdXQgfHwgaW5wdXQtPmlzUmVhZE9ubHlGb3JtQ29udHJvbCgpIHx8 ICFpbnB1dC0+aXNFbmFibGVkRm9ybUNvbnRyb2woKSkgeworICAgICAgICBIVE1MRGl2RWxlbWVu dDo6ZGVmYXVsdEV2ZW50SGFuZGxlcihldmVudCk7CisgICAgICAgIHJldHVybjsKKyAgICB9CisK ICAgICBNb3VzZUV2ZW50KiBtb3VzZUV2ZW50ID0gc3RhdGljX2Nhc3Q8TW91c2VFdmVudCo+KGV2 ZW50KTsKICAgICBib29sIGlzTGVmdEJ1dHRvbiA9IG1vdXNlRXZlbnQtPmJ1dHRvbigpID09IExl ZnRCdXR0b247CiAgICAgY29uc3QgQXRvbWljU3RyaW5nJiBldmVudFR5cGUgPSBldmVudC0+dHlw ZSgpOwpAQCAtMzc0LDQgKzM4MiwzIEBAIGNvbnN0IEF0b21pY1N0cmluZyYgU2xpZGVyQ29udGFp bmVyRWxlbWVudDo6c2hhZG93UHNldWRvSWQoKSBjb25zdAogfQogCiB9Ci0K