Received: from malur.postgresql.org ([217.196.149.56]) by arkaria.postgresql.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.89) (envelope-from ) id 1hiEzC-00006o-Vy for pgadmin-hackers@arkaria.postgresql.org; Tue, 02 Jul 2019 09:22:03 +0000 Received: from localhost ([127.0.0.1] helo=malur.postgresql.org) by malur.postgresql.org with esmtp (Exim 4.89) (envelope-from ) id 1hiEzA-0002aH-SJ for pgadmin-hackers@arkaria.postgresql.org; Tue, 02 Jul 2019 09:22:00 +0000 Received: from magus.postgresql.org ([2a02:c0:301:0:ffff::29]) by malur.postgresql.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.89) (envelope-from ) id 1hiEzA-0002aA-KS for pgadmin-hackers@lists.postgresql.org; Tue, 02 Jul 2019 09:22:00 +0000 Received: from mail-lj1-x229.google.com ([2a00:1450:4864:20::229]) by magus.postgresql.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.89) (envelope-from ) id 1hiEz6-0001ml-Ur for pgadmin-hackers@postgresql.org; Tue, 02 Jul 2019 09:21:59 +0000 Received: by mail-lj1-x229.google.com with SMTP id v24so16114213ljg.13 for ; Tue, 02 Jul 2019 02:21:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=enterprisedb-com.20150623.gappssmtp.com; s=20150623; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=8Bp5gXgaxuc8aDuRH+xjpFuA9OlXgEqVhtZywEGBwcU=; b=00ZJV/lmf/y+V9ETfPdHESTQ22Br9bC0k3v5gb2faRqTOOuU/Tn3T2detDdyU8xaCH gRpJNLExG+Tp8jyl6FqBGg1g02oyufkPQf0sz1yo7CvLtGhsz+wIQx79CBYgjWmSXAIh kL3l1Z6U3L/O9Ehds5Xo8AMCaQiOFP1osCLcLw7yDso0GTqphRZoNpde+7Vhr9novhfi //D1VG9X67ldzSaU71nNWsv1eKqqMOedeJt+vBpexHHGKAeb0ZnQaPclG4KouPlMD8vf fM2yTj5SQdpOS9xvlKbURZP4MI8O/KuMg6K1efIw7bx6dA/OLez177uB28y6bxLGf2Sv HcoA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=8Bp5gXgaxuc8aDuRH+xjpFuA9OlXgEqVhtZywEGBwcU=; b=fzSmqzeZ/9tNXfzMB6W5sauSRNgoJ+R8z29NcIVdw8NcVaCGUC+q3b1cJpB2m8XkV/ PAywD2tdo9OWwR1v7l6Q+XB2EDyUP8EAkLnXITN1ajpaqsW10flNB75i+tSnGH8UkAoo AyfVZ6b5ze2Kp5LmS3zjErPRyFcSsoQqVjThQY10UEeCt1LhtrswHrMCxroptnq5Ok3A L2xrsEC7qYCKilCq0Nn7tXASWLD7bNyRiA9dTo/VLygYAdH+tWWn8SAzCX7BIUonWMWp xqZ8B6od07SvmHUOvTXh77hj3xCpSXnc6WpKTuWegIY/f0Vx8Bv9QiMmxP6oRe1Kspd8 rm9w== X-Gm-Message-State: APjAAAWXuv2Y8DUvQZMNPjAr+IR3X8deMIee7GnIgMorFMhkAcFioF3T 0Bq2NzLBCoNsOHMW9VoW5G7m5D/qutNH+5910dJ3WA== X-Google-Smtp-Source: APXvYqwlszPIpPJEWBfyvK4OkAP39ohrMHHfYzHX1Ksajap4ForYtpjwel7s7qs6269K/BcMXpdUeiqHwuioyo6DIDY= X-Received: by 2002:a2e:b003:: with SMTP id y3mr16981419ljk.72.1562059315050; Tue, 02 Jul 2019 02:21:55 -0700 (PDT) MIME-Version: 1.0 References: In-Reply-To: From: Aditya Toshniwal Date: Tue, 2 Jul 2019 14:51:18 +0530 Message-ID: Subject: Re: [pgAdmin][RM4421] Inno setup script version compare fix To: Akshay Joshi Cc: pgadmin-hackers Content-Type: multipart/mixed; boundary="00000000000097b3b2058caf46be" List-Id: List-Help: List-Subscribe: List-Post: List-Owner: List-Archive: Precedence: bulk --00000000000097b3b2058caf46be Content-Type: multipart/alternative; boundary="00000000000097b3af058caf46bc" --00000000000097b3af058caf46bc Content-Type: text/plain; charset="UTF-8" Hi Hackers, Attached is the updated patch. Instead of float comparison, string comparison is done now with the help of a nice article here - http://www.arvydas.co.uk/2015/04/compare-version-strings-with-innosetup/ Kindly review. On Tue, Jul 2, 2019 at 2:34 PM Akshay Joshi wrote: > Hi Aditya > > I have asked Paresh to review the patch, he has given some review > comments. Please fix those and the updated patch asap. > > On Tue, Jul 2, 2019 at 1:38 PM Aditya Toshniwal < > aditya.toshniwal@enterprisedb.com> wrote: > >> Hi Hackers, >> >> Attached is the patch to fix a potential issue where version compare >> while upgrading will be incorrect. Currently, it is comparing strings. So >> while comparing '4.9' and '4.10' it will consider '4.9' as greater. >> The patch will convert the values to float and compare. >> >> Kindly review. >> >> -- >> Thanks and Regards, >> Aditya Toshniwal >> Software Engineer | EnterpriseDB India | Pune >> "Don't Complain about Heat, Plant a TREE" >> > > > -- > *Thanks & Regards* > *Akshay Joshi* > > *Sr. Software Architect* > *EnterpriseDB Software India Private Limited* > *Mobile: +91 976-788-8246* > -- Thanks and Regards, Aditya Toshniwal Software Engineer | EnterpriseDB India | Pune "Don't Complain about Heat, Plant a TREE" --00000000000097b3af058caf46bc Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable
Hi Hackers,

Attached is the updated patch. Instead of floa= t comparison, string comparison is done now with the help of a nice article= here -=C2=A0http://www.arvydas.co.uk/2015/04/compare-version-str= ings-with-innosetup/

Kindly review.

On Tue, Jul 2, 2019 at 2:= 34 PM Akshay Joshi <aks= hay.joshi@enterprisedb.com> wrote:
Hi Aditya=C2=A0

I have asked Paresh to review the patch, he has given some review commen= ts. Please fix those and the updated patch asap.=C2=A0=C2=A0
On Tue, J= ul 2, 2019 at 1:38 PM Aditya Toshniwal <aditya.toshniwal@enterprisedb.com> wrote:
Hi Hackers,

Attached is the patch to fix a potential issue wh= ere version compare while upgrading will be incorrect. Currently, it is com= paring strings. So while comparing '4.9' and '4.10' it will= consider '4.9' as greater.
The patch will convert the values to fl= oat and compare.

Kindly review.

--
Thanks and Regar= ds,
Aditya Toshniwal
Software E= ngineer |=C2=A0EnterpriseDB India |=C2=A0Pune
"Don't Complain about Heat, Plant a= TREE"


--
<= div>Thanks & Rega= rds
Akshay Joshi
Sr. Software Architect
=
EnterpriseDB Software India Private Limited<= /b>
Mobile: +91 976-788-8246
=


--
Adi= tya Toshniwal
Software Engineer |=C2=A0EnterpriseDB India |=C2=A0Pune
"Don't Complain a= bout Heat, Plant a TREE"
--00000000000097b3af058caf46bc-- --00000000000097b3b2058caf46be Content-Type: application/octet-stream; name="win.ver_compare_v2.patch" Content-Disposition: attachment; filename="win.ver_compare_v2.patch" Content-Transfer-Encoding: base64 Content-ID: X-Attachment-Id: f_jxllr2rb0 ZGlmZiAtLWdpdCBhL3BrZy93aW4zMi9pbnN0YWxsZXIuaXNzLmluIGIvcGtnL3dpbjMyL2luc3Rh bGxlci5pc3MuaW4KaW5kZXggMjk5ZDdlMjcuLjQ1NDZmZGY0IDEwMDY0NAotLS0gYS9wa2cvd2lu MzIvaW5zdGFsbGVyLmlzcy5pbgorKysgYi9wa2cvd2luMzIvaW5zdGFsbGVyLmlzcy5pbgpAQCAt NjQsNiArNjQsODEgQEAgUm9vdDogSEtMTTsgU3Via2V5OiAiU29mdHdhcmVceyNNeUFwcE5hbWV9 XHsjTXlBcHBWZXJzaW9ufSI7IFZhbHVlVHlwZTogc3RyaW5nOwogdmFyCiAgIFVwZ3JhZGVNb2Rl OiBCb29sZWFuOwogCisvLyBQcm9jZWR1cmUgdG8gc3BsaXQgYSBzdHJpbmcgaW50byBhbiBhcnJh eSBvZiBpbnRlZ2VycworcHJvY2VkdXJlIEV4cGxvZGUodmFyIERlc3Q6IFRBcnJheU9mSW50ZWdl cjsgVGV4dDogU3RyaW5nOyBTZXBhcmF0b3I6IFN0cmluZyk7Cit2YXIKKyAgaSwgcDogSW50ZWdl cjsKK2JlZ2luCisgIGkgOj0gMDsKKyAgcmVwZWF0CisgICAgU2V0QXJyYXlMZW5ndGgoRGVzdCwg aSsxKTsKKyAgICBwIDo9IFBvcyhTZXBhcmF0b3IsVGV4dCk7CisgICAgaWYgcCA+IDAgdGhlbiBi ZWdpbgorICAgICAgRGVzdFtpXSA6PSBTdHJUb0ludChDb3B5KFRleHQsIDEsIHAtMSkpOworICAg ICAgVGV4dCA6PSBDb3B5KFRleHQsIHAgKyBMZW5ndGgoU2VwYXJhdG9yKSwgTGVuZ3RoKFRleHQp KTsKKyAgICAgIGkgOj0gaSArIDE7CisgICAgZW5kIGVsc2UgYmVnaW4KKyAgICAgIERlc3RbaV0g Oj0gU3RyVG9JbnQoVGV4dCk7CisgICAgICBUZXh0IDo9ICcnOworICAgIGVuZDsKKyAgdW50aWwg TGVuZ3RoKFRleHQpPTA7CitlbmQ7CisKKy8vIEZ1bmN0aW9uIGNvbXBhcmVzIHZlcnNpb24gc3Ry aW5ncyBudW1lcmljYWxseToKKy8vICAgICAqIHdoZW4gdjEgPSB2MiwgcmVzdWx0ID0gMAorLy8g ICAgICogd2hlbiB2MSA8IHYyLCByZXN1bHQgPSAtMQorLy8gICAgICogd2hlbiB2MSA+IHYyLCBy ZXN1bHQgPSAxCisvLworLy8gU3VwcG9ydHMgdmVyc2lvbiBudW1iZXJzIHdpdGggdHJhaWxpbmcg emVyb2VzLCBmb3IgZXhhbXBsZSAxLjAyLjA1LgorLy8gU3VwcG9ydHMgY29tcGFyaXNvbiBvZiB0 d28gdmVyc2lvbiBudW1iZXIgb2YgZGlmZmVyZW50IGxlbmd0aHMsIGZvciBleGFtcGxlCisvLyAg ICAgQ29tcGFyZVZlcnNpb25zKCcxLjInLCAnMi4wLjMnKQorLy8gV2hlbiBhbnkgb2YgdGhlIHBh cmFtZXRlcnMgaXMgJycgKGVtcHR5IHN0cmluZykgaXQgY29uc2lkZXJzIHZlcnNpb24gbnVtYmVy IGFzIDAKK2Z1bmN0aW9uIENvbXBhcmVWZXJzaW9ucyh2MTogU3RyaW5nOyB2MjogU3RyaW5nKTog SW50ZWdlcjsKK3ZhcgorICB2MXBhcnRzOiBUQXJyYXlPZkludGVnZXI7CisgIHYycGFydHM6IFRB cnJheU9mSW50ZWdlcjsKKyAgaTogSW50ZWdlcjsKK2JlZ2luCisgIGlmIHYxID0gJycgdGhlbgor ICBiZWdpbgorICAgIHYxIDo9ICcwJzsKKyAgZW5kOworCisgIGlmIHYyID0gJycgdGhlbgorICBi ZWdpbgorICAgIHYyIDo9ICcwJzsKKyAgZW5kOworCisgIEV4cGxvZGUodjFwYXJ0cywgdjEsICcu Jyk7CisgIEV4cGxvZGUodjJwYXJ0cywgdjIsICcuJyk7CisKKyAgaWYgKEdldEFycmF5TGVuZ3Ro KHYxcGFydHMpID4gR2V0QXJyYXlMZW5ndGgodjJwYXJ0cykpIHRoZW4KKyAgYmVnaW4KKyAgICBT ZXRBcnJheUxlbmd0aCh2MnBhcnRzLCBHZXRBcnJheUxlbmd0aCh2MXBhcnRzKSkKKyAgZW5kIGVs c2UgaWYgKEdldEFycmF5TGVuZ3RoKHYycGFydHMpID4gR2V0QXJyYXlMZW5ndGgodjFwYXJ0cykp IHRoZW4KKyAgYmVnaW4KKyAgICBTZXRBcnJheUxlbmd0aCh2MXBhcnRzLCBHZXRBcnJheUxlbmd0 aCh2MnBhcnRzKSkKKyAgZW5kOworCisgIGZvciBpIDo9IDAgdG8gR2V0QXJyYXlMZW5ndGgodjFw YXJ0cykgLSAxIGRvCisgIGJlZ2luCisgICAgaWYgdjFwYXJ0c1tpXSA+IHYycGFydHNbaV0gdGhl bgorICAgIGJlZ2luCisgICAgICB7IHYxIGlzIGdyZWF0ZXIgfQorICAgICAgUmVzdWx0IDo9IDE7 CisgICAgICBleGl0OworICAgIGVuZCBlbHNlIGlmIHYxcGFydHNbaV0gPCB2MnBhcnRzW2ldIHRo ZW4KKyAgICBiZWdpbgorICAgICAgeyB2MiBpcyBncmVhdGVyIH0KKyAgICAgIFJlc3VsdCA6PSAt MTsKKyAgICAgIGV4aXQ7CisgICAgZW5kOworICBlbmQ7CisKKyAgeyBBcmUgRXF1YWwgfQorICBS ZXN1bHQgOj0gMDsKK2VuZDsKKwogZnVuY3Rpb24gSXNQYXRoVmFsaWQoUGF0aDogc3RyaW5nKTog Qm9vbGVhbjsKIHZhcgogICBJOiBJbnRlZ2VyOwpAQCAtMTAzLDcgKzE3OCw3IEBAIGJlZ2luCiAg IGJlZ2luCiAJVXBncmFkZU1vZGUgOj0gVHJ1ZTsKICAgICBSZWdRdWVyeVN0cmluZ1ZhbHVlKEhL RVlfTE9DQUxfTUFDSElORSwnU29mdHdhcmVceyNNeUFwcE5hbWV9XHsjTXlBcHBWZXJzaW9ufScs ICdWZXJzaW9uJywgVmVyc2lvbik7Ci0gICAgaWYgVmVyc2lvbiA+ICd7I015QXBwRnVsbFZlcnNp b259JyB0aGVuCisgICAgaWYgQ29tcGFyZVZlcnNpb25zKFZlcnNpb24sICd7I015QXBwRnVsbFZl cnNpb259JykgPSAtMSB0aGVuCiAgICAgYmVnaW4KICAgICAgIE1zZ0JveChFeHBhbmRDb25zdGFu dCgne2NtOk5ld2VyVmVyc2lvbkV4aXN0c30nICsgJyh2JyArIFZlcnNpb24gKyAnKSBpcyBhbHJl YWR5IGluc3RhbGxlZCcgKSwgbWJJbmZvcm1hdGlvbiwgTUJfT0spOwogICAgICAgUmVzdWx0IDo9 IEZhbHNlOwo= --00000000000097b3b2058caf46be--