64858 2011-07-20 03:34:49 -0700 input[type='number'] with step="any" suffers from step mismatch. 2011-07-21 20:27:47 -0700 1 1 1 Unclassified WebKit Forms 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 0 shinyak webkit-unassigned webkit.review.bot oldest_to_newest 439711 0 shinyak 2011-07-20 03:34:49 -0700 This bug is related to https://bugs.webkit.org/show_bug.cgi?id=57723 For this input: <input min="0" max="100" step="any" value="1.5"> stepping up from renderer makes the value 3.0. I think this should be 2.5. The input with step="any" should not suffer from step mismatch. 439712 1 101446 shinyak 2011-07-20 03:39:23 -0700 Created attachment 101446 Patch 439726 2 101446 tkent 2011-07-20 04:02:59 -0700 Comment on attachment 101446 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=101446&action=review > Source/WebCore/html/HTMLInputElement.cpp:429 > + // If step is not "any", the value should by aligned to the step. > + const AtomicString& stepString = fastGetAttribute(stepAttr); > + if (!equalIgnoringCase(stepString, "any")) { This comment is not helpful. We avoid comments about "what we do here". This comment should be removed. Also, this comment has a typo; by -> be. In this case, you might want to make a function named alignValueForStep(...) for readability. 440799 3 101690 shinyak 2011-07-21 19:38:47 -0700 Created attachment 101690 Patch 440808 4 101690 tkent 2011-07-21 20:04:48 -0700 Comment on attachment 101690 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=101690&action=review ok. > Source/WebCore/html/HTMLInputElement.cpp:428 > + const AtomicString& stepString = fastGetAttribute(stepAttr); > + if (!equalIgnoringCase(stepString, "any")) nit: The variable 'stepString' is not needed. 440817 5 101690 webkit.review.bot 2011-07-21 20:27:43 -0700 Comment on attachment 101690 Patch Clearing flags on attachment: 101690 Committed r91549: <http://trac.webkit.org/changeset/91549> 440818 6 webkit.review.bot 2011-07-21 20:27:47 -0700 All reviewed patches have been landed. Closing bug. 101446 2011-07-20 03:39:23 -0700 2011-07-21 19:38:40 -0700 Patch bug-64858-20110720193921.patch text/plain 8061 shinyak U3VidmVyc2lvbiBSZXZpc2lvbjogOTEzMzMKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5n ZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCBkZjBmZWU0MjIxNzU1NGQzNjhmMzE3 ZTVmNWU4ZDY2ZDU4OTBmOTY4Li5kMjQyNWZhZmM4YTBkNTczNzc2MTk3MDM1OWU4MTlmMjBhYTc1 OTlhIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMv Q2hhbmdlTG9nCkBAIC0xLDMgKzEsMTcgQEAKKzIwMTEtMDctMjAgIFNoaW55YSBLYXdhbmFrYSAg PHNoaW55YWtAZ29vZ2xlLmNvbT4KKworICAgICAgICBUaGUgaW5wdXRbdHlwZT0ibnVtYmVyIl0g d2l0aCBzdGVwPSJhbnkiIHNob3VsZCBub3Qgc3VmZmVyIGZyb20gc3RlcCBtaXNtYXRjaC4KKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTY0ODU4CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQWRkZWQgdGVzdCBj YXNlcyBvZiBpbnB1dFt0eXBlPSJudW1iZXIiXSB3aXRoIHN0ZXA9ImFueSIKKworICAgICAgICAq IGZhc3QvZm9ybXMvaW5wdXQtc3RlcHVwLXN0ZXBkb3duLWV4cGVjdGVkLnR4dDogYWRkZWQgdGhl IHRlc3QgY2FzZXMuCisgICAgICAgICogZmFzdC9mb3Jtcy9pbnB1dC1zdGVwdXAtc3RlcGRvd24t ZnJvbS1yZW5kZXJlci1leHBlY3RlZC50eHQ6IGRpdHRvLgorICAgICAgICAqIGZhc3QvZm9ybXMv c2NyaXB0LXRlc3RzL2lucHV0LXN0ZXB1cC1zdGVwZG93bi1mcm9tLXJlbmRlcmVyLmpzOiBkaXR0 by4KKyAgICAgICAgKiBmYXN0L2Zvcm1zL3NjcmlwdC10ZXN0cy9pbnB1dC1zdGVwdXAtc3RlcGRv d24uanM6IGRpdHRvLgorCiAyMDExLTA3LTE5ICBMZW8gWWFuZyAgPGxlb3lhbmcud2Via2l0QGdt YWlsLmNvbT4KIAogICAgICAgICBTVkc6IE1pc3NpbmcgaW1wbGVtZW50YXRpb24gb2YgPGFsdEds eXBoRGVmPiwgPGFsdEdseXBoSXRlbT4gYW5kIDxnbHlwaFJlZj4KZGlmZiAtLWdpdCBhL0xheW91 dFRlc3RzL2Zhc3QvZm9ybXMvaW5wdXQtc3RlcHVwLXN0ZXBkb3duLWV4cGVjdGVkLnR4dCBiL0xh eW91dFRlc3RzL2Zhc3QvZm9ybXMvaW5wdXQtc3RlcHVwLXN0ZXBkb3duLWV4cGVjdGVkLnR4dApp bmRleCA0MGY3MDQxNTQ4YjY3OGYzMzlhNTMxM2ZmNmUwNTY0NjI3YTM0MDkxLi4yNTE2MmM1NGIy YzI1YmFmNGU0ZTM1MzQxZjYxNmUyMTQ1ZDBhMzMwIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9m YXN0L2Zvcm1zL2lucHV0LXN0ZXB1cC1zdGVwZG93bi1leHBlY3RlZC50eHQKKysrIGIvTGF5b3V0 VGVzdHMvZmFzdC9mb3Jtcy9pbnB1dC1zdGVwdXAtc3RlcGRvd24tZXhwZWN0ZWQudHh0CkBAIC0x MzksNiArMTM5LDkgQEAgUEFTUyBzdGVwVXAoIjIiLCAiLTEiLCBudWxsKSBpcyAiMyIKIFN0ZXA9 YW55CiBQQVNTIHN0ZXBVcCgiMCIsICJhbnkiLCBudWxsKSB0aHJldyBleGNlcHRpb24gRXJyb3I6 IElOVkFMSURfU1RBVEVfRVJSOiBET00gRXhjZXB0aW9uIDExLgogUEFTUyBzdGVwRG93bigiMCIs ICJhbnkiLCBudWxsKSB0aHJldyBleGNlcHRpb24gRXJyb3I6IElOVkFMSURfU1RBVEVfRVJSOiBE T00gRXhjZXB0aW9uIDExLgorU3RlcD1hbnkgY29ybmVyIGNhc2UKK1BBU1Mgc3RlcFVwRXhwbGlj aXRCb3VuZHMoIjAiLCAiMTAwIiwgImFueSIsICIxLjUiLCAiMSIpIHRocmV3IGV4Y2VwdGlvbiBF cnJvcjogSU5WQUxJRF9TVEFURV9FUlI6IERPTSBFeGNlcHRpb24gMTEuCitQQVNTIHN0ZXBEb3du RXhwbGljaXRCb3VuZHMoIjAiLCAiMTAwIiwgImFueSIsICIxLjUiLCAiMSIpIHRocmV3IGV4Y2Vw dGlvbiBFcnJvcjogSU5WQUxJRF9TVEFURV9FUlI6IERPTSBFeGNlcHRpb24gMTEuCiBPdmVyZmxv dy91bmRlcmZsb3cKIFBBU1Mgc3RlcERvd24oIjEiLCAiMSIsICIwIikgaXMgIjAiCiBQQVNTIHN0 ZXBEb3duKCIwIiwgIjEiLCAiMCIpIHRocmV3IGV4Y2VwdGlvbiBFcnJvcjogSU5WQUxJRF9TVEFU RV9FUlI6IERPTSBFeGNlcHRpb24gMTEuCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9mYXN0L2Zv cm1zL2lucHV0LXN0ZXB1cC1zdGVwZG93bi1mcm9tLXJlbmRlcmVyLWV4cGVjdGVkLnR4dCBiL0xh eW91dFRlc3RzL2Zhc3QvZm9ybXMvaW5wdXQtc3RlcHVwLXN0ZXBkb3duLWZyb20tcmVuZGVyZXIt ZXhwZWN0ZWQudHh0CmluZGV4IDRhNWJiNjQwNDJiYjE3ODZkZjJhNzVkMWU2NzRjMzQ1NzFhN2Zh MGQuLjYyOGI2MGY1NTBhNDk2NzVlOWMwNjJmMzYzMDQxYTA2NmQxYzcwOGYgMTAwNjQ0Ci0tLSBh L0xheW91dFRlc3RzL2Zhc3QvZm9ybXMvaW5wdXQtc3RlcHVwLXN0ZXBkb3duLWZyb20tcmVuZGVy ZXItZXhwZWN0ZWQudHh0CisrKyBiL0xheW91dFRlc3RzL2Zhc3QvZm9ybXMvaW5wdXQtc3RlcHVw LXN0ZXBkb3duLWZyb20tcmVuZGVyZXItZXhwZWN0ZWQudHh0CkBAIC0xMTYsNiArMTE2LDkgQEAg UEFTUyBzdGVwVXAoIjIiLCAiLTEiLCBudWxsKSBpcyAiMyIKIFN0ZXA9YW55CiBQQVNTIHN0ZXBV cCgiMCIsICJhbnkiLCBudWxsKSBpcyAiMSIKIFBBU1Mgc3RlcERvd24oIjAiLCAiYW55IiwgbnVs bCkgaXMgIi0xIgorU3RlcD1hbnkgY29ybmVyIGNhc2UKK1BBU1Mgc3RlcFVwRXhwbGljaXRCb3Vu ZHMoIjAiLCAiMTAwIiwgImFueSIsICIxLjUiLCAiMSIpIGlzICIyLjUiCitQQVNTIHN0ZXBEb3du RXhwbGljaXRCb3VuZHMoIjAiLCAiMTAwIiwgImFueSIsICIxLjUiLCAiMSIpIGlzICIwLjUiCiBP dmVyZmxvdy91bmRlcmZsb3cKIFBBU1Mgc3RlcERvd24oIjEiLCAiMSIsICIwIikgaXMgIjAiCiBQ QVNTIHN0ZXBEb3duKCIwIiwgIjEiLCAiMCIpIGlzICIwIgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVz dHMvZmFzdC9mb3Jtcy9zY3JpcHQtdGVzdHMvaW5wdXQtc3RlcHVwLXN0ZXBkb3duLWZyb20tcmVu ZGVyZXIuanMgYi9MYXlvdXRUZXN0cy9mYXN0L2Zvcm1zL3NjcmlwdC10ZXN0cy9pbnB1dC1zdGVw dXAtc3RlcGRvd24tZnJvbS1yZW5kZXJlci5qcwppbmRleCA0OTExMGE1MDQ3ZDJmOTExZTNiMDJi NTI0NzgxM2NlYjhmN2Y1YzU3Li4xYTFkZDU1NWNjYWYxM2Y0ZDgzNGRkMjMxNDBhMWIwMzg5NDU3 MzYzIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9mYXN0L2Zvcm1zL3NjcmlwdC10ZXN0cy9pbnB1 dC1zdGVwdXAtc3RlcGRvd24tZnJvbS1yZW5kZXJlci5qcworKysgYi9MYXlvdXRUZXN0cy9mYXN0 L2Zvcm1zL3NjcmlwdC10ZXN0cy9pbnB1dC1zdGVwdXAtc3RlcGRvd24tZnJvbS1yZW5kZXJlci5q cwpAQCAtMTk5LDYgKzE5OSw5IEBAIHNob3VsZEJlKCdzdGVwVXAoIjIiLCAiLTEiLCBudWxsKScs ICciMyInKTsKIGRlYnVnKCdTdGVwPWFueScpOwogc2hvdWxkQmUoJ3N0ZXBVcCgiMCIsICJhbnki LCBudWxsKScsICciMSInKTsKIHNob3VsZEJlKCdzdGVwRG93bigiMCIsICJhbnkiLCBudWxsKScs ICciLTEiJyk7CitkZWJ1ZygnU3RlcD1hbnkgY29ybmVyIGNhc2UnKTsKK3Nob3VsZEJlKCdzdGVw VXBFeHBsaWNpdEJvdW5kcygiMCIsICIxMDAiLCAiYW55IiwgIjEuNSIsICIxIiknLCAnIjIuNSIn KTsKK3Nob3VsZEJlKCdzdGVwRG93bkV4cGxpY2l0Qm91bmRzKCIwIiwgIjEwMCIsICJhbnkiLCAi MS41IiwgIjEiKScsICciMC41IicpOwogZGVidWcoJ092ZXJmbG93L3VuZGVyZmxvdycpOwogc2hv dWxkQmUoJ3N0ZXBEb3duKCIxIiwgIjEiLCAiMCIpJywgJyIwIicpOwogc2hvdWxkQmUoJ3N0ZXBE b3duKCIwIiwgIjEiLCAiMCIpJywgJyIwIicpOwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZmFz dC9mb3Jtcy9zY3JpcHQtdGVzdHMvaW5wdXQtc3RlcHVwLXN0ZXBkb3duLmpzIGIvTGF5b3V0VGVz dHMvZmFzdC9mb3Jtcy9zY3JpcHQtdGVzdHMvaW5wdXQtc3RlcHVwLXN0ZXBkb3duLmpzCmluZGV4 IGY2MDQzNjUxZjVjM2EwNWIwMzJiOTE0OGY2YmJiOTg1YWFjNjk3ZDkuLjU2NDE0NWE4MDlmZDFm MzVlNjNiZDY0ODU2ZTE3ODY2YjNhZjJlY2IgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2Zhc3Qv Zm9ybXMvc2NyaXB0LXRlc3RzL2lucHV0LXN0ZXB1cC1zdGVwZG93bi5qcworKysgYi9MYXlvdXRU ZXN0cy9mYXN0L2Zvcm1zL3NjcmlwdC10ZXN0cy9pbnB1dC1zdGVwdXAtc3RlcGRvd24uanMKQEAg LTE5NCw2ICsxOTQsOSBAQCBzaG91bGRCZSgnc3RlcFVwKCIyIiwgIi0xIiwgbnVsbCknLCAnIjMi Jyk7CiBkZWJ1ZygnU3RlcD1hbnknKTsKIHNob3VsZFRocm93KCdzdGVwVXAoIjAiLCAiYW55Iiwg bnVsbCknLCBpbnZhbGlkU3RhdGVFcnIpOwogc2hvdWxkVGhyb3coJ3N0ZXBEb3duKCIwIiwgImFu eSIsIG51bGwpJywgaW52YWxpZFN0YXRlRXJyKTsKK2RlYnVnKCdTdGVwPWFueSBjb3JuZXIgY2Fz ZScpOworc2hvdWxkVGhyb3coJ3N0ZXBVcEV4cGxpY2l0Qm91bmRzKCIwIiwgIjEwMCIsICJhbnki LCAiMS41IiwgIjEiKScsIGludmFsaWRTdGF0ZUVycik7CitzaG91bGRUaHJvdygnc3RlcERvd25F eHBsaWNpdEJvdW5kcygiMCIsICIxMDAiLCAiYW55IiwgIjEuNSIsICIxIiknLCBpbnZhbGlkU3Rh dGVFcnIpOwogZGVidWcoJ092ZXJmbG93L3VuZGVyZmxvdycpOwogc2hvdWxkQmUoJ3N0ZXBEb3du KCIxIiwgIjEiLCAiMCIpJywgJyIwIicpOwogc2hvdWxkVGhyb3coJ3N0ZXBEb3duKCIwIiwgIjEi LCAiMCIpJywgaW52YWxpZFN0YXRlRXJyKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCAzYmI1ZmFjODE3OGQ4MTAx ODY1YzVlOGY0YzZiZThmMjgxMjQzMmU1Li5jYzAyMWE5ZjFjMmMxMGZlOTMwMGQ2NTk1NzMxZmQ2 NjhjZDRlYjllIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAKKzIwMTEtMDctMjAgIFNoaW55 YSBLYXdhbmFrYSAgPHNoaW55YWtAZ29vZ2xlLmNvbT4KKworICAgICAgICBUaGUgaW5wdXRbdHlw ZT0ibnVtYmVyIl0gd2l0aCBzdGVwPSJhbnkiIHNob3VsZCBub3Qgc3VmZmVyIGZyb20gc3RlcCBt aXNtYXRjaC4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTY0ODU4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg QWRkZWQgY2hlY2sgc3RlcD0iYW55IiBub3QgdG8gc3VmZmVyIGZyb20gc3RlcCBtaXNtYXRjaC4K KworICAgICAgICAqIGh0bWwvSFRNTElucHV0RWxlbWVudC5jcHA6CisgICAgICAgIChXZWJDb3Jl OjpIVE1MSW5wdXRFbGVtZW50OjphcHBseVN0ZXApOiBBZGRlZCBjaGVjayBzdGVwPSJhbnkiLgor CiAyMDExLTA3LTE5ICBLZW50IFRhbXVyYSAgPHRrZW50QGNocm9taXVtLm9yZz4KIAogICAgICAg ICBSRUdSRVNTSU9OKHI4OTAwNCk6IFZpZGVvIHBhdXNlcyBhbmQgbmV2ZXIgcmVzdW1lcyBwbGF5 aW5nIGlmIHNjcnViYmVkIGR1cmluZyBwbGF5YmFjay4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL2h0bWwvSFRNTElucHV0RWxlbWVudC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxJ bnB1dEVsZW1lbnQuY3BwCmluZGV4IGI2MWEwYzU5NTA4NzA0YzkwYTkxMjczNmQ1MTljNzIwZTMx MzI4OTkuLmNjMDdiOGYzM2EzZmUyMDg5NzVlMWYzMzM2ZmQxMTEwY2FlZmZlYzggMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTElucHV0RWxlbWVudC5jcHAKKysrIGIvU291cmNl L1dlYkNvcmUvaHRtbC9IVE1MSW5wdXRFbGVtZW50LmNwcApAQCAtNDE1LDYgKzQxNSw3IEBAIHZv aWQgSFRNTElucHV0RWxlbWVudDo6YXBwbHlTdGVwKGRvdWJsZSBjb3VudCwgQW55U3RlcEhhbmRs aW5nIGFueVN0ZXBIYW5kbGluZywKICAgICAgICAgZWMgPSBJTlZBTElEX1NUQVRFX0VSUjsKICAg ICAgICAgcmV0dXJuOwogICAgIH0KKwogICAgIGRvdWJsZSBhY2NlcHRhYmxlRXJyb3IgPSBtX2lu cHV0VHlwZS0+YWNjZXB0YWJsZUVycm9yKHN0ZXApOwogICAgIGlmIChuZXdWYWx1ZSAtIG1faW5w dXRUeXBlLT5taW5pbXVtKCkgPCAtYWNjZXB0YWJsZUVycm9yKSB7CiAgICAgICAgIGVjID0gSU5W QUxJRF9TVEFURV9FUlI7CkBAIC00MjIsMjQgKzQyMywzMSBAQCB2b2lkIEhUTUxJbnB1dEVsZW1l bnQ6OmFwcGx5U3RlcChkb3VibGUgY291bnQsIEFueVN0ZXBIYW5kbGluZyBhbnlTdGVwSGFuZGxp bmcsCiAgICAgfQogICAgIGlmIChuZXdWYWx1ZSA8IG1faW5wdXRUeXBlLT5taW5pbXVtKCkpCiAg ICAgICAgIG5ld1ZhbHVlID0gbV9pbnB1dFR5cGUtPm1pbmltdW0oKTsKLSAgICB1bnNpZ25lZCBi YXNlRGVjaW1hbFBsYWNlczsKLSAgICBkb3VibGUgYmFzZSA9IG1faW5wdXRUeXBlLT5zdGVwQmFz ZVdpdGhEZWNpbWFsUGxhY2VzKCZiYXNlRGVjaW1hbFBsYWNlcyk7Ci0gICAgYmFzZURlY2ltYWxQ bGFjZXMgPSBtaW4oYmFzZURlY2ltYWxQbGFjZXMsIDE2dSk7Ci0gICAgaWYgKG5ld1ZhbHVlIDwg cG93KDEwLjAsIDIxLjApKSB7Ci0gICAgICBpZiAoc3RlcE1pc21hdGNoKHZhbHVlKCkpKSB7Ci0g ICAgICAgICAgICBkb3VibGUgc2NhbGUgPSBwb3coMTAuMCwgc3RhdGljX2Nhc3Q8ZG91YmxlPiht YXgoc3RlcERlY2ltYWxQbGFjZXMsIGN1cnJlbnREZWNpbWFsUGxhY2VzKSkpOwotICAgICAgICAg ICAgbmV3VmFsdWUgPSByb3VuZChuZXdWYWx1ZSAqIHNjYWxlKSAvIHNjYWxlOwotICAgICAgICB9 IGVsc2UgewotICAgICAgICAgICAgZG91YmxlIHNjYWxlID0gcG93KDEwLjAsIHN0YXRpY19jYXN0 PGRvdWJsZT4obWF4KHN0ZXBEZWNpbWFsUGxhY2VzLCBiYXNlRGVjaW1hbFBsYWNlcykpKTsKLSAg ICAgICAgICAgIG5ld1ZhbHVlID0gcm91bmQoKGJhc2UgKyByb3VuZCgobmV3VmFsdWUgLSBiYXNl KSAvIHN0ZXApICogc3RlcCkgKiBzY2FsZSkgLyBzY2FsZTsKKworICAgIC8vIElmIHN0ZXAgaXMg bm90ICJhbnkiLCB0aGUgdmFsdWUgc2hvdWxkIGJ5IGFsaWduZWQgdG8gdGhlIHN0ZXAuCisgICAg Y29uc3QgQXRvbWljU3RyaW5nJiBzdGVwU3RyaW5nID0gZmFzdEdldEF0dHJpYnV0ZShzdGVwQXR0 cik7CisgICAgaWYgKCFlcXVhbElnbm9yaW5nQ2FzZShzdGVwU3RyaW5nLCAiYW55IikpIHsKKyAg ICAgICAgdW5zaWduZWQgYmFzZURlY2ltYWxQbGFjZXM7CisgICAgICAgIGRvdWJsZSBiYXNlID0g bV9pbnB1dFR5cGUtPnN0ZXBCYXNlV2l0aERlY2ltYWxQbGFjZXMoJmJhc2VEZWNpbWFsUGxhY2Vz KTsKKyAgICAgICAgYmFzZURlY2ltYWxQbGFjZXMgPSBtaW4oYmFzZURlY2ltYWxQbGFjZXMsIDE2 dSk7CisgICAgICAgIGlmIChuZXdWYWx1ZSA8IHBvdygxMC4wLCAyMS4wKSkgeworICAgICAgICAg ICAgaWYgKHN0ZXBNaXNtYXRjaCh2YWx1ZSgpKSkgeworICAgICAgICAgICAgICAgIGRvdWJsZSBz Y2FsZSA9IHBvdygxMC4wLCBzdGF0aWNfY2FzdDxkb3VibGU+KG1heChzdGVwRGVjaW1hbFBsYWNl cywgY3VycmVudERlY2ltYWxQbGFjZXMpKSk7CisgICAgICAgICAgICAgICAgbmV3VmFsdWUgPSBy b3VuZChuZXdWYWx1ZSAqIHNjYWxlKSAvIHNjYWxlOworICAgICAgICAgICAgfSBlbHNlIHsKKyAg ICAgICAgICAgICAgICBkb3VibGUgc2NhbGUgPSBwb3coMTAuMCwgc3RhdGljX2Nhc3Q8ZG91Ymxl PihtYXgoc3RlcERlY2ltYWxQbGFjZXMsIGJhc2VEZWNpbWFsUGxhY2VzKSkpOworICAgICAgICAg ICAgICAgIG5ld1ZhbHVlID0gcm91bmQoKGJhc2UgKyByb3VuZCgobmV3VmFsdWUgLSBiYXNlKSAv IHN0ZXApICogc3RlcCkgKiBzY2FsZSkgLyBzY2FsZTsKKyAgICAgICAgICAgIH0KICAgICAgICAg fQogICAgIH0KKwogICAgIGlmIChuZXdWYWx1ZSAtIG1faW5wdXRUeXBlLT5tYXhpbXVtKCkgPiBh Y2NlcHRhYmxlRXJyb3IpIHsKICAgICAgICAgZWMgPSBJTlZBTElEX1NUQVRFX0VSUjsKICAgICAg ICAgcmV0dXJuOwogICAgIH0KICAgICBpZiAobmV3VmFsdWUgPiBtX2lucHV0VHlwZS0+bWF4aW11 bSgpKQogICAgICAgICBuZXdWYWx1ZSA9IG1faW5wdXRUeXBlLT5tYXhpbXVtKCk7CisKICAgICBz ZXRWYWx1ZUFzTnVtYmVyKG5ld1ZhbHVlLCBlYyk7CiAKICAgICBpZiAoQVhPYmplY3RDYWNoZTo6 YWNjZXNzaWJpbGl0eUVuYWJsZWQoKSkK 101690 2011-07-21 19:38:47 -0700 2011-07-21 20:27:43 -0700 Patch bug-64858-20110722113846.patch text/plain 9106 shinyak U3VidmVyc2lvbiBSZXZpc2lvbjogOTE1NDIKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5n ZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCAzN2NiMDRiYTRkYzAwMjM5N2ZmYWRk MmU0Yjk5N2ExNTk3NDU1OGJlLi5lYmQyM2Q1ZjcxZmEzNzg2Y2RjMzliODcyNDNiZmI4OGNkODZh OTQ1IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMv Q2hhbmdlTG9nCkBAIC0xLDMgKzEsMTcgQEAKKzIwMTEtMDctMjEgIFNoaW55YSBLYXdhbmFrYSAg PHNoaW55YWtAZ29vZ2xlLmNvbT4KKworICAgICAgICBUaGUgaW5wdXRbdHlwZT0ibnVtYmVyIl0g d2l0aCBzdGVwPSJhbnkiIHNob3VsZCBub3Qgc3VmZmVyIGZyb20gc3RlcCBtaXNtYXRjaC4KKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTY0ODU4CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQWRkZWQgdGVzdCBj YXNlcyBvZiBpbnB1dFt0eXBlPSJudW1iZXIiXSB3aXRoIHN0ZXA9ImFueSIKKworICAgICAgICAq IGZhc3QvZm9ybXMvaW5wdXQtc3RlcHVwLXN0ZXBkb3duLWV4cGVjdGVkLnR4dDogYWRkZWQgdGhl IHRlc3QgY2FzZXMuCisgICAgICAgICogZmFzdC9mb3Jtcy9pbnB1dC1zdGVwdXAtc3RlcGRvd24t ZnJvbS1yZW5kZXJlci1leHBlY3RlZC50eHQ6IGRpdHRvLgorICAgICAgICAqIGZhc3QvZm9ybXMv c2NyaXB0LXRlc3RzL2lucHV0LXN0ZXB1cC1zdGVwZG93bi1mcm9tLXJlbmRlcmVyLmpzOiBkaXR0 by4KKyAgICAgICAgKiBmYXN0L2Zvcm1zL3NjcmlwdC10ZXN0cy9pbnB1dC1zdGVwdXAtc3RlcGRv d24uanM6IGRpdHRvLgorCiAyMDExLTA3LTIxICBLdWxhbnRoYWl2ZWwgUGFsYW5pY2hhbXkgIDxr dWxhbnRoYWl2ZWxAY29kZWF1cm9yYS5vcmc+CiAKICAgICAgICAgVGVzdCB0byBjb3ZlciBhYnNv bHV0ZWx5IHBvc2l0aW9uZWQgY2hpbGQgd2l0aCBwZXJjZW50YWdlIGhlaWdodApkaWZmIC0tZ2l0 IGEvTGF5b3V0VGVzdHMvZmFzdC9mb3Jtcy9pbnB1dC1zdGVwdXAtc3RlcGRvd24tZXhwZWN0ZWQu dHh0IGIvTGF5b3V0VGVzdHMvZmFzdC9mb3Jtcy9pbnB1dC1zdGVwdXAtc3RlcGRvd24tZXhwZWN0 ZWQudHh0CmluZGV4IDQwZjcwNDE1NDhiNjc4ZjMzOWE1MzEzZmY2ZTA1NjQ2MjdhMzQwOTEuLjI1 MTYyYzU0YjJjMjViYWY0ZTRlMzUzNDFmNjE2ZTIxNDVkMGEzMzAgMTAwNjQ0Ci0tLSBhL0xheW91 dFRlc3RzL2Zhc3QvZm9ybXMvaW5wdXQtc3RlcHVwLXN0ZXBkb3duLWV4cGVjdGVkLnR4dAorKysg Yi9MYXlvdXRUZXN0cy9mYXN0L2Zvcm1zL2lucHV0LXN0ZXB1cC1zdGVwZG93bi1leHBlY3RlZC50 eHQKQEAgLTEzOSw2ICsxMzksOSBAQCBQQVNTIHN0ZXBVcCgiMiIsICItMSIsIG51bGwpIGlzICIz IgogU3RlcD1hbnkKIFBBU1Mgc3RlcFVwKCIwIiwgImFueSIsIG51bGwpIHRocmV3IGV4Y2VwdGlv biBFcnJvcjogSU5WQUxJRF9TVEFURV9FUlI6IERPTSBFeGNlcHRpb24gMTEuCiBQQVNTIHN0ZXBE b3duKCIwIiwgImFueSIsIG51bGwpIHRocmV3IGV4Y2VwdGlvbiBFcnJvcjogSU5WQUxJRF9TVEFU RV9FUlI6IERPTSBFeGNlcHRpb24gMTEuCitTdGVwPWFueSBjb3JuZXIgY2FzZQorUEFTUyBzdGVw VXBFeHBsaWNpdEJvdW5kcygiMCIsICIxMDAiLCAiYW55IiwgIjEuNSIsICIxIikgdGhyZXcgZXhj ZXB0aW9uIEVycm9yOiBJTlZBTElEX1NUQVRFX0VSUjogRE9NIEV4Y2VwdGlvbiAxMS4KK1BBU1Mg c3RlcERvd25FeHBsaWNpdEJvdW5kcygiMCIsICIxMDAiLCAiYW55IiwgIjEuNSIsICIxIikgdGhy ZXcgZXhjZXB0aW9uIEVycm9yOiBJTlZBTElEX1NUQVRFX0VSUjogRE9NIEV4Y2VwdGlvbiAxMS4K IE92ZXJmbG93L3VuZGVyZmxvdwogUEFTUyBzdGVwRG93bigiMSIsICIxIiwgIjAiKSBpcyAiMCIK IFBBU1Mgc3RlcERvd24oIjAiLCAiMSIsICIwIikgdGhyZXcgZXhjZXB0aW9uIEVycm9yOiBJTlZB TElEX1NUQVRFX0VSUjogRE9NIEV4Y2VwdGlvbiAxMS4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3Rz L2Zhc3QvZm9ybXMvaW5wdXQtc3RlcHVwLXN0ZXBkb3duLWZyb20tcmVuZGVyZXItZXhwZWN0ZWQu dHh0IGIvTGF5b3V0VGVzdHMvZmFzdC9mb3Jtcy9pbnB1dC1zdGVwdXAtc3RlcGRvd24tZnJvbS1y ZW5kZXJlci1leHBlY3RlZC50eHQKaW5kZXggNGE1YmI2NDA0MmJiMTc4NmRmMmE3NWQxZTY3NGMz NDU3MWE3ZmEwZC4uNjI4YjYwZjU1MGE0OTY3NWU5YzA2MmYzNjMwNDFhMDY2ZDFjNzA4ZiAxMDA2 NDQKLS0tIGEvTGF5b3V0VGVzdHMvZmFzdC9mb3Jtcy9pbnB1dC1zdGVwdXAtc3RlcGRvd24tZnJv bS1yZW5kZXJlci1leHBlY3RlZC50eHQKKysrIGIvTGF5b3V0VGVzdHMvZmFzdC9mb3Jtcy9pbnB1 dC1zdGVwdXAtc3RlcGRvd24tZnJvbS1yZW5kZXJlci1leHBlY3RlZC50eHQKQEAgLTExNiw2ICsx MTYsOSBAQCBQQVNTIHN0ZXBVcCgiMiIsICItMSIsIG51bGwpIGlzICIzIgogU3RlcD1hbnkKIFBB U1Mgc3RlcFVwKCIwIiwgImFueSIsIG51bGwpIGlzICIxIgogUEFTUyBzdGVwRG93bigiMCIsICJh bnkiLCBudWxsKSBpcyAiLTEiCitTdGVwPWFueSBjb3JuZXIgY2FzZQorUEFTUyBzdGVwVXBFeHBs aWNpdEJvdW5kcygiMCIsICIxMDAiLCAiYW55IiwgIjEuNSIsICIxIikgaXMgIjIuNSIKK1BBU1Mg c3RlcERvd25FeHBsaWNpdEJvdW5kcygiMCIsICIxMDAiLCAiYW55IiwgIjEuNSIsICIxIikgaXMg IjAuNSIKIE92ZXJmbG93L3VuZGVyZmxvdwogUEFTUyBzdGVwRG93bigiMSIsICIxIiwgIjAiKSBp cyAiMCIKIFBBU1Mgc3RlcERvd24oIjAiLCAiMSIsICIwIikgaXMgIjAiCmRpZmYgLS1naXQgYS9M YXlvdXRUZXN0cy9mYXN0L2Zvcm1zL3NjcmlwdC10ZXN0cy9pbnB1dC1zdGVwdXAtc3RlcGRvd24t ZnJvbS1yZW5kZXJlci5qcyBiL0xheW91dFRlc3RzL2Zhc3QvZm9ybXMvc2NyaXB0LXRlc3RzL2lu cHV0LXN0ZXB1cC1zdGVwZG93bi1mcm9tLXJlbmRlcmVyLmpzCmluZGV4IDQ5MTEwYTUwNDdkMmY5 MTFlM2IwMmI1MjQ3ODEzY2ViOGY3ZjVjNTcuLjFhMWRkNTU1Y2NhZjEzZjRkODM0ZGQyMzE0MGEx YjAzODk0NTczNjMgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2Zhc3QvZm9ybXMvc2NyaXB0LXRl c3RzL2lucHV0LXN0ZXB1cC1zdGVwZG93bi1mcm9tLXJlbmRlcmVyLmpzCisrKyBiL0xheW91dFRl c3RzL2Zhc3QvZm9ybXMvc2NyaXB0LXRlc3RzL2lucHV0LXN0ZXB1cC1zdGVwZG93bi1mcm9tLXJl bmRlcmVyLmpzCkBAIC0xOTksNiArMTk5LDkgQEAgc2hvdWxkQmUoJ3N0ZXBVcCgiMiIsICItMSIs IG51bGwpJywgJyIzIicpOwogZGVidWcoJ1N0ZXA9YW55Jyk7CiBzaG91bGRCZSgnc3RlcFVwKCIw IiwgImFueSIsIG51bGwpJywgJyIxIicpOwogc2hvdWxkQmUoJ3N0ZXBEb3duKCIwIiwgImFueSIs IG51bGwpJywgJyItMSInKTsKK2RlYnVnKCdTdGVwPWFueSBjb3JuZXIgY2FzZScpOworc2hvdWxk QmUoJ3N0ZXBVcEV4cGxpY2l0Qm91bmRzKCIwIiwgIjEwMCIsICJhbnkiLCAiMS41IiwgIjEiKScs ICciMi41IicpOworc2hvdWxkQmUoJ3N0ZXBEb3duRXhwbGljaXRCb3VuZHMoIjAiLCAiMTAwIiwg ImFueSIsICIxLjUiLCAiMSIpJywgJyIwLjUiJyk7CiBkZWJ1ZygnT3ZlcmZsb3cvdW5kZXJmbG93 Jyk7CiBzaG91bGRCZSgnc3RlcERvd24oIjEiLCAiMSIsICIwIiknLCAnIjAiJyk7CiBzaG91bGRC ZSgnc3RlcERvd24oIjAiLCAiMSIsICIwIiknLCAnIjAiJyk7CmRpZmYgLS1naXQgYS9MYXlvdXRU ZXN0cy9mYXN0L2Zvcm1zL3NjcmlwdC10ZXN0cy9pbnB1dC1zdGVwdXAtc3RlcGRvd24uanMgYi9M YXlvdXRUZXN0cy9mYXN0L2Zvcm1zL3NjcmlwdC10ZXN0cy9pbnB1dC1zdGVwdXAtc3RlcGRvd24u anMKaW5kZXggZjYwNDM2NTFmNWMzYTA1YjAzMmI5MTQ4ZjZiYmI5ODVhYWM2OTdkOS4uNTY0MTQ1 YTgwOWZkMWYzNWU2M2JkNjQ4NTZlMTc4NjZiM2FmMmVjYiAxMDA2NDQKLS0tIGEvTGF5b3V0VGVz dHMvZmFzdC9mb3Jtcy9zY3JpcHQtdGVzdHMvaW5wdXQtc3RlcHVwLXN0ZXBkb3duLmpzCisrKyBi L0xheW91dFRlc3RzL2Zhc3QvZm9ybXMvc2NyaXB0LXRlc3RzL2lucHV0LXN0ZXB1cC1zdGVwZG93 bi5qcwpAQCAtMTk0LDYgKzE5NCw5IEBAIHNob3VsZEJlKCdzdGVwVXAoIjIiLCAiLTEiLCBudWxs KScsICciMyInKTsKIGRlYnVnKCdTdGVwPWFueScpOwogc2hvdWxkVGhyb3coJ3N0ZXBVcCgiMCIs ICJhbnkiLCBudWxsKScsIGludmFsaWRTdGF0ZUVycik7CiBzaG91bGRUaHJvdygnc3RlcERvd24o IjAiLCAiYW55IiwgbnVsbCknLCBpbnZhbGlkU3RhdGVFcnIpOworZGVidWcoJ1N0ZXA9YW55IGNv cm5lciBjYXNlJyk7CitzaG91bGRUaHJvdygnc3RlcFVwRXhwbGljaXRCb3VuZHMoIjAiLCAiMTAw IiwgImFueSIsICIxLjUiLCAiMSIpJywgaW52YWxpZFN0YXRlRXJyKTsKK3Nob3VsZFRocm93KCdz dGVwRG93bkV4cGxpY2l0Qm91bmRzKCIwIiwgIjEwMCIsICJhbnkiLCAiMS41IiwgIjEiKScsIGlu dmFsaWRTdGF0ZUVycik7CiBkZWJ1ZygnT3ZlcmZsb3cvdW5kZXJmbG93Jyk7CiBzaG91bGRCZSgn c3RlcERvd24oIjEiLCAiMSIsICIwIiknLCAnIjAiJyk7CiBzaG91bGRUaHJvdygnc3RlcERvd24o IjAiLCAiMSIsICIwIiknLCBpbnZhbGlkU3RhdGVFcnIpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCmluZGV4IGVlM2FlNDA1 YTIxMDRkZTliNDk3ODc2ODZiYzhjYzljNmRkOWZkNTEuLjBlMzU1ZmMxZWVlZTFhMzQ4ODE4ODlj MWY5YWNmZTFjYzdlNjQwOGIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwor KysgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNiBAQAorMjAxMS0wNy0y MSAgU2hpbnlhIEthd2FuYWthICA8c2hpbnlha0Bnb29nbGUuY29tPgorCisgICAgICAgIFRoZSBp bnB1dFt0eXBlPSJudW1iZXIiXSB3aXRoIHN0ZXA9ImFueSIgc2hvdWxkIG5vdCBzdWZmZXIgZnJv bSBzdGVwIG1pc21hdGNoLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9NjQ4NTgKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICBBZGRlZCBjaGVjayBzdGVwPSJhbnkiIG5vdCB0byBzdWZmZXIgZnJvbSBzdGVwIG1p c21hdGNoLgorCisgICAgICAgICogaHRtbC9IVE1MSW5wdXRFbGVtZW50LmNwcDoKKyAgICAgICAg KFdlYkNvcmU6OkhUTUxJbnB1dEVsZW1lbnQ6OmFwcGx5U3RlcCk6IEFkZGVkIGNoZWNrIHN0ZXA9 ImFueSIuCisgICAgICAgIChXZWJDb3JlOjpIVE1MSW5wdXRFbGVtZW50OjphbGlnblZhbHVlRm9y U3RlcCk6IEFkZGVkLgorCiAyMDExLTA3LTIxICBTaW1vbiBGcmFzZXIgIDxzaW1vbi5mcmFzZXJA YXBwbGUuY29tPgogCiAgICAgICAgIEdyYXBoaWNzTGF5ZXJzIGluIHN1YmZyYW1lcyBjYW4gZ2V0 IHN5bmMnZCBtdWx0aXBsZSB0aW1lcwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaHRtbC9I VE1MSW5wdXRFbGVtZW50LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTElucHV0RWxlbWVu dC5jcHAKaW5kZXggNTA4ZWZlYTI2OGE1ODY0NmQwNjU0ODAxZjMzYTc3OGY3ZTQ4NGU1ZS4uOGQy NTY4Zjg3YTE4YmVkMGI1NTg1NTI3MDdlYzdiMDRjYjg0ODQ2MSAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvaHRtbC9IVE1MSW5wdXRFbGVtZW50LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9o dG1sL0hUTUxJbnB1dEVsZW1lbnQuY3BwCkBAIC00MTUsNiArNDE1LDcgQEAgdm9pZCBIVE1MSW5w dXRFbGVtZW50OjphcHBseVN0ZXAoZG91YmxlIGNvdW50LCBBbnlTdGVwSGFuZGxpbmcgYW55U3Rl cEhhbmRsaW5nLAogICAgICAgICBlYyA9IElOVkFMSURfU1RBVEVfRVJSOwogICAgICAgICByZXR1 cm47CiAgICAgfQorCiAgICAgZG91YmxlIGFjY2VwdGFibGVFcnJvciA9IG1faW5wdXRUeXBlLT5h Y2NlcHRhYmxlRXJyb3Ioc3RlcCk7CiAgICAgaWYgKG5ld1ZhbHVlIC0gbV9pbnB1dFR5cGUtPm1p bmltdW0oKSA8IC1hY2NlcHRhYmxlRXJyb3IpIHsKICAgICAgICAgZWMgPSBJTlZBTElEX1NUQVRF X0VSUjsKQEAgLTQyMiwzMCArNDIzLDQzIEBAIHZvaWQgSFRNTElucHV0RWxlbWVudDo6YXBwbHlT dGVwKGRvdWJsZSBjb3VudCwgQW55U3RlcEhhbmRsaW5nIGFueVN0ZXBIYW5kbGluZywKICAgICB9 CiAgICAgaWYgKG5ld1ZhbHVlIDwgbV9pbnB1dFR5cGUtPm1pbmltdW0oKSkKICAgICAgICAgbmV3 VmFsdWUgPSBtX2lucHV0VHlwZS0+bWluaW11bSgpOwotICAgIHVuc2lnbmVkIGJhc2VEZWNpbWFs UGxhY2VzOwotICAgIGRvdWJsZSBiYXNlID0gbV9pbnB1dFR5cGUtPnN0ZXBCYXNlV2l0aERlY2lt YWxQbGFjZXMoJmJhc2VEZWNpbWFsUGxhY2VzKTsKLSAgICBiYXNlRGVjaW1hbFBsYWNlcyA9IG1p bihiYXNlRGVjaW1hbFBsYWNlcywgMTZ1KTsKLSAgICBpZiAobmV3VmFsdWUgPCBwb3coMTAuMCwg MjEuMCkpIHsKLSAgICAgIGlmIChzdGVwTWlzbWF0Y2godmFsdWUoKSkpIHsKLSAgICAgICAgICAg IGRvdWJsZSBzY2FsZSA9IHBvdygxMC4wLCBzdGF0aWNfY2FzdDxkb3VibGU+KG1heChzdGVwRGVj aW1hbFBsYWNlcywgY3VycmVudERlY2ltYWxQbGFjZXMpKSk7Ci0gICAgICAgICAgICBuZXdWYWx1 ZSA9IHJvdW5kKG5ld1ZhbHVlICogc2NhbGUpIC8gc2NhbGU7Ci0gICAgICAgIH0gZWxzZSB7Ci0g ICAgICAgICAgICBkb3VibGUgc2NhbGUgPSBwb3coMTAuMCwgc3RhdGljX2Nhc3Q8ZG91YmxlPiht YXgoc3RlcERlY2ltYWxQbGFjZXMsIGJhc2VEZWNpbWFsUGxhY2VzKSkpOwotICAgICAgICAgICAg bmV3VmFsdWUgPSByb3VuZCgoYmFzZSArIHJvdW5kKChuZXdWYWx1ZSAtIGJhc2UpIC8gc3RlcCkg KiBzdGVwKSAqIHNjYWxlKSAvIHNjYWxlOwotICAgICAgICB9Ci0gICAgfQorCisgICAgY29uc3Qg QXRvbWljU3RyaW5nJiBzdGVwU3RyaW5nID0gZmFzdEdldEF0dHJpYnV0ZShzdGVwQXR0cik7Cisg ICAgaWYgKCFlcXVhbElnbm9yaW5nQ2FzZShzdGVwU3RyaW5nLCAiYW55IikpCisgICAgICAgIG5l d1ZhbHVlID0gYWxpZ25WYWx1ZUZvclN0ZXAobmV3VmFsdWUsIHN0ZXAsIGN1cnJlbnREZWNpbWFs UGxhY2VzLCBzdGVwRGVjaW1hbFBsYWNlcyk7CisKICAgICBpZiAobmV3VmFsdWUgLSBtX2lucHV0 VHlwZS0+bWF4aW11bSgpID4gYWNjZXB0YWJsZUVycm9yKSB7CiAgICAgICAgIGVjID0gSU5WQUxJ RF9TVEFURV9FUlI7CiAgICAgICAgIHJldHVybjsKICAgICB9CiAgICAgaWYgKG5ld1ZhbHVlID4g bV9pbnB1dFR5cGUtPm1heGltdW0oKSkKICAgICAgICAgbmV3VmFsdWUgPSBtX2lucHV0VHlwZS0+ bWF4aW11bSgpOworCiAgICAgc2V0VmFsdWVBc051bWJlcihuZXdWYWx1ZSwgZWMpOwogCiAgICAg aWYgKEFYT2JqZWN0Q2FjaGU6OmFjY2Vzc2liaWxpdHlFbmFibGVkKCkpCiAgICAgICAgICBkb2N1 bWVudCgpLT5heE9iamVjdENhY2hlKCktPnBvc3ROb3RpZmljYXRpb24ocmVuZGVyZXIoKSwgQVhP YmplY3RDYWNoZTo6QVhWYWx1ZUNoYW5nZWQsIHRydWUpOwogfQogCitkb3VibGUgSFRNTElucHV0 RWxlbWVudDo6YWxpZ25WYWx1ZUZvclN0ZXAoZG91YmxlIG5ld1ZhbHVlLCBkb3VibGUgc3RlcCwg dW5zaWduZWQgY3VycmVudERlY2ltYWxQbGFjZXMsIHVuc2lnbmVkIHN0ZXBEZWNpbWFsUGxhY2Vz KQoreworICAgIGlmIChuZXdWYWx1ZSA+PSBwb3coMTAuMCwgMjEuMCkpCisgICAgICAgIHJldHVy biBuZXdWYWx1ZTsKKworICAgIHVuc2lnbmVkIGJhc2VEZWNpbWFsUGxhY2VzOworICAgIGRvdWJs ZSBiYXNlID0gbV9pbnB1dFR5cGUtPnN0ZXBCYXNlV2l0aERlY2ltYWxQbGFjZXMoJmJhc2VEZWNp bWFsUGxhY2VzKTsKKyAgICBiYXNlRGVjaW1hbFBsYWNlcyA9IG1pbihiYXNlRGVjaW1hbFBsYWNl cywgMTZ1KTsKKyAgICBpZiAoc3RlcE1pc21hdGNoKHZhbHVlKCkpKSB7CisgICAgICAgIGRvdWJs ZSBzY2FsZSA9IHBvdygxMC4wLCBzdGF0aWNfY2FzdDxkb3VibGU+KG1heChzdGVwRGVjaW1hbFBs YWNlcywgY3VycmVudERlY2ltYWxQbGFjZXMpKSk7CisgICAgICAgIG5ld1ZhbHVlID0gcm91bmQo bmV3VmFsdWUgKiBzY2FsZSkgLyBzY2FsZTsKKyAgICB9IGVsc2UgeworICAgICAgICBkb3VibGUg c2NhbGUgPSBwb3coMTAuMCwgc3RhdGljX2Nhc3Q8ZG91YmxlPihtYXgoc3RlcERlY2ltYWxQbGFj ZXMsIGJhc2VEZWNpbWFsUGxhY2VzKSkpOworICAgICAgICBuZXdWYWx1ZSA9IHJvdW5kKChiYXNl ICsgcm91bmQoKG5ld1ZhbHVlIC0gYmFzZSkgLyBzdGVwKSAqIHN0ZXApICogc2NhbGUpIC8gc2Nh bGU7CisgICAgfQorCisgICAgcmV0dXJuIG5ld1ZhbHVlOworfQorCiB2b2lkIEhUTUxJbnB1dEVs ZW1lbnQ6OnN0ZXBVcChpbnQgbiwgRXhjZXB0aW9uQ29kZSYgZWMpCiB7CiAgICAgYXBwbHlTdGVw KG4sIFJlamVjdEFueSwgZWMpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1M SW5wdXRFbGVtZW50LmggYi9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxJbnB1dEVsZW1lbnQuaApp bmRleCAwNzEzN2JlNTAwZGEzNDQ5OThmZTUzMTVhNjNmMjk2MjQ2MWU0MGMyLi45MmZhOWY1ODU3 YTczYTkxMTUwYTU1ODg4ZTg0NTkyZDM0MzFmY2VlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9odG1sL0hUTUxJbnB1dEVsZW1lbnQuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxJ bnB1dEVsZW1lbnQuaApAQCAtMzIxLDYgKzMyMSw3IEBAIHByaXZhdGU6CiAKICAgICAvLyBIZWxw ZXIgZm9yIHN0ZXBVcCgpL3N0ZXBEb3duKCkuICBBZGRzIHN0ZXAgdmFsdWUgKiBjb3VudCB0byB0 aGUgY3VycmVudCB2YWx1ZS4KICAgICB2b2lkIGFwcGx5U3RlcChkb3VibGUgY291bnQsIEFueVN0 ZXBIYW5kbGluZywgRXhjZXB0aW9uQ29kZSYpOworICAgIGRvdWJsZSBhbGlnblZhbHVlRm9yU3Rl cChkb3VibGUgdmFsdWUsIGRvdWJsZSBzdGVwLCB1bnNpZ25lZCBjdXJyZW50RGVjaW1hbFBsYWNl cywgdW5zaWduZWQgc3RlcERlY2ltYWxQbGFjZXMpOwogCiAjaWYgRU5BQkxFKERBVEFMSVNUKQog ICAgIEhUTUxEYXRhTGlzdEVsZW1lbnQqIGRhdGFMaXN0KCkgY29uc3Q7Cg==