62939 2011-06-18 14:41:32 -0700 Issues of reformatting the text of a "number" field 2012-08-07 21:43:35 -0700 1 1 1 Unclassified WebKit Forms 528+ (Nightly build) All All RESOLVED FIXED http://stackoverflow.com/questions/5345095/chrome-auto-formats-input-number InRadar P2 Normal --- 65064 76613 78208 78326 93236 0 patorjk webkit-unassigned ap arcain joepeck jonlee shinyak shinyak tkent webkit-bug-importer oldest_to_newest 423263 0 patorjk 2011-06-18 14:41:32 -0700 A comma is being inserted into the text of a "number" field. According to the HTML5 standard (http://www.whatwg.org/specs/web-apps/current-work/multipage/number-state.html#number-state): "The algorithm to convert a number to a string, given a number input, is as follows: Return a valid floating point number that represents input." A user named "arcain" at Stack Overflow claims to have pinpointed the problem in Webkit and has a solution (see the top answer): http://stackoverflow.com/questions/5345095/chrome-auto-formats-input-number I was unable to find a bug report on the issue or contact information for arcain, and since I've been having the same problem I figured I'd write a bug report and point to his solution/analysis. I also want to add that I can see the benefit of the formatting in some cases (so maybe it should be configurable), but developers should be able to turn it off. Since there is no "year" field in HTML5, it seems logical to use number instead, but with the comma, developers are unable to do that and there is no way for them (at least from what I know) to use a year field that is just a spinbox with a number in it. Side note, the bug is also reported in Chrome here: http://code.google.com/p/chromium/issues/detail?id=78520 424338 1 tkent 2011-06-21 00:58:23 -0700 The purpose of introducing LocalizedNumber was to support localized decimal separators. Supporting group separators in parsing is also helpful for users, and it is harmless. Supporting group separators in formatting and auto-reformatting are harmfull in some cases. So, a short term solution woud be: * Don't reformat the user-input value if it is a valid number, and * Don't use group separators in formatting in order to avoid formatting of the initial value. I think a long term solution would be: Introducing a CSS property to control number formatting. e.g. -webkit-number-format: [ "none" | "auto" | format-string] "none" accepts only HTML5 format. "auto" is the current locale-dependent behavior. format-string is like "#,##0.###" Comments? 425039 2 arcain 2011-06-21 22:59:51 -0700 This is arcain from SO; thanks for submitting this bug report. I had been in the process of trying to reproduce the issue on Windows and Ubuntu with the lastest Webkit sources, but neither platform exhibited the issue, plus it took forever to build out test environments. When I looked closer, the LocalizedNumber* sources didn't even seem to be included in the build -- they were, however included in chromium. So, I was a bit confused over whether the issue was really webkit, or if it was chromium. (In reply to comment #0) > A comma is being inserted into the text of a "number" field. According to the HTML5 standard (http://www.whatwg.org/specs/web-apps/current-work/multipage/number-state.html#number-state): > > "The algorithm to convert a number to a string, given a number input, is as follows: Return a valid floating point number that represents input." > > A user named "arcain" at Stack Overflow claims to have pinpointed the problem in Webkit and has a solution (see the top answer): > > http://stackoverflow.com/questions/5345095/chrome-auto-formats-input-number > > I was unable to find a bug report on the issue or contact information for arcain, and since I've been having the same problem I figured I'd write a bug report and point to his solution/analysis. > > I also want to add that I can see the benefit of the formatting in some cases (so maybe it should be configurable), but developers should be able to turn it off. Since there is no "year" field in HTML5, it seems logical to use number instead, but with the comma, developers are unable to do that and there is no way for them (at least from what I know) to use a year field that is just a spinbox with a number in it. > > Side note, the bug is also reported in Chrome here: http://code.google.com/p/chromium/issues/detail?id=78520 425044 3 arcain 2011-06-21 23:16:58 -0700 I agree with the approach to mitigate the current formatting issue with a quick fix, and then come back with a more comprehensive, configurable solution. I am creating a patch for part of the short-term solution: addressing the inclusion of grouping characters. I'll attach it here for review when I have finished. (In reply to comment #1) > The purpose of introducing LocalizedNumber was to support localized decimal separators. Supporting group separators in parsing is also helpful for users, and it is harmless. Supporting group separators in formatting and auto-reformatting are harmfull in some cases. > > So, a short term solution woud be: > * Don't reformat the user-input value if it is a valid number, and > * Don't use group separators in formatting in order to avoid formatting of the initial value. > > I think a long term solution would be: > Introducing a CSS property to control number formatting. > e.g. -webkit-number-format: [ "none" | "auto" | format-string] > "none" accepts only HTML5 format. > "auto" is the current locale-dependent behavior. > format-string is like "#,##0.###" > > Comments? 439670 4 101434 shinyak 2011-07-20 00:54:02 -0700 Created attachment 101434 Patch 439673 5 tkent 2011-07-20 01:03:45 -0700 (In reply to comment #4) > Created an attachment (id=101434) [details] > Patch The patch resolves only the second bullet in Comment #1, right? Will you adress the first bullet? 439675 6 tkent 2011-07-20 01:05:14 -0700 (In reply to comment #4) > Created an attachment (id=101434) [details] > Patch I think the patch will break fast/speech/input-appearance-numberandspeech.html. You should add it to platform/chromium/test_expectations.txt. 441378 7 shinyak 2011-07-23 06:51:34 -0700 kent, Sorry for late response. Yes, that patch addresses only the second bullet in Comment #1. The first bullet will take more time if I fix it. So I've added a new bug https://bugs.webkit.org/show_bug.cgi?id=65064 which only addresses the second bullet in Comment #1. (In reply to comment #5) > (In reply to comment #4) > > Created an attachment (id=101434) [details] [details] > > Patch > > The patch resolves only the second bullet in Comment #1, right? > Will you adress the first bullet? 441575 8 tkent 2011-07-25 00:27:06 -0700 Group separators aren't inserted by the patch in Bug 65064. We still have reformatting issues. For example, If a user specifies a value "012345678901234567890123456789" and changes the focus, the field value is reformatted to "12345678901234600000000000000" 462779 9 jonlee 2011-09-06 13:07:55 -0700 <rdar://problem/9730100> 575958 10 tkent 2012-03-11 23:08:20 -0700 This bug was fixed for platforms using LocalizedNumberICU such as Chromium. We still have the problem with platforms using LocalizedNumberMac (OS X and iOS). 689856 11 tkent 2012-08-07 21:43:35 -0700 (In reply to comment #10) > This bug was fixed for platforms using LocalizedNumberICU such as Chromium. We still have the problem with platforms using LocalizedNumberMac (OS X and iOS). This was fixed in Bug 93236. Closing the bug. 101434 2011-07-20 00:54:02 -0700 2011-07-25 00:19:47 -0700 Patch bug-62939-20110720165400.patch text/plain 7493 shinyak U3VidmVyc2lvbiBSZXZpc2lvbjogOTEzMzMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCAzYmI1ZmFjODE3OGQ4MTAx ODY1YzVlOGY0YzZiZThmMjgxMjQzMmU1Li44ZTNjYTNmMzI5ODljMTJiZGVhMDU3YmMyOTI4YjJm YmYyZGNhY2ZlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzMgQEAKKzIwMTEtMDctMjAgIFNoaW55 YSBLYXdhbmFrYSAgPHNoaW55YWtAZ29vZ2xlLmNvbT4KKworICAgICAgICBEaXNwbGF5IG51bWJl ciBmaWVsZCB3aXRob3V0IHVzaW5nIGEgdGhvdXNhbmQgc2VwYXJhdG9yLgorICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NjI5MzkKKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBTZXBhcmF0ZWQgZm9ybWF0dGVycyBm b3IgcGFyc2luZyBhbmQgZGlzcGxheWluZy4KKyAgICAgICAgUmVtb3ZlZCBhIHRlc3QgZm9yIHRo b3VzYW5kIHNlcGFyYXRvci4KKworICAgICAgICAqIG1hbnVhbC10ZXN0cy9pbnB1dC1udW1iZXIt bG9jYWxpemF0aW9uLmh0bWw6CisgICAgICAgIFJlbW92ZWQgYSB0ZXN0IGZvciB0aG91c2FuZCBz ZXBhcmF0b3IuCisgICAgICAgIE1hZGUgdGhlIHRlc3QgZGVzY3JpcHRpb24gbW9yZSBzcGVjaWZp Yy4KKyAgICAgICAgKiBwbGF0Zm9ybS90ZXh0L0xvY2FsaXplZE51bWJlcklDVS5jcHA6CisgICAg ICAgIChXZWJDb3JlOjpjcmVhdGVGb3JtYXR0ZXJGb3JDdXJyZW50TG9jYWxlVG9EaXNwbGF5KToK KyAgICAgICAgQWRkZWQgdG8gaW50cm9kdWNlIGEgZm9ybWF0dGVyIGZvciBkaXNwbGF5LgorICAg ICAgICAoV2ViQ29yZTo6bnVtYmVyRm9ybWF0dGVyRm9yUGFyc2luZyk6CisgICAgICAgIENoYW5n ZWQgdGhlIG5hbWUgdG8gYmUgY2xlYXIuCisgICAgICAgIChXZWJDb3JlOjpudW1iZXJGb3JtYXR0 ZXJGb3JEaXNwbGF5KTogQWRkZWQuCisgICAgICAgIChXZWJDb3JlOjpwYXJzZUxvY2FsaXplZE51 bWJlcik6IFVzZWQgbnVtYmVyRm9ybWF0dGVyRm9yUGFyc2luZy4KKyAgICAgICAgKFdlYkNvcmU6 OmZvcm1hdExvY2FsaXplZE51bWJlcik6IFVzZWQgbnVtYmVyRm9ybWF0dGVyRm9yRGlzcGxheS4K KyAgICAgICAgKiBwbGF0Zm9ybS90ZXh0L21hYy9Mb2NhbGl6ZWROdW1iZXJNYWMubW06CisgICAg ICAgIChXZWJDb3JlOjpjcmVhdGVGb3JtYXR0ZXJGb3JDdXJyZW50TG9jYWxlRm9yRGlzcGxheSk6 CisgICAgICAgIEFkZGVkIHRvIGludHJvZHVjZSBhIGZvcm1hdHRlciBmb3IgZGlzcGxheS4KKyAg ICAgICAgKFdlYkNvcmU6Om51bWJlckZvcm1hdHRlckZvclBhcnNpbmcpOgorICAgICAgICBDaGFu Z2VkIHRoZSBuYW1lIHRvIGJlIGNsZWFyLgorICAgICAgICAoV2ViQ29yZTo6bnVtYmVyRm9ybWF0 dGVyRm9yRGlzcGxheSk6IEFkZGVkLgorICAgICAgICAoV2ViQ29yZTo6cGFyc2VMb2NhbGl6ZWRO dW1iZXIpOiBVc2VkIG51bWJlckZvcm1hdHRlckZvclBhcnNpbmcuCisgICAgICAgIChXZWJDb3Jl Ojpmb3JtYXRMb2NhbGl6ZWROdW1iZXIpOiBVc2VkIG51bWJlckZvcm1hdHRlckZvckRpc3BsYXku CisKIDIwMTEtMDctMTkgIEtlbnQgVGFtdXJhICA8dGtlbnRAY2hyb21pdW0ub3JnPgogCiAgICAg ICAgIFJFR1JFU1NJT04ocjg5MDA0KTogVmlkZW8gcGF1c2VzIGFuZCBuZXZlciByZXN1bWVzIHBs YXlpbmcgaWYgc2NydWJiZWQgZHVyaW5nIHBsYXliYWNrLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvbWFudWFsLXRlc3RzL2lucHV0LW51bWJlci1sb2NhbGl6YXRpb24uaHRtbCBiL1NvdXJj ZS9XZWJDb3JlL21hbnVhbC10ZXN0cy9pbnB1dC1udW1iZXItbG9jYWxpemF0aW9uLmh0bWwKaW5k ZXggYzU2MDg5NGRkYjA1YzEzYjY1NTkyMzA3ZTkzMzdmZDE5YmY0NTU1Mi4uMzJkMzFiYjFmNDFl OTRiMTBlNGZjMzA3YTM0NDVmMjcyMDU3NTdjMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv bWFudWFsLXRlc3RzL2lucHV0LW51bWJlci1sb2NhbGl6YXRpb24uaHRtbAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9tYW51YWwtdGVzdHMvaW5wdXQtbnVtYmVyLWxvY2FsaXphdGlvbi5odG1sCkBAIC0x MywxOSArMTMsMTYgQEAKIDxkaXYgaWQ9ImNvbnNvbGUiPjwvZGl2PgogCiA8cD5PdXRwdXQgdGVz dDogVGhlIGZvbGxvd2luZyB0ZXh0IGZpZWxkIHNob3VsZCBoYXZlIGEgbG9jYWxpemVkIHJlcHJl c2VudGF0aW9uIGZvciAiLTEyMzQuNTY3OCIuCi1lLmcuICItMSwyMzQuNTY3OCIgZm9yIGVuX1VT IGxvY2FsZSwgIi0xLjIzNCw1Njc4IiBmb3IgZnJfRlIgbG9jYWxlLjwvcD4KK2UuZy4gIi0xMjM0 LjU2NzgiIGZvciBlbl9VUyBsb2NhbGUsICItMTIzNCw1Njc4IiBmb3IgZnJfRlIgbG9jYWxlLiBU aGUgdGhvdXNhbmQgc2VwYXJhdG9yIGlzCitjdXJyZW50bHkgb2ZmLjwvcD4KIDxkaXY+PGlucHV0 IHR5cGU9bnVtYmVyIHZhbHVlPSItMTIzNC41Njc4IiBzdGVwPWFueT48L2Rpdj4KIAotPHA+SW5w dXQgdGVzdDogVHlwZSBhIGxvY2FsaXplZCByZXByZXNlbnRhdGlvbiBvZiBhIG51bWJlciBpbnRv IHRoZSBmb2xsb3dpbmcgdGV4dCBmaWVsZC4KKzxwPklucHV0IHRlc3Q6IFR5cGUgYSBsb2NhbGl6 ZWQgcmVwcmVzZW50YXRpb24gb2YgYSBudW1iZXIgKGUuZy4gLTEsMjM0LjU2NzggZm9yIGVuX1VT IGxvY2FsZSwKKy0xLjIzNCw1Njc4IGZvciBmcl9GUiBsb2NhbGUpIGludG8gdGhlIGZvbGxvd2lu ZyB0ZXh0IGZpZWxkLgogWW91J2xsIHNlZSBhbiBlcXVpdmFsZW50IG51bWJlciBpbiB0aGUgc3Rh bmRhcmQgZm9ybWF0IG9uIHRoZSBib3R0b20gb2YgdGhlIHRleHQgZmllbGQuPC9wPgogPGRpdj48 aW5wdXQgdHlwZT1udW1iZXIgaWQ9dGFyZ2V0IHN0ZXA9YW55IG9uaW5wdXQ9ImhhbmRsZUlucHV0 KCkiPjwvZGl2PgogPGRpdj5TdGFuZGFyZCBmb3JtYXQ6IDxvdXRwdXQgaWQ9b3V0cHV0Pjwvb3V0 cHV0PjwvZGl2PgogCi08cD5JbnB1dCB0ZXN0OiBUeXBlIHRoZSBudW1iZXIgdGV4dCAiMTIzNCIg aW50byB0aGUgdGhlIGZvbGxvd2luIG51bWJlciBmaWVsZC4KLVRoZSBudW1iZXIgc3RyaW5nIHdp bGwgYmUgIjEsMjM0IiBhbmQgdGhlIGN1cnNvciBwb3NpdGlvbiBtdXN0IGJlIHRoZSBsYXN0IHBv c2l0aW9uLgotPC9wPgotPGRpdj48aW5wdXQgdHlwZT0ibnVtYmVyIiBvbmtleXVwPSJ0aGlzLnZh bHVlPXRoaXMudmFsdWUiIC8+PC9kaXY+Ci0KIDxzY3JpcHQ+CiBmdW5jdGlvbiBoYW5kbGVJbnB1 dCgpIHsKICAgZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoJ291dHB1dCcpLnZhbHVlID0gZG9jdW1l bnQuZ2V0RWxlbWVudEJ5SWQoJ3RhcmdldCcpLnZhbHVlOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vdGV4dC9Mb2NhbGl6ZWROdW1iZXJJQ1UuY3BwIGIvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vdGV4dC9Mb2NhbGl6ZWROdW1iZXJJQ1UuY3BwCmluZGV4IGQzODQzYThhYTE0 MjY1YTNkZjhiZWFkNjkxN2I5NWFiOWFhOGE2YTMuLjU3ZWIyZjVjZGUwOTBkMmJjNDQ3NWMxNjMx YzI1Y2JiYmE1N2U2ZTUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL3RleHQv TG9jYWxpemVkTnVtYmVySUNVLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS90ZXh0 L0xvY2FsaXplZE51bWJlcklDVS5jcHAKQEAgLTQ5LDE5ICs0OSwzNyBAQCBzdGF0aWMgUGFzc093 blB0cjxOdW1iZXJGb3JtYXQ+IGNyZWF0ZUZvcm1hdHRlckZvckN1cnJlbnRMb2NhbGUoKQogICAg IHJldHVybiBVX1NVQ0NFU1Moc3RhdHVzKSA/IGZvcm1hdHRlci5yZWxlYXNlKCkgOiBudWxscHRy OwogfQogCitzdGF0aWMgUGFzc093blB0cjxOdW1iZXJGb3JtYXQ+IGNyZWF0ZUZvcm1hdHRlckZv ckN1cnJlbnRMb2NhbGVUb0Rpc3BsYXkoKQoreworICAgIE93blB0cjxOdW1iZXJGb3JtYXQ+IGZv cm1hdHRlcihjcmVhdGVGb3JtYXR0ZXJGb3JDdXJyZW50TG9jYWxlKCkpOworICAgIGlmICghZm9y bWF0dGVyKQorICAgICAgICByZXR1cm4gbnVsbHB0cjsKKworICAgIGZvcm1hdHRlci0+c2V0R3Jv dXBpbmdVc2VkKEZBTFNFKTsKKyAgICByZXR1cm4gZm9ybWF0dGVyLnJlbGVhc2UoKTsKK30KKwog Ly8gVGhpcyBtaWdodCByZXR1cm4gMC4KLXN0YXRpYyBOdW1iZXJGb3JtYXQqIG51bWJlckZvcm1h dHRlcigpCitzdGF0aWMgTnVtYmVyRm9ybWF0KiBudW1iZXJGb3JtYXR0ZXJGb3JQYXJzaW5nKCkK IHsKICAgICBBU1NFUlQoaXNNYWluVGhyZWFkKCkpOwogICAgIHN0YXRpYyBOdW1iZXJGb3JtYXQq IGZvcm1hdHRlciA9IGNyZWF0ZUZvcm1hdHRlckZvckN1cnJlbnRMb2NhbGUoKS5sZWFrUHRyKCk7 CiAgICAgcmV0dXJuIGZvcm1hdHRlcjsKIH0KIAorLy8gVGhpcyBtaWdodCByZXR1cm4gMC4KK3N0 YXRpYyBOdW1iZXJGb3JtYXQqIG51bWJlckZvcm1hdHRlckZvckRpc3BsYXkoKQoreworICAgIEFT U0VSVChpc01haW5UaHJlYWQoKSk7CisgICAgc3RhdGljIE51bWJlckZvcm1hdCogZm9ybWF0dGVy ID0gY3JlYXRlRm9ybWF0dGVyRm9yQ3VycmVudExvY2FsZVRvRGlzcGxheSgpLmxlYWtQdHIoKTsK KyAgICByZXR1cm4gZm9ybWF0dGVyOworfQorCiBkb3VibGUgcGFyc2VMb2NhbGl6ZWROdW1iZXIo Y29uc3QgU3RyaW5nJiBudW1iZXJTdHJpbmcpCiB7CiAgICAgaWYgKG51bWJlclN0cmluZy5pc0Vt cHR5KCkpCiAgICAgICAgIHJldHVybiBudW1lcmljX2xpbWl0czxkb3VibGU+OjpxdWlldF9OYU4o KTsKLSAgICBOdW1iZXJGb3JtYXQqIGZvcm1hdHRlciA9IG51bWJlckZvcm1hdHRlcigpOworICAg IE51bWJlckZvcm1hdCogZm9ybWF0dGVyID0gbnVtYmVyRm9ybWF0dGVyRm9yUGFyc2luZygpOwog ICAgIGlmICghZm9ybWF0dGVyKQogICAgICAgICByZXR1cm4gbnVtZXJpY19saW1pdHM8ZG91Ymxl Pjo6cXVpZXRfTmFOKCk7CiAgICAgVW5pY29kZVN0cmluZyBudW1iZXJVbmljb2RlU3RyaW5nKG51 bWJlclN0cmluZy5jaGFyYWN0ZXJzKCksIG51bWJlclN0cmluZy5sZW5ndGgoKSk7CkBAIC03Nyw3 ICs5NSw3IEBAIGRvdWJsZSBwYXJzZUxvY2FsaXplZE51bWJlcihjb25zdCBTdHJpbmcmIG51bWJl clN0cmluZykKIAogU3RyaW5nIGZvcm1hdExvY2FsaXplZE51bWJlcihkb3VibGUgbnVtYmVyLCB1 bnNpZ25lZCBmcmFjdGlvbkRpZ2l0cykKIHsKLSAgICBOdW1iZXJGb3JtYXQqIGZvcm1hdHRlciA9 IG51bWJlckZvcm1hdHRlcigpOworICAgIE51bWJlckZvcm1hdCogZm9ybWF0dGVyID0gbnVtYmVy Rm9ybWF0dGVyRm9yRGlzcGxheSgpOwogICAgIGlmICghZm9ybWF0dGVyKQogICAgICAgICByZXR1 cm4gU3RyaW5nKCk7CiAgICAgVW5pY29kZVN0cmluZyByZXN1bHQ7CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS90ZXh0L21hYy9Mb2NhbGl6ZWROdW1iZXJNYWMubW0gYi9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS90ZXh0L21hYy9Mb2NhbGl6ZWROdW1iZXJNYWMubW0KaW5kZXgg ODI2ZjcwNzc2ZWJhODIyNWEyMzE5Mjk4NjRlMzIxMDU5YzM4NTM0OS4uZjc5NWM4ZjI2NWE0MDVl MDY5MmJjNTE2YzEzZjM5ODllODBmNTc5NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vdGV4dC9tYWMvTG9jYWxpemVkTnVtYmVyTWFjLm1tCisrKyBiL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL3RleHQvbWFjL0xvY2FsaXplZE51bWJlck1hYy5tbQpAQCAtNDgsMTggKzQ4LDMy IEBAIHN0YXRpYyBSZXRhaW5QdHI8TlNOdW1iZXJGb3JtYXR0ZXI+IGNyZWF0ZUZvcm1hdHRlckZv ckN1cnJlbnRMb2NhbGUoKQogICAgIHJldHVybiBmb3JtYXR0ZXI7CiB9CiAKLXN0YXRpYyBOU051 bWJlckZvcm1hdHRlciAqbnVtYmVyRm9ybWF0dGVyKCkKK3N0YXRpYyBSZXRhaW5QdHI8TlNOdW1i ZXJGb3JtYXR0ZXI+IGNyZWF0ZUZvcm1hdHRlckZvckN1cnJlbnRMb2NhbGVGb3JEaXNwbGF5KCkK K3sKKyAgICBSZXRhaW5QdHI8TlNOdW1iZXJGb3JtYXR0ZXI+IGZvcm1hdHRlciA9IGNyZWF0ZUZv cm1hdHRlckZvckN1cnJlbnRMb2NhbGUoKTsKKyAgICBbZm9ybWF0dGVyLmdldCgpIHNldEhhc1Ro b3VzYW5kU2VwYXJhdG9yczpOT107CisgICAgcmV0dXJuIGZvcm1hdHRlcjsKK30KKworc3RhdGlj IE5TTnVtYmVyRm9ybWF0dGVyICpudW1iZXJGb3JtYXR0ZXJGb3JQYXJzaW5nKCkKIHsKICAgICBB U1NFUlQoaXNNYWluVGhyZWFkKCkpOwogICAgIHN0YXRpYyBOU051bWJlckZvcm1hdHRlciAqZm9y bWF0dGVyID0gY3JlYXRlRm9ybWF0dGVyRm9yQ3VycmVudExvY2FsZSgpLmxlYWtSZWYoKTsKICAg ICByZXR1cm4gZm9ybWF0dGVyOwogfQogCitzdGF0aWMgTlNOdW1iZXJGb3JtYXR0ZXIgKm51bWJl ckZvcm1hdHRlckZvckRpc3BsYXkoKQoreworICAgIEFTU0VSVChpc01haW5UaHJlYWQoKSk7Cisg ICAgc3RhdGljIE5TTnVtYmVyRm9ybWF0dGVyICpmb3JtYXR0ZXIgPSBjcmVhdGVGb3JtYXR0ZXJG b3JDdXJyZW50TG9jYWxlRm9yRGlzcGxheSgpLmxlYWtSZWYoKTsKKyAgICByZXR1cm4gZm9ybWF0 dGVyOworfQorCiBkb3VibGUgcGFyc2VMb2NhbGl6ZWROdW1iZXIoY29uc3QgU3RyaW5nJiBudW1i ZXJTdHJpbmcpCiB7CiAgICAgaWYgKG51bWJlclN0cmluZy5pc0VtcHR5KCkpCiAgICAgICAgIHJl dHVybiBudW1lcmljX2xpbWl0czxkb3VibGU+OjpxdWlldF9OYU4oKTsKLSAgICBOU051bWJlciAq bnVtYmVyID0gW251bWJlckZvcm1hdHRlcigpIG51bWJlckZyb21TdHJpbmc6bnVtYmVyU3RyaW5n XTsKKyAgICBOU051bWJlciAqbnVtYmVyID0gW251bWJlckZvcm1hdHRlckZvclBhcnNpbmcoKSBu dW1iZXJGcm9tU3RyaW5nOm51bWJlclN0cmluZ107CiAgICAgaWYgKCFudW1iZXIpCiAgICAgICAg IHJldHVybiBudW1lcmljX2xpbWl0czxkb3VibGU+OjpxdWlldF9OYU4oKTsKICAgICByZXR1cm4g W251bWJlciBkb3VibGVWYWx1ZV07CkBAIC02OCw3ICs4Miw3IEBAIGRvdWJsZSBwYXJzZUxvY2Fs aXplZE51bWJlcihjb25zdCBTdHJpbmcmIG51bWJlclN0cmluZykKIFN0cmluZyBmb3JtYXRMb2Nh bGl6ZWROdW1iZXIoZG91YmxlIGlucHV0TnVtYmVyLCB1bnNpZ25lZCBmcmFjdGlvbkRpZ2l0cykK IHsKICAgICBSZXRhaW5QdHI8TlNOdW1iZXI+IG51bWJlcihBZG9wdE5TLCBbW05TTnVtYmVyIGFs bG9jXSBpbml0V2l0aERvdWJsZTppbnB1dE51bWJlcl0pOwotICAgIFJldGFpblB0cjxOU051bWJl ckZvcm1hdHRlcj4gZm9ybWF0dGVyID0gbnVtYmVyRm9ybWF0dGVyKCk7CisgICAgUmV0YWluUHRy PE5TTnVtYmVyRm9ybWF0dGVyPiBmb3JtYXR0ZXIgPSBudW1iZXJGb3JtYXR0ZXJGb3JEaXNwbGF5 KCk7CiAgICAgW2Zvcm1hdHRlci5nZXQoKSBzZXRNYXhpbXVtRnJhY3Rpb25EaWdpdHM6ZnJhY3Rp b25EaWdpdHNdOwogICAgIHJldHVybiBTdHJpbmcoW2Zvcm1hdHRlci5nZXQoKSBzdHJpbmdGcm9t TnVtYmVyOm51bWJlci5nZXQoKV0pOwogfQo=