65807 2011-08-05 19:41:13 -0700 Should not use C-style cast in CSSParser.cpp 2011-08-08 01:42:37 -0700 1 1 1 Unclassified WebKit CSS 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 bashi bashi hamaji mrowe webkit.review.bot oldest_to_newest 447553 0 bashi 2011-08-05 19:41:13 -0700 I submitted r92528, which adds a C-style cast to fix build failure. However, I should have used C++-style cast. 447554 1 103140 bashi 2011-08-05 19:44:39 -0700 Created attachment 103140 Patch 447556 2 bashi 2011-08-05 19:47:51 -0700 (Cc'ed Mark just in a case) Hamaji-san, this is a trivial patch. Could you take a look when you have time? Thanks, 447579 3 103140 hamaji 2011-08-05 23:20:52 -0700 Comment on attachment 103140 Patch OK 447593 4 103140 webkit.review.bot 2011-08-06 03:02:52 -0700 Comment on attachment 103140 Patch Clearing flags on attachment: 103140 Committed r92549: <http://trac.webkit.org/changeset/92549> 447594 5 webkit.review.bot 2011-08-06 03:02:57 -0700 All reviewed patches have been landed. Closing bug. 447691 6 103140 ap 2011-08-06 18:42:21 -0700 Comment on attachment 103140 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=103140&action=review > Source/WebCore/css/CSSParser.cpp:3287 > + numSteps = static_cast<int>(min(v->fValue, (double)INT_MAX)); (double) is still a C-style cast. 447784 7 103140 tkent 2011-08-07 17:40:22 -0700 Comment on attachment 103140 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=103140&action=review > Source/WebCore/css/CSSParser.cpp:3287 > - numSteps = (int) min(v->fValue, (double)INT_MAX); > + numSteps = static_cast<int>(min(v->fValue, (double)INT_MAX)); You might want to use clampToInteger() in wtf/MathExtras.h. 447847 8 bashi 2011-08-07 23:22:54 -0700 (In reply to comment #7) > (From update of attachment 103140 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=103140&action=review > > > Source/WebCore/css/CSSParser.cpp:3287 > > - numSteps = (int) min(v->fValue, (double)INT_MAX); > > + numSteps = static_cast<int>(min(v->fValue, (double)INT_MAX)); > > You might want to use clampToInteger() in wtf/MathExtras.h. Thank you for pointing this out. Reopening this bug and will fix it with clampToInteger(). 447850 9 103204 bashi 2011-08-07 23:28:08 -0700 Created attachment 103204 Patch V1 447851 10 103204 tkent 2011-08-07 23:35:36 -0700 Comment on attachment 103204 Patch V1 View in context: https://bugs.webkit.org/attachment.cgi?id=103204&action=review > Source/WebCore/css/CSSParser.cpp:6336 > - tagValue = static_cast<int>(value->fValue); > - if (tagValue < 0) > - return false; > + tagValue = clampToInteger(value->fValue); Do you mean clampToPositiveInteger()? 447852 11 103204 tkent 2011-08-07 23:37:01 -0700 Comment on attachment 103204 Patch V1 View in context: https://bugs.webkit.org/attachment.cgi?id=103204&action=review >> Source/WebCore/css/CSSParser.cpp:6336 >> + tagValue = clampToInteger(value->fValue); > > Do you mean clampToPositiveInteger()? Is it ok not to return false in a case of negative value? 447862 12 103207 bashi 2011-08-07 23:48:31 -0700 Created attachment 103207 Patch V2 447867 13 103209 bashi 2011-08-07 23:56:32 -0700 Created attachment 103209 Patch V3 447869 14 bashi 2011-08-07 23:58:05 -0700 (In reply to comment #11) > (From update of attachment 103204 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=103204&action=review > > >> Source/WebCore/css/CSSParser.cpp:6336 > >> + tagValue = clampToInteger(value->fValue); > > > > Do you mean clampToPositiveInteger()? > > Is it ok not to return false in a case of negative value? Should return false in a case of negative value. Revised the patch. Thanks! 447872 15 103209 tkent 2011-08-08 00:05:22 -0700 Comment on attachment 103209 Patch V3 ok 447912 16 103209 webkit.review.bot 2011-08-08 01:42:31 -0700 Comment on attachment 103209 Patch V3 Clearing flags on attachment: 103209 Committed r92588: <http://trac.webkit.org/changeset/92588> 447913 17 webkit.review.bot 2011-08-08 01:42:37 -0700 All reviewed patches have been landed. Closing bug. 103140 2011-08-05 19:44:39 -0700 2011-08-07 23:28:03 -0700 Patch bug-65807-20110806114438.patch text/plain 2941 bashi U3VidmVyc2lvbiBSZXZpc2lvbjogOTI1NDEKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCAzZWMzMzhlNDY4NTZmZmZl ZGQ5NWM3ZmQyYjE1NjFmNzI4ZmU3ZmEwLi4zYmY2Y2YwNTg0NzlmNzJiMzg0YWViNDJmYmU0NTU0 MWEyMTY4YWNmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjAgQEAKKzIwMTEtMDgtMDUgIEtlbmlj aGkgSXNoaWJhc2hpICA8YmFzaGlAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFNob3VsZCB1c2Ug QysrLXN0eWxlIGNhc3QgaW4gQ1NTUGFyc2VyLmNwcAorICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NjU4MDcKKworICAgICAgICBSZXBsYWNlcyBDLXN0eWxl IGNhc3Qgd2l0aCBDKytzdHlsZSBjYXN0LgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgIE5vIG5ldyB0ZXN0cyBiZWNhdXNlIG5vIGJlaGF2aW9yIGNoYW5n ZS4KKworICAgICAgICAqIGNzcy9DU1NQYXJzZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Q1NT UGFyc2VyOjpwYXJzZUFuaW1hdGlvblRpbWluZ0Z1bmN0aW9uKToKKyAgICAgICAgKFdlYkNvcmU6 OkNTU1BhcnNlcjo6cGFyc2VGb250KToKKyAgICAgICAgKFdlYkNvcmU6OkNTU1BhcnNlcjo6cGFy c2VDb2xvckZyb21WYWx1ZSk6CisgICAgICAgIChXZWJDb3JlOjpDU1NQYXJzZXI6OnBhcnNlRm9u dEZlYXR1cmVUYWcpOgorCiAyMDExLTA4LTA1ICBUb20gSHVkc29uICA8dG9taHVkc29uQGdvb2ds ZS5jb20+CiAKICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTY0NjEzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTUGFyc2VyLmNwcCBiL1Nv dXJjZS9XZWJDb3JlL2Nzcy9DU1NQYXJzZXIuY3BwCmluZGV4IGM4ZGVkY2JjMDllMjA0YWIxZWUx ZGMyNzUxMjkyMTQzOWI3Njc1YTcuLjY3Nzc2Y2E1MWI4NTQ2NjM2N2I5NmZkYTBhMDZhNGZiODNh ZWFjNDAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NQYXJzZXIuY3BwCisrKyBi L1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NQYXJzZXIuY3BwCkBAIC0zMjg0LDcgKzMyODQsNyBAQCBQ YXNzUmVmUHRyPENTU1ZhbHVlPiBDU1NQYXJzZXI6OnBhcnNlQW5pbWF0aW9uVGltaW5nRnVuY3Rp b24oKQogICAgICAgICBDU1NQYXJzZXJWYWx1ZSogdiA9IGFyZ3MtPmN1cnJlbnQoKTsKICAgICAg ICAgaWYgKCF2YWxpZFVuaXQodiwgRkludGVnZXIsIG1fc3RyaWN0KSkKICAgICAgICAgICAgIHJl dHVybiAwOwotICAgICAgICBudW1TdGVwcyA9IChpbnQpIG1pbih2LT5mVmFsdWUsIChkb3VibGUp SU5UX01BWCk7CisgICAgICAgIG51bVN0ZXBzID0gc3RhdGljX2Nhc3Q8aW50PihtaW4odi0+ZlZh bHVlLCAoZG91YmxlKUlOVF9NQVgpKTsKICAgICAgICAgaWYgKG51bVN0ZXBzIDwgMSkKICAgICAg ICAgICAgIHJldHVybiAwOwogICAgICAgICB2ID0gYXJncy0+bmV4dCgpOwpAQCAtMzkyOSw3ICsz OTI5LDcgQEAgYm9vbCBDU1NQYXJzZXI6OnBhcnNlRm9udChib29sIGltcG9ydGFudCkKICAgICAg ICAgICAgICAgICB2YWxpZCA9IGZhbHNlOwogICAgICAgICAgICAgfQogICAgICAgICB9IGVsc2Ug aWYgKCFmb250LT53ZWlnaHQgJiYgdmFsaWRVbml0KHZhbHVlLCBGSW50ZWdlciB8IEZOb25OZWcs IHRydWUpKSB7Ci0gICAgICAgICAgICBpbnQgd2VpZ2h0ID0gKGludCl2YWx1ZS0+ZlZhbHVlOwor ICAgICAgICAgICAgaW50IHdlaWdodCA9IHN0YXRpY19jYXN0PGludD4odmFsdWUtPmZWYWx1ZSk7 CiAgICAgICAgICAgICBpbnQgdmFsID0gMDsKICAgICAgICAgICAgIGlmICh3ZWlnaHQgPT0gMTAw KQogICAgICAgICAgICAgICAgIHZhbCA9IENTU1ZhbHVlMTAwOwpAQCAtNDc2NCw3ICs0NzY0LDcg QEAgYm9vbCBDU1NQYXJzZXI6OnBhcnNlQ29sb3JGcm9tVmFsdWUoQ1NTUGFyc2VyVmFsdWUqIHZh bHVlLCBSR0JBMzImIGMpCiB7CiAgICAgaWYgKCFtX3N0cmljdCAmJiB2YWx1ZS0+dW5pdCA9PSBD U1NQcmltaXRpdmVWYWx1ZTo6Q1NTX05VTUJFUiAmJgogICAgICAgICB2YWx1ZS0+ZlZhbHVlID49 IDAuICYmIHZhbHVlLT5mVmFsdWUgPCAxMDAwMDAwLikgewotICAgICAgICBTdHJpbmcgc3RyID0g U3RyaW5nOjpmb3JtYXQoIiUwNmQiLCAoaW50KSh2YWx1ZS0+ZlZhbHVlKy41KSk7CisgICAgICAg IFN0cmluZyBzdHIgPSBTdHJpbmc6OmZvcm1hdCgiJTA2ZCIsIHN0YXRpY19jYXN0PGludD4oKHZh bHVlLT5mVmFsdWUrLjUpKSk7CiAgICAgICAgIGlmICghQ1NTUGFyc2VyOjpwYXJzZUNvbG9yKHN0 ciwgYywgbV9zdHJpY3QpKQogICAgICAgICAgICAgcmV0dXJuIGZhbHNlOwogICAgIH0gZWxzZSBp ZiAodmFsdWUtPnVuaXQgPT0gQ1NTUHJpbWl0aXZlVmFsdWU6OkNTU19QQVJTRVJfSEVYQ09MT1Ig fHwKQEAgLTYzMzMsNyArNjMzMyw3IEBAIGJvb2wgQ1NTUGFyc2VyOjpwYXJzZUZvbnRGZWF0dXJl VGFnKENTU1ZhbHVlTGlzdCogc2V0dGluZ3MpCiAgICAgdmFsdWUgPSBtX3ZhbHVlTGlzdC0+bmV4 dCgpOwogICAgIGlmICh2YWx1ZSkgewogICAgICAgICBpZiAodmFsdWUtPnVuaXQgPT0gQ1NTUHJp bWl0aXZlVmFsdWU6OkNTU19OVU1CRVIgJiYgdmFsdWUtPmlzSW50ICYmIHZhbHVlLT5mVmFsdWUg Pj0gMCkgewotICAgICAgICAgICAgdGFnVmFsdWUgPSAoaW50KXZhbHVlLT5mVmFsdWU7CisgICAg ICAgICAgICB0YWdWYWx1ZSA9IHN0YXRpY19jYXN0PGludD4odmFsdWUtPmZWYWx1ZSk7CiAgICAg ICAgICAgICBpZiAodGFnVmFsdWUgPCAwKQogICAgICAgICAgICAgICAgIHJldHVybiBmYWxzZTsK ICAgICAgICAgICAgIG1fdmFsdWVMaXN0LT5uZXh0KCk7Cg== 103204 2011-08-07 23:28:08 -0700 2011-08-07 23:48:25 -0700 Patch V1 bug-65807-20110808152807.patch text/plain 2600 bashi U3VidmVyc2lvbiBSZXZpc2lvbjogOTI1ODEKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCBiMWQzNjdhNDZjZDhiYmI3 NDIyYjBkZTVjMjhkNDRhNWE5ODMxZDlmLi41ZjFlN2ZiODdmODk4MTM2ODdiN2FhN2U0NjQxYTFi MGVhNGFkZGJlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTkgQEAKKzIwMTEtMDgtMDcgIEtlbmlj aGkgSXNoaWJhc2hpICA8YmFzaGlAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFNob3VsZCBub3Qg dXNlIEMtc3R5bGUgY2FzdCBpbiBDU1NQYXJzZXIuY3BwCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD02NTgwNworCisgICAgICAgIFJlbW92ZSBDLXN0eWxl IGNhc3QuCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg Tm8gbmV3IHRlc3RzIGJlY2F1c2Ugbm8gYmVoYXZpb3IgY2hhbmdlLgorCisgICAgICAgICogY3Nz L0NTU1BhcnNlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpDU1NQYXJzZXI6OnBhcnNlQW5pbWF0 aW9uVGltaW5nRnVuY3Rpb24pOiBSZXBsYWNlZCBhIGNhc3Qgd2l0aCBjbGFtcFRvSW50ZWdlcigp LgorICAgICAgICAoV2ViQ29yZTo6Q1NTUGFyc2VyOjpwYXJzZUZvbnRGZWF0dXJlVGFnKTogRGl0 dG8uCisgICAgICAgIChXZWJDb3JlOjpDU1NQYXJzZXI6OmNyZWF0ZUtleWZyYW1lUnVsZSk6IFJl cGxhY2VkIGEgY2FzdCB3aXRoIEMrKy1zdHlsZSBjYXN0LgorCiAyMDExLTA4LTA3ICBKYW1lcyBL b3ppYW5za2kgIDxrb3pAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIE1ha2UgdGhlIGZ1bGxzY3Jl ZW4gSlMgQVBJIGVuYWJsZWQgYXQgcnVudGltZS4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L2Nzcy9DU1NQYXJzZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvY3NzL0NTU1BhcnNlci5jcHAKaW5k ZXggNjc3NzZjYTUxYjg1NDY2MzY3Yjk2ZmRhMGEwNmE0ZmI4M2FlYWM0MC4uNjRhMzQzNWQ1MGEw YTU5Njk4NDgwYjE4OGNmZjcyYTIzZDM2YjQzMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv Y3NzL0NTU1BhcnNlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvY3NzL0NTU1BhcnNlci5jcHAK QEAgLTMyODQsNyArMzI4NCw3IEBAIFBhc3NSZWZQdHI8Q1NTVmFsdWU+IENTU1BhcnNlcjo6cGFy c2VBbmltYXRpb25UaW1pbmdGdW5jdGlvbigpCiAgICAgICAgIENTU1BhcnNlclZhbHVlKiB2ID0g YXJncy0+Y3VycmVudCgpOwogICAgICAgICBpZiAoIXZhbGlkVW5pdCh2LCBGSW50ZWdlciwgbV9z dHJpY3QpKQogICAgICAgICAgICAgcmV0dXJuIDA7Ci0gICAgICAgIG51bVN0ZXBzID0gc3RhdGlj X2Nhc3Q8aW50PihtaW4odi0+ZlZhbHVlLCAoZG91YmxlKUlOVF9NQVgpKTsKKyAgICAgICAgbnVt U3RlcHMgPSBjbGFtcFRvSW50ZWdlcih2LT5mVmFsdWUpOwogICAgICAgICBpZiAobnVtU3RlcHMg PCAxKQogICAgICAgICAgICAgcmV0dXJuIDA7CiAgICAgICAgIHYgPSBhcmdzLT5uZXh0KCk7CkBA IC02MzMzLDkgKzYzMzMsNyBAQCBib29sIENTU1BhcnNlcjo6cGFyc2VGb250RmVhdHVyZVRhZyhD U1NWYWx1ZUxpc3QqIHNldHRpbmdzKQogICAgIHZhbHVlID0gbV92YWx1ZUxpc3QtPm5leHQoKTsK ICAgICBpZiAodmFsdWUpIHsKICAgICAgICAgaWYgKHZhbHVlLT51bml0ID09IENTU1ByaW1pdGl2 ZVZhbHVlOjpDU1NfTlVNQkVSICYmIHZhbHVlLT5pc0ludCAmJiB2YWx1ZS0+ZlZhbHVlID49IDAp IHsKLSAgICAgICAgICAgIHRhZ1ZhbHVlID0gc3RhdGljX2Nhc3Q8aW50Pih2YWx1ZS0+ZlZhbHVl KTsKLSAgICAgICAgICAgIGlmICh0YWdWYWx1ZSA8IDApCi0gICAgICAgICAgICAgICAgcmV0dXJu IGZhbHNlOworICAgICAgICAgICAgdGFnVmFsdWUgPSBjbGFtcFRvSW50ZWdlcih2YWx1ZS0+ZlZh bHVlKTsKICAgICAgICAgICAgIG1fdmFsdWVMaXN0LT5uZXh0KCk7CiAgICAgICAgIH0gZWxzZSBp ZiAodmFsdWUtPmlkID09IENTU1ZhbHVlT24gfHwgdmFsdWUtPmlkID09IENTU1ZhbHVlT2ZmKSB7 CiAgICAgICAgICAgICB0YWdWYWx1ZSA9IHZhbHVlLT5pZCA9PSBDU1NWYWx1ZU9uOwpAQCAtNjk1 Miw3ICs2OTUwLDcgQEAgV2ViS2l0Q1NTS2V5ZnJhbWVSdWxlKiBDU1NQYXJzZXI6OmNyZWF0ZUtl eWZyYW1lUnVsZShDU1NQYXJzZXJWYWx1ZUxpc3QqIGtleXMpCiAgICAgLy8gQ3JlYXRlIGEga2V5 IHN0cmluZyBmcm9tIHRoZSBwYXNzZWQga2V5cwogICAgIFN0cmluZyBrZXlTdHJpbmc7CiAgICAg Zm9yICh1bnNpZ25lZCBpID0gMDsgaSA8IGtleXMtPnNpemUoKTsgKytpKSB7Ci0gICAgICAgIGZs b2F0IGtleSA9IChmbG9hdCkga2V5cy0+dmFsdWVBdChpKS0+ZlZhbHVlOworICAgICAgICBmbG9h dCBrZXkgPSBzdGF0aWNfY2FzdDxmbG9hdD4oa2V5cy0+dmFsdWVBdChpKS0+ZlZhbHVlKTsKICAg ICAgICAgaWYgKGkgIT0gMCkKICAgICAgICAgICAgIGtleVN0cmluZyArPSAiLCI7CiAgICAgICAg IGtleVN0cmluZyArPSBTdHJpbmc6Om51bWJlcihrZXkpOwo= 103207 2011-08-07 23:48:31 -0700 2011-08-07 23:56:26 -0700 Patch V2 bug-65807-20110808154829.patch text/plain 2648 bashi U3VidmVyc2lvbiBSZXZpc2lvbjogOTI1ODEKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCBiMWQzNjdhNDZjZDhiYmI3 NDIyYjBkZTVjMjhkNDRhNWE5ODMxZDlmLi4wYmNjOTIwMWE4OGVmZDc4ZDJkNmQ0ZDNlNzkzNjVk NzIwNDMxNDc4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTkgQEAKKzIwMTEtMDgtMDcgIEtlbmlj aGkgSXNoaWJhc2hpICA8YmFzaGlAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFNob3VsZCBub3Qg dXNlIEMtc3R5bGUgY2FzdCBpbiBDU1NQYXJzZXIuY3BwCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD02NTgwNworCisgICAgICAgIFJlbW92ZSBDLXN0eWxl IGNhc3QuCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg Tm8gbmV3IHRlc3RzIGJlY2F1c2Ugbm8gYmVoYXZpb3IgY2hhbmdlLgorCisgICAgICAgICogY3Nz L0NTU1BhcnNlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpDU1NQYXJzZXI6OnBhcnNlQW5pbWF0 aW9uVGltaW5nRnVuY3Rpb24pOiBSZXBsYWNlZCBhIGNhc3Qgd2l0aCBjbGFtcFRvSW50ZWdlcigp LgorICAgICAgICAoV2ViQ29yZTo6Q1NTUGFyc2VyOjpwYXJzZUZvbnRGZWF0dXJlVGFnKTogUmVw bGFjZWQgYSBjYXN0IHdpdGggY2xhbXBUb1Bvc2l0aXZlSW50ZWdlcigpLgorICAgICAgICAoV2Vi Q29yZTo6Q1NTUGFyc2VyOjpjcmVhdGVLZXlmcmFtZVJ1bGUpOiBSZXBsYWNlZCBhIGNhc3Qgd2l0 aCBDKystc3R5bGUgY2FzdC4KKwogMjAxMS0wOC0wNyAgSmFtZXMgS296aWFuc2tpICA8a296QGNo cm9taXVtLm9yZz4KIAogICAgICAgICBNYWtlIHRoZSBmdWxsc2NyZWVuIEpTIEFQSSBlbmFibGVk IGF0IHJ1bnRpbWUuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTUGFyc2VyLmNw cCBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NQYXJzZXIuY3BwCmluZGV4IDY3Nzc2Y2E1MWI4NTQ2 NjM2N2I5NmZkYTBhMDZhNGZiODNhZWFjNDAuLmY0MTJjNDY1YjM3NmY3YmQ0N2U5YzQ0ODMzY2Ri MTFiMTExOTRlMWIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NQYXJzZXIuY3Bw CisrKyBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NQYXJzZXIuY3BwCkBAIC0zMjg0LDcgKzMyODQs NyBAQCBQYXNzUmVmUHRyPENTU1ZhbHVlPiBDU1NQYXJzZXI6OnBhcnNlQW5pbWF0aW9uVGltaW5n RnVuY3Rpb24oKQogICAgICAgICBDU1NQYXJzZXJWYWx1ZSogdiA9IGFyZ3MtPmN1cnJlbnQoKTsK ICAgICAgICAgaWYgKCF2YWxpZFVuaXQodiwgRkludGVnZXIsIG1fc3RyaWN0KSkKICAgICAgICAg ICAgIHJldHVybiAwOwotICAgICAgICBudW1TdGVwcyA9IHN0YXRpY19jYXN0PGludD4obWluKHYt PmZWYWx1ZSwgKGRvdWJsZSlJTlRfTUFYKSk7CisgICAgICAgIG51bVN0ZXBzID0gY2xhbXBUb0lu dGVnZXIodi0+ZlZhbHVlKTsKICAgICAgICAgaWYgKG51bVN0ZXBzIDwgMSkKICAgICAgICAgICAg IHJldHVybiAwOwogICAgICAgICB2ID0gYXJncy0+bmV4dCgpOwpAQCAtNjMzMyw5ICs2MzMzLDcg QEAgYm9vbCBDU1NQYXJzZXI6OnBhcnNlRm9udEZlYXR1cmVUYWcoQ1NTVmFsdWVMaXN0KiBzZXR0 aW5ncykKICAgICB2YWx1ZSA9IG1fdmFsdWVMaXN0LT5uZXh0KCk7CiAgICAgaWYgKHZhbHVlKSB7 CiAgICAgICAgIGlmICh2YWx1ZS0+dW5pdCA9PSBDU1NQcmltaXRpdmVWYWx1ZTo6Q1NTX05VTUJF UiAmJiB2YWx1ZS0+aXNJbnQgJiYgdmFsdWUtPmZWYWx1ZSA+PSAwKSB7Ci0gICAgICAgICAgICB0 YWdWYWx1ZSA9IHN0YXRpY19jYXN0PGludD4odmFsdWUtPmZWYWx1ZSk7Ci0gICAgICAgICAgICBp ZiAodGFnVmFsdWUgPCAwKQotICAgICAgICAgICAgICAgIHJldHVybiBmYWxzZTsKKyAgICAgICAg ICAgIHRhZ1ZhbHVlID0gY2xhbXBUb1Bvc2l0aXZlSW50ZWdlcih2YWx1ZS0+ZlZhbHVlKTsKICAg ICAgICAgICAgIG1fdmFsdWVMaXN0LT5uZXh0KCk7CiAgICAgICAgIH0gZWxzZSBpZiAodmFsdWUt PmlkID09IENTU1ZhbHVlT24gfHwgdmFsdWUtPmlkID09IENTU1ZhbHVlT2ZmKSB7CiAgICAgICAg ICAgICB0YWdWYWx1ZSA9IHZhbHVlLT5pZCA9PSBDU1NWYWx1ZU9uOwpAQCAtNjk1Miw3ICs2OTUw LDcgQEAgV2ViS2l0Q1NTS2V5ZnJhbWVSdWxlKiBDU1NQYXJzZXI6OmNyZWF0ZUtleWZyYW1lUnVs ZShDU1NQYXJzZXJWYWx1ZUxpc3QqIGtleXMpCiAgICAgLy8gQ3JlYXRlIGEga2V5IHN0cmluZyBm cm9tIHRoZSBwYXNzZWQga2V5cwogICAgIFN0cmluZyBrZXlTdHJpbmc7CiAgICAgZm9yICh1bnNp Z25lZCBpID0gMDsgaSA8IGtleXMtPnNpemUoKTsgKytpKSB7Ci0gICAgICAgIGZsb2F0IGtleSA9 IChmbG9hdCkga2V5cy0+dmFsdWVBdChpKS0+ZlZhbHVlOworICAgICAgICBmbG9hdCBrZXkgPSBz dGF0aWNfY2FzdDxmbG9hdD4oa2V5cy0+dmFsdWVBdChpKS0+ZlZhbHVlKTsKICAgICAgICAgaWYg KGkgIT0gMCkKICAgICAgICAgICAgIGtleVN0cmluZyArPSAiLCI7CiAgICAgICAgIGtleVN0cmlu ZyArPSBTdHJpbmc6Om51bWJlcihrZXkpOwo= 103209 2011-08-07 23:56:32 -0700 2011-08-08 01:42:31 -0700 Patch V3 bug-65807-20110808155630.patch text/plain 2476 bashi U3VidmVyc2lvbiBSZXZpc2lvbjogOTI1ODEKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCBiMWQzNjdhNDZjZDhiYmI3 NDIyYjBkZTVjMjhkNDRhNWE5ODMxZDlmLi41ZjFlN2ZiODdmODk4MTM2ODdiN2FhN2U0NjQxYTFi MGVhNGFkZGJlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTkgQEAKKzIwMTEtMDgtMDcgIEtlbmlj aGkgSXNoaWJhc2hpICA8YmFzaGlAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFNob3VsZCBub3Qg dXNlIEMtc3R5bGUgY2FzdCBpbiBDU1NQYXJzZXIuY3BwCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD02NTgwNworCisgICAgICAgIFJlbW92ZSBDLXN0eWxl IGNhc3QuCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg Tm8gbmV3IHRlc3RzIGJlY2F1c2Ugbm8gYmVoYXZpb3IgY2hhbmdlLgorCisgICAgICAgICogY3Nz L0NTU1BhcnNlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpDU1NQYXJzZXI6OnBhcnNlQW5pbWF0 aW9uVGltaW5nRnVuY3Rpb24pOiBSZXBsYWNlZCBhIGNhc3Qgd2l0aCBjbGFtcFRvSW50ZWdlcigp LgorICAgICAgICAoV2ViQ29yZTo6Q1NTUGFyc2VyOjpwYXJzZUZvbnRGZWF0dXJlVGFnKTogRGl0 dG8uCisgICAgICAgIChXZWJDb3JlOjpDU1NQYXJzZXI6OmNyZWF0ZUtleWZyYW1lUnVsZSk6IFJl cGxhY2VkIGEgY2FzdCB3aXRoIEMrKy1zdHlsZSBjYXN0LgorCiAyMDExLTA4LTA3ICBKYW1lcyBL b3ppYW5za2kgIDxrb3pAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIE1ha2UgdGhlIGZ1bGxzY3Jl ZW4gSlMgQVBJIGVuYWJsZWQgYXQgcnVudGltZS4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L2Nzcy9DU1NQYXJzZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvY3NzL0NTU1BhcnNlci5jcHAKaW5k ZXggNjc3NzZjYTUxYjg1NDY2MzY3Yjk2ZmRhMGEwNmE0ZmI4M2FlYWM0MC4uMmJjNDE4MzZmMmFk ZmEyOWY4YjAzNTc2YmZmZjFiZjA2ZDQ0NTgyNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv Y3NzL0NTU1BhcnNlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvY3NzL0NTU1BhcnNlci5jcHAK QEAgLTMyODQsNyArMzI4NCw3IEBAIFBhc3NSZWZQdHI8Q1NTVmFsdWU+IENTU1BhcnNlcjo6cGFy c2VBbmltYXRpb25UaW1pbmdGdW5jdGlvbigpCiAgICAgICAgIENTU1BhcnNlclZhbHVlKiB2ID0g YXJncy0+Y3VycmVudCgpOwogICAgICAgICBpZiAoIXZhbGlkVW5pdCh2LCBGSW50ZWdlciwgbV9z dHJpY3QpKQogICAgICAgICAgICAgcmV0dXJuIDA7Ci0gICAgICAgIG51bVN0ZXBzID0gc3RhdGlj X2Nhc3Q8aW50PihtaW4odi0+ZlZhbHVlLCAoZG91YmxlKUlOVF9NQVgpKTsKKyAgICAgICAgbnVt U3RlcHMgPSBjbGFtcFRvSW50ZWdlcih2LT5mVmFsdWUpOwogICAgICAgICBpZiAobnVtU3RlcHMg PCAxKQogICAgICAgICAgICAgcmV0dXJuIDA7CiAgICAgICAgIHYgPSBhcmdzLT5uZXh0KCk7CkBA IC02MzMzLDcgKzYzMzMsNyBAQCBib29sIENTU1BhcnNlcjo6cGFyc2VGb250RmVhdHVyZVRhZyhD U1NWYWx1ZUxpc3QqIHNldHRpbmdzKQogICAgIHZhbHVlID0gbV92YWx1ZUxpc3QtPm5leHQoKTsK ICAgICBpZiAodmFsdWUpIHsKICAgICAgICAgaWYgKHZhbHVlLT51bml0ID09IENTU1ByaW1pdGl2 ZVZhbHVlOjpDU1NfTlVNQkVSICYmIHZhbHVlLT5pc0ludCAmJiB2YWx1ZS0+ZlZhbHVlID49IDAp IHsKLSAgICAgICAgICAgIHRhZ1ZhbHVlID0gc3RhdGljX2Nhc3Q8aW50Pih2YWx1ZS0+ZlZhbHVl KTsKKyAgICAgICAgICAgIHRhZ1ZhbHVlID0gY2xhbXBUb0ludGVnZXIodmFsdWUtPmZWYWx1ZSk7 CiAgICAgICAgICAgICBpZiAodGFnVmFsdWUgPCAwKQogICAgICAgICAgICAgICAgIHJldHVybiBm YWxzZTsKICAgICAgICAgICAgIG1fdmFsdWVMaXN0LT5uZXh0KCk7CkBAIC02OTUyLDcgKzY5NTIs NyBAQCBXZWJLaXRDU1NLZXlmcmFtZVJ1bGUqIENTU1BhcnNlcjo6Y3JlYXRlS2V5ZnJhbWVSdWxl KENTU1BhcnNlclZhbHVlTGlzdCoga2V5cykKICAgICAvLyBDcmVhdGUgYSBrZXkgc3RyaW5nIGZy b20gdGhlIHBhc3NlZCBrZXlzCiAgICAgU3RyaW5nIGtleVN0cmluZzsKICAgICBmb3IgKHVuc2ln bmVkIGkgPSAwOyBpIDwga2V5cy0+c2l6ZSgpOyArK2kpIHsKLSAgICAgICAgZmxvYXQga2V5ID0g KGZsb2F0KSBrZXlzLT52YWx1ZUF0KGkpLT5mVmFsdWU7CisgICAgICAgIGZsb2F0IGtleSA9IHN0 YXRpY19jYXN0PGZsb2F0PihrZXlzLT52YWx1ZUF0KGkpLT5mVmFsdWUpOwogICAgICAgICBpZiAo aSAhPSAwKQogICAgICAgICAgICAga2V5U3RyaW5nICs9ICIsIjsKICAgICAgICAga2V5U3RyaW5n ICs9IFN0cmluZzo6bnVtYmVyKGtleSk7Cg==