104613 2012-12-10 16:51:21 -0800 [WK2] Fix memory sampler for ARM Linux 2015-05-11 02:19:01 -0700 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) Unspecified Unspecified RESOLVED DUPLICATE 144439 P2 Normal --- 108645 1 laszlo.gombos jungjik.lee benjamin cdumez hausmann jungjik.lee kenneth ossy oldest_to_newest 787848 0 laszlo.gombos 2012-12-10 16:51:21 -0800 Building for ARM Linux gives the following error (e.g. on EFL port) /webkit/Source/WebKit2/Shared/linux/WebMemorySamplerLinux.cpp: In function ‘WTF::String WebKit::nextToken(FILE*)’: /webkit/Source/WebKit2/Shared/linux/WebMemorySamplerLinux.cpp:69:19: error: comparison is always false due to limited range of data type The type "char" by default is signed on x86 and unsigned on ARM. On platforms where "char" is unsigned the value -1 (EOF) becomes 255 when stored in an unsigned char (variable ch in the code above). This can easily lead to an infinite loop because the end of the file cannot be recognized. 787865 1 178671 laszlo.gombos 2012-12-10 17:12:10 -0800 Created attachment 178671 fix Make sure that the return value for fgetc() is first assigned to a signed variable to check for EOF and avoid the potential for an infinite loop. 787950 2 178689 laszlo.gombos 2012-12-10 19:15:06 -0800 Created attachment 178689 2nd try Swap the conditions for the while as it was in the original code. 788101 3 178689 kenneth 2012-12-10 23:54:34 -0800 Comment on attachment 178689 2nd try View in context: https://bugs.webkit.org/attachment.cgi?id=178689&action=review > Source/WebKit2/Shared/linux/WebMemorySamplerLinux.cpp:-69 > - if (ch == EOF || (isASCIISpace(ch) && index)) // Break on non-initial ASCII space. I think you have the same issue in Source/WebKit2/Shared/Plugins/Netscape/x11/NetscapePluginModuleX11.cpp 788410 4 laszlo.gombos 2012-12-11 06:59:20 -0800 (In reply to comment #3) > (From update of attachment 178689 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=178689&action=review > > > Source/WebKit2/Shared/linux/WebMemorySamplerLinux.cpp:-69 > > - if (ch == EOF || (isASCIISpace(ch) && index)) // Break on non-initial ASCII space. > > I think you have the same issue in Source/WebKit2/Shared/Plugins/Netscape/x11/NetscapePluginModuleX11.cpp NetscapePluginModuleX11.cpp looks good to me as the return value of fputc is assigned to a signed variable (int is signed). int result; while ((result = fputc(*current, stdout)) == EOF && errno == EINTR) { } 789149 5 178689 jungjik.lee 2012-12-11 20:50:27 -0800 Comment on attachment 178689 2nd try View in context: https://bugs.webkit.org/attachment.cgi?id=178689&action=review >>> Source/WebKit2/Shared/linux/WebMemorySamplerLinux.cpp:-69 >>> - if (ch == EOF || (isASCIISpace(ch) && index)) // Break on non-initial ASCII space. >> >> I think you have the same issue in Source/WebKit2/Shared/Plugins/Netscape/x11/NetscapePluginModuleX11.cpp > > NetscapePluginModuleX11.cpp looks good to me as the return value of fputc is assigned to a signed variable (int is signed). > > int result; > while ((result = fputc(*current, stdout)) == EOF && errno == EINTR) { } I didn't think enough. Could we use feof(file) instead of ch == EOF? if (feof(file) || ferror(file) || (isASCIISpace(ch) && index)) 802933 6 178689 benjamin 2013-01-08 19:58:12 -0800 Comment on attachment 178689 2nd try View in context: https://bugs.webkit.org/attachment.cgi?id=178689&action=review > Source/WebKit2/ChangeLog:11 > + > + Make sure that the return value for fgetc() is first assigned to a > + signed variable to check for EOF and avoid the potential for an infinite > + loop. This is important for ARM platforms where "char" type is > + unsigned by default. This whole signed-unsigned char is not the problem. The problem is the assignment from fgetc() was a one with loss. It is incorrect, ARM or not. > Source/WebKit2/Shared/linux/WebMemorySamplerLinux.cpp:70 > + int ch; > + while ((index < maxBuffer) && (ch = fgetc(file) != EOF)) { > + char charCode = ch; > + if (isASCIISpace(charCode) && index) // Break on non-initial ASCII space. This code is harder to read than it should. Please split your condition and assignment to make something nice and clean. You probably also want a c++ cast for int->char to make it explicit. 832901 7 188299 jungjik.lee 2013-02-14 03:26:55 -0800 Created attachment 188299 use a explicit c++ type cast and use feof for checking file-end. 834950 8 188299 cdumez 2013-02-17 00:29:35 -0800 Comment on attachment 188299 use a explicit c++ type cast and use feof for checking file-end. View in context: https://bugs.webkit.org/attachment.cgi?id=188299&action=review The change makes sense. > Source/WebKit2/Shared/linux/WebMemorySamplerLinux.cpp:70 > + if ((isASCIISpace(charCode) && index) || feof(file) || ferror(file)) // Break on non-initial ASCII space. I think it would be conceptually nicer to check for end of file and error *before* checking for space. I would reverse the conditions: if (feof(file) || ferror(file) || (isASCIISpace(charCode) && index)) 835180 9 188806 jungjik.lee 2013-02-18 00:13:41 -0800 Created attachment 188806 Patch 835181 10 jungjik.lee 2013-02-18 00:17:46 -0800 (In reply to comment #8) > (From update of attachment 188299 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=188299&action=review > > The change makes sense. > > > Source/WebKit2/Shared/linux/WebMemorySamplerLinux.cpp:70 > > + if ((isASCIISpace(charCode) && index) || feof(file) || ferror(file)) // Break on non-initial ASCII space. > > I think it would be conceptually nicer to check for end of file and error *before* checking for space. I would reverse the conditions: > if (feof(file) || ferror(file) || (isASCIISpace(charCode) && index)) Taking your advice, I filed new patch. thanks for your opinion. 1093702 11 ossy 2015-05-11 02:18:47 -0700 *** This bug has been marked as a duplicate of bug 144439 *** 178671 2012-12-10 17:12:10 -0800 2012-12-10 19:15:06 -0800 fix 104613.patch text/plain 1816 laszlo.gombos SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDEzNzIyNSkKKysrIFNvdXJjZS9XZWJLaXQyL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE4IEBACisyMDEyLTEyLTEwICBMYXN6bG8g R29tYm9zICA8bC5nb21ib3NAc2Ftc3VuZy5jb20+CisKKyAgICAgICAgW1dLMl0gRml4IG1lbW9y eSBzYW1wbGVyIGZvciBBUk0gTGludXgKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTEwNDYxMworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgIE1ha2Ugc3VyZSB0aGF0IHRoZSByZXR1cm4gdmFsdWUgZm9yIGZnZXRj KCkgaXMgZmlyc3QgYXNzaWduZWQgdG8gYQorICAgICAgICBzaWduZWQgdmFyaWFibGUgdG8gY2hl Y2sgZm9yIEVPRiBhbmQgYXZvaWQgdGhlIHBvdGVudGlhbCBmb3IgYW4gaW5maW5pdGUKKyAgICAg ICAgbG9vcC4gVGhpcyBpcyBpbXBvcnRhbnQgZm9yIEFSTSBwbGF0Zm9ybXMgd2hlcmUgImNoYXIi IHR5cGUgaXMKKyAgICAgICAgdW5zaWduZWQgYnkgZGVmYXVsdC4KKworICAgICAgICAqIFNoYXJl ZC9saW51eC9XZWJNZW1vcnlTYW1wbGVyTGludXguY3BwOgorICAgICAgICAoV2ViS2l0OjpuZXh0 VG9rZW4pOgorCiAyMDEyLTEyLTA5ICBBbnR0aSBLb2l2aXN0byAgPGFudHRpQGFwcGxlLmNvbT4K IAogICAgICAgICBGYWN0b3Igbm9kZSB0cmF2ZXJzYWwgaW50byBzdGFuZGFsb25lIGZ1bmN0aW9u cwpJbmRleDogU291cmNlL1dlYktpdDIvU2hhcmVkL2xpbnV4L1dlYk1lbW9yeVNhbXBsZXJMaW51 eC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvU2hhcmVkL2xpbnV4L1dlYk1lbW9y eVNhbXBsZXJMaW51eC5jcHAJKHJldmlzaW9uIDEzNzIwMykKKysrIFNvdXJjZS9XZWJLaXQyL1No YXJlZC9saW51eC9XZWJNZW1vcnlTYW1wbGVyTGludXguY3BwCSh3b3JraW5nIGNvcHkpCkBAIC02 NCwxMiArNjQsMTMgQEAgc3RhdGljIGlubGluZSBTdHJpbmcgbmV4dFRva2VuKEZJTEUqIGZpbAog CiAgICAgY2hhciBidWZmZXJbbWF4QnVmZmVyXSA9IHswLCB9OwogICAgIHVuc2lnbmVkIGludCBp bmRleCA9IDA7Ci0gICAgd2hpbGUgKGluZGV4IDwgbWF4QnVmZmVyKSB7Ci0gICAgICAgIGNoYXIg Y2ggPSBmZ2V0YyhmaWxlKTsKLSAgICAgICAgaWYgKGNoID09IEVPRiB8fCAoaXNBU0NJSVNwYWNl KGNoKSAmJiBpbmRleCkpIC8vIEJyZWFrIG9uIG5vbi1pbml0aWFsIEFTQ0lJIHNwYWNlLgorICAg IGludCBjaDsKKyAgICB3aGlsZSAoKGNoID0gZmdldGMoZmlsZSkgIT0gRU9GKSAmJiAoaW5kZXgg PCBtYXhCdWZmZXIpKSB7CisgICAgICAgIGNoYXIgY2hhckNvZGUgPSBjaDsKKyAgICAgICAgaWYg KGlzQVNDSUlTcGFjZShjaGFyQ29kZSkgJiYgaW5kZXgpIC8vIEJyZWFrIG9uIG5vbi1pbml0aWFs IEFTQ0lJIHNwYWNlLgogICAgICAgICAgICAgYnJlYWs7Ci0gICAgICAgIGlmICghaXNBU0NJSVNw YWNlKGNoKSkgewotICAgICAgICAgICAgYnVmZmVyW2luZGV4XSA9IGNoOworICAgICAgICBpZiAo IWlzQVNDSUlTcGFjZShjaGFyQ29kZSkpIHsKKyAgICAgICAgICAgIGJ1ZmZlcltpbmRleF0gPSBj aGFyQ29kZTsKICAgICAgICAgICAgIGluZGV4Kys7CiAgICAgICAgIH0KICAgICB9Cg== 178689 2012-12-10 19:15:06 -0800 2013-02-14 03:26:55 -0800 2nd try 104613_2.patch text/plain 1816 laszlo.gombos SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDEzNzIyNSkKKysrIFNvdXJjZS9XZWJLaXQyL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE4IEBACisyMDEyLTEyLTEwICBMYXN6bG8g R29tYm9zICA8bC5nb21ib3NAc2Ftc3VuZy5jb20+CisKKyAgICAgICAgW1dLMl0gRml4IG1lbW9y eSBzYW1wbGVyIGZvciBBUk0gTGludXgKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTEwNDYxMworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgIE1ha2Ugc3VyZSB0aGF0IHRoZSByZXR1cm4gdmFsdWUgZm9yIGZnZXRj KCkgaXMgZmlyc3QgYXNzaWduZWQgdG8gYQorICAgICAgICBzaWduZWQgdmFyaWFibGUgdG8gY2hl Y2sgZm9yIEVPRiBhbmQgYXZvaWQgdGhlIHBvdGVudGlhbCBmb3IgYW4gaW5maW5pdGUKKyAgICAg ICAgbG9vcC4gVGhpcyBpcyBpbXBvcnRhbnQgZm9yIEFSTSBwbGF0Zm9ybXMgd2hlcmUgImNoYXIi IHR5cGUgaXMKKyAgICAgICAgdW5zaWduZWQgYnkgZGVmYXVsdC4KKworICAgICAgICAqIFNoYXJl ZC9saW51eC9XZWJNZW1vcnlTYW1wbGVyTGludXguY3BwOgorICAgICAgICAoV2ViS2l0OjpuZXh0 VG9rZW4pOgorCiAyMDEyLTEyLTA5ICBBbnR0aSBLb2l2aXN0byAgPGFudHRpQGFwcGxlLmNvbT4K IAogICAgICAgICBGYWN0b3Igbm9kZSB0cmF2ZXJzYWwgaW50byBzdGFuZGFsb25lIGZ1bmN0aW9u cwpJbmRleDogU291cmNlL1dlYktpdDIvU2hhcmVkL2xpbnV4L1dlYk1lbW9yeVNhbXBsZXJMaW51 eC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvU2hhcmVkL2xpbnV4L1dlYk1lbW9y eVNhbXBsZXJMaW51eC5jcHAJKHJldmlzaW9uIDEzNzIwMykKKysrIFNvdXJjZS9XZWJLaXQyL1No YXJlZC9saW51eC9XZWJNZW1vcnlTYW1wbGVyTGludXguY3BwCSh3b3JraW5nIGNvcHkpCkBAIC02 NCwxMiArNjQsMTMgQEAgc3RhdGljIGlubGluZSBTdHJpbmcgbmV4dFRva2VuKEZJTEUqIGZpbAog CiAgICAgY2hhciBidWZmZXJbbWF4QnVmZmVyXSA9IHswLCB9OwogICAgIHVuc2lnbmVkIGludCBp bmRleCA9IDA7Ci0gICAgd2hpbGUgKGluZGV4IDwgbWF4QnVmZmVyKSB7Ci0gICAgICAgIGNoYXIg Y2ggPSBmZ2V0YyhmaWxlKTsKLSAgICAgICAgaWYgKGNoID09IEVPRiB8fCAoaXNBU0NJSVNwYWNl KGNoKSAmJiBpbmRleCkpIC8vIEJyZWFrIG9uIG5vbi1pbml0aWFsIEFTQ0lJIHNwYWNlLgorICAg IGludCBjaDsKKyAgICB3aGlsZSAoKGluZGV4IDwgbWF4QnVmZmVyKSAmJiAoY2ggPSBmZ2V0Yyhm aWxlKSAhPSBFT0YpKSB7CisgICAgICAgIGNoYXIgY2hhckNvZGUgPSBjaDsKKyAgICAgICAgaWYg KGlzQVNDSUlTcGFjZShjaGFyQ29kZSkgJiYgaW5kZXgpIC8vIEJyZWFrIG9uIG5vbi1pbml0aWFs IEFTQ0lJIHNwYWNlLgogICAgICAgICAgICAgYnJlYWs7Ci0gICAgICAgIGlmICghaXNBU0NJSVNw YWNlKGNoKSkgewotICAgICAgICAgICAgYnVmZmVyW2luZGV4XSA9IGNoOworICAgICAgICBpZiAo IWlzQVNDSUlTcGFjZShjaGFyQ29kZSkpIHsKKyAgICAgICAgICAgIGJ1ZmZlcltpbmRleF0gPSBj aGFyQ29kZTsKICAgICAgICAgICAgIGluZGV4Kys7CiAgICAgICAgIH0KICAgICB9Cg== 188299 2013-02-14 03:26:55 -0800 2013-02-18 00:13:33 -0800 use a explicit c++ type cast and use feof for checking file-end. third.patch text/plain 1825 jungjik.lee ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCBjMDg2ODVlLi5iYjc1OTYyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTcg QEAKKzIwMTMtMDItMTQgIEp1bmdKaWsgTGVlICA8anVuZ2ppay5sZWVAc2Ftc3VuZy5jb20+CisK KyAgICAgICAgW1dLMl0gRml4IG1lbW9yeSBzYW1wbGVyIGZvciBBUk0gTGludXgKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEwNDYxMworCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIGZnZXRjIHJldHVybnMgaW50 IHZhcmlhYmxlIGFuZCB0aGUgdmFyaWFibGUgaXMgaW1wbGljaXRseSB0eXBlLWNhc3RlZCB0byBj aGFyLgorICAgICAgICB0aGlzIHR5cGUtY2FzdGluZyBtYWtlcyBsb3NzIGFuZCBpZiB3ZSB1c2Ug dGhlIHZhbHVlIGluIGNvbmRpdGlvbiwgdGhlIGxvZ2ljIGNhbiBmYWxsIGludG8KKyAgICAgICAg YW4gaW5maW5pdGUgbG9vcC4gU28gdXNlIGZlb2YgaW4gdGhlIGNvbmRpdGlvbiBmb3Igc2FmZXR5 IGFuZCByZWFkYWJpbGl0eS4KKworICAgICAgICAqIFNoYXJlZC9saW51eC9XZWJNZW1vcnlTYW1w bGVyTGludXguY3BwOgorICAgICAgICAoV2ViS2l0OjpuZXh0VG9rZW4pOiBleHBsaWNpdCB0eXBl IGNhc3RpbmcgZm9yIGNoYXJDb2RlIGFuZCB1c2UgZmVvZiBpbiB0aGUgbG9vcCBjb25kaXRpb24u CisKIDIwMTMtMDItMTMgIEFuZGVycyBDYXJsc3NvbiAgPGFuZGVyc2NhQGFwcGxlLmNvbT4KIAog ICAgICAgICBSZW1vdmUgU3RyaW5nUGFpclZlY3RvcgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktp dDIvU2hhcmVkL2xpbnV4L1dlYk1lbW9yeVNhbXBsZXJMaW51eC5jcHAgYi9Tb3VyY2UvV2ViS2l0 Mi9TaGFyZWQvbGludXgvV2ViTWVtb3J5U2FtcGxlckxpbnV4LmNwcAppbmRleCBhN2QzY2NiLi4x MzBmODY0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9TaGFyZWQvbGludXgvV2ViTWVtb3J5 U2FtcGxlckxpbnV4LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9TaGFyZWQvbGludXgvV2ViTWVt b3J5U2FtcGxlckxpbnV4LmNwcApAQCAtNjYsMTEgKzY2LDExIEBAIHN0YXRpYyBpbmxpbmUgU3Ry aW5nIG5leHRUb2tlbihGSUxFKiBmaWxlKQogICAgIGNoYXIgYnVmZmVyW21heEJ1ZmZlcl0gPSB7 MCwgfTsKICAgICB1bnNpZ25lZCBpbnQgaW5kZXggPSAwOwogICAgIHdoaWxlIChpbmRleCA8IG1h eEJ1ZmZlcikgewotICAgICAgICBjaGFyIGNoID0gZmdldGMoZmlsZSk7Ci0gICAgICAgIGlmIChj aCA9PSBFT0YgfHwgKGlzQVNDSUlTcGFjZShjaCkgJiYgaW5kZXgpKSAvLyBCcmVhayBvbiBub24t aW5pdGlhbCBBU0NJSSBzcGFjZS4KKyAgICAgICAgY2hhciBjaGFyQ29kZSA9IHN0YXRpY19jYXN0 PGNoYXI+IChmZ2V0YyhmaWxlKSk7CisgICAgICAgIGlmICgoaXNBU0NJSVNwYWNlKGNoYXJDb2Rl KSAmJiBpbmRleCkgfHwgZmVvZihmaWxlKSB8fCBmZXJyb3IoZmlsZSkpIC8vIEJyZWFrIG9uIG5v bi1pbml0aWFsIEFTQ0lJIHNwYWNlLgogICAgICAgICAgICAgYnJlYWs7Ci0gICAgICAgIGlmICgh aXNBU0NJSVNwYWNlKGNoKSkgewotICAgICAgICAgICAgYnVmZmVyW2luZGV4XSA9IGNoOworICAg ICAgICBpZiAoIWlzQVNDSUlTcGFjZShjaGFyQ29kZSkpIHsKKyAgICAgICAgICAgIGJ1ZmZlcltp bmRleF0gPSBjaGFyQ29kZTsKICAgICAgICAgICAgIGluZGV4Kys7CiAgICAgICAgIH0KICAgICB9 Cg== 188806 2013-02-18 00:13:41 -0800 2015-05-11 02:19:01 -0700 Patch bug-104613-20130218171006.patch text/plain 2038 jungjik.lee U3VidmVyc2lvbiBSZXZpc2lvbjogMTQzMTU0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggODQ0YWVhMzY4MWY4OTQ5 ZWRlODhkNmIxOWM4MzlmMjU4YTRkZmQwNi4uM2ZhY2EwMGI5OTgwMDBkNzUyNGVmNjMyNmYxYmU1 NmQyMTU4OTQ0MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDEzLTAyLTE3ICBKdW5n SmlrIExlZSAgPGp1bmdqaWsubGVlQHNhbXN1bmcuY29tPgorCisgICAgICAgIFtXSzJdIEZpeCBt ZW1vcnkgc2FtcGxlciBmb3IgQVJNIExpbnV4CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0xMDQ2MTMKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBmZ2V0YyByZXR1cm5zIGludCB2YXJpYWJsZSBhbmQgdGhlIHZh cmlhYmxlIGlzIGltcGxpY2l0bHkgdHlwZS1jYXN0ZWQgdG8gY2hhci4KKyAgICAgICAgdGhpcyB0 eXBlLWNhc3RpbmcgbWFrZXMgbG9zcyBhbmQgaWYgd2UgdXNlIHRoZSB2YWx1ZSBpbiBjb25kaXRp b24sIHRoZSBsb2dpYyBjYW4gZmFsbCBpbnRvCisgICAgICAgIGFuIGluZmluaXRlIGxvb3AuIFNv IHVzZSBmZW9mIGluIHRoZSBjb25kaXRpb24gZm9yIHNhZmV0eSBhbmQgcmVhZGFiaWxpdHkuCisK KyAgICAgICAgKiBTaGFyZWQvbGludXgvV2ViTWVtb3J5U2FtcGxlckxpbnV4LmNwcDoKKyAgICAg ICAgKFdlYktpdDo6bmV4dFRva2VuKTogZXhwbGljaXQgdHlwZSBjYXN0aW5nIGZvciBjaGFyQ29k ZSBhbmQgdXNlIGZlb2YgaW4gdGhlIGxvb3AgY29uZGl0aW9uLgorCiAyMDEzLTAyLTE3ICBKYWUg SHl1biBQYXJrICA8amFlLnBhcmtAY29tcGFueTEwMC5uZXQ+CiAKICAgICAgICAgUmVtb3ZlIHVu bmVjZXNzYXJ5IHB1YmxpYyBtZXRob2QgRHJhd2luZ0FyZWFJbXBsOjpjcmVhdGVHcmFwaGljc0Nv bnRleHQoKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvU2hhcmVkL2xpbnV4L1dlYk1lbW9y eVNhbXBsZXJMaW51eC5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9TaGFyZWQvbGludXgvV2ViTWVtb3J5 U2FtcGxlckxpbnV4LmNwcAppbmRleCBhN2QzY2NiNTNjNTI1MGFmYWIwMTY0NWNiNjEwYjlkYWIx ZmNmOWRiLi44YzgxZGZlYTZmOTJhNTEyN2JjZjBlNzljOWZjMjIwMzJhZjZiYTZmIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViS2l0Mi9TaGFyZWQvbGludXgvV2ViTWVtb3J5U2FtcGxlckxpbnV4LmNw cAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9TaGFyZWQvbGludXgvV2ViTWVtb3J5U2FtcGxlckxpbnV4 LmNwcApAQCAtNjYsMTEgKzY2LDExIEBAIHN0YXRpYyBpbmxpbmUgU3RyaW5nIG5leHRUb2tlbihG SUxFKiBmaWxlKQogICAgIGNoYXIgYnVmZmVyW21heEJ1ZmZlcl0gPSB7MCwgfTsKICAgICB1bnNp Z25lZCBpbnQgaW5kZXggPSAwOwogICAgIHdoaWxlIChpbmRleCA8IG1heEJ1ZmZlcikgewotICAg ICAgICBjaGFyIGNoID0gZmdldGMoZmlsZSk7Ci0gICAgICAgIGlmIChjaCA9PSBFT0YgfHwgKGlz QVNDSUlTcGFjZShjaCkgJiYgaW5kZXgpKSAvLyBCcmVhayBvbiBub24taW5pdGlhbCBBU0NJSSBz cGFjZS4KKyAgICAgICAgY2hhciBjaGFyQ29kZSA9IHN0YXRpY19jYXN0PGNoYXI+IChmZ2V0Yyhm aWxlKSk7CisgICAgICAgIGlmIChmZW9mKGZpbGUpIHx8IGZlcnJvcihmaWxlKSB8fCAoaXNBU0NJ SVNwYWNlKGNoYXJDb2RlKSAmJiBpbmRleCkpIC8vIEJyZWFrIG9uIG5vbi1pbml0aWFsIEFTQ0lJ IHNwYWNlLgogICAgICAgICAgICAgYnJlYWs7Ci0gICAgICAgIGlmICghaXNBU0NJSVNwYWNlKGNo KSkgewotICAgICAgICAgICAgYnVmZmVyW2luZGV4XSA9IGNoOworICAgICAgICBpZiAoIWlzQVND SUlTcGFjZShjaGFyQ29kZSkpIHsKKyAgICAgICAgICAgIGJ1ZmZlcltpbmRleF0gPSBjaGFyQ29k ZTsKICAgICAgICAgICAgIGluZGV4Kys7CiAgICAgICAgIH0KICAgICB9Cg==