[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - vcl/opengl

Tor Lillqvist tml at collabora.com
Wed Jan 6 23:59:19 PST 2016


 vcl/opengl/win/WinDeviceInfo.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit b2aabba59ee41f51980fe801c7e8a50bb6fcbca2
Author: Tor Lillqvist <tml at collabora.com>
Date:   Tue Jan 5 15:29:23 2016 +0200

    Avoid indexing out of array bounds
    
    Change-Id: I65022f30e21cb94fc8c653ef8e2797da3746875c
    (cherry picked from commit d12dcbcb61b1818c7ea58650fc06bf4aa04057cf)

diff --git a/vcl/opengl/win/WinDeviceInfo.cxx b/vcl/opengl/win/WinDeviceInfo.cxx
index 99bc7a2..e1d86a1 100644
--- a/vcl/opengl/win/WinDeviceInfo.cxx
+++ b/vcl/opengl/win/WinDeviceInfo.cxx
@@ -292,7 +292,7 @@ bool SplitDriverVersion(const char *aSource, char *aAStr, char *aBStr, char *aCS
 
     for (int i = 0; i < len; i++)
     {
-        if (destIdx > ArrayLength(dest))
+        if (destIdx >= ArrayLength(dest))
         {
             // Invalid format found. Ensure we don't access dest beyond bounds.
             return false;


More information about the Libreoffice-commits mailing list