[Libreoffice-commits] core.git: solenv/bin

[Mike Kaganski (via logerrit)]

 solenv/bin/modules/installer/windows/file.pm |    3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 30f344d73a26adb543acf66979fd963d8e38fe65
Author:     Mike Kaganski <mike.kaganski at collabora.com>
AuthorDate: Fri Sep 4 18:23:38 2020 +0300
Commit:     Mike Kaganski <mike.kaganski at collabora.com>
CommitDate: Fri Sep 4 19:37:00 2020 +0200

    Avoid warnings about use of uninitialized value
    
        Use of uninitialized value $microversion in int at C:/lo/src/core/solenv/bin/modules/installer/windows/file.pm line 568.
        Use of uninitialized value $vervariant in int at C:/lo/src/core/solenv/bin/modules/installer/windows/file.pm line 568.
    
    Change-Id: I916861a34d39a796d2941f9a8d972e7a082e3b22
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102058
    Tested-by: Jenkins
    Reviewed-by: Mike Kaganski <mike.kaganski at collabora.com>

diff --git a/solenv/bin/modules/installer/windows/file.pm b/solenv/bin/modules/installer/windows/file.pm
index 61116e923b6d..100002f5ad37 100644
--- a/solenv/bin/modules/installer/windows/file.pm
+++ b/solenv/bin/modules/installer/windows/file.pm
@@ -565,6 +565,9 @@ sub get_fileversion
         if ($ttfdata =~ /(Version )?([0-9]+(\.[0-9]+)*)/i)
         {
             my ($version, $subversion, $microversion, $vervariant) = split(/\./,$2);
+            $subversion = 0 if not defined $subversion;
+            $microversion = 0 if not defined $microversion;
+            $vervariant = 0 if not defined $vervariant;
             $fileversion = int($version) . "." . int($subversion) . "." . int($microversion) . "." . int($vervariant);
         }
         else