[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - connectivity/source

[Caolán McNamara]

 connectivity/source/drivers/dbase/DTable.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 88533219c6c64601e149dc6dffef663dc7b474bb
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Sun Jul 5 13:28:30 2015 +0100

    aDBFColumn.db_typ is input controlled
    
    so we can't guarantee that it is valid ascii
    
    Change-Id: Icdc6162db4405df729e548a836de5662255088ed
    (cherry picked from commit 7e0b90aff31bc3d1bf3775ecb5fff4e8174f6db4)
    Reviewed-on: https://gerrit.libreoffice.org/16779
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>

diff --git a/connectivity/source/drivers/dbase/DTable.cxx b/connectivity/source/drivers/dbase/DTable.cxx
index 3f05fe6..889d7cc 100644
--- a/connectivity/source/drivers/dbase/DTable.cxx
+++ b/connectivity/source/drivers/dbase/DTable.cxx
@@ -345,7 +345,7 @@ void ODbaseTable::fillColumns()
         char cType[2];
         cType[0] = aDBFColumn.db_typ;
         cType[1] = 0;
-        aTypeName = OUString::createFromAscii(cType);
+        aTypeName = OUString(cType, 1, RTL_TEXTENCODING_ASCII_US);
         SAL_INFO( "connectivity.drivers","column type: " << aDBFColumn.db_typ);
 
         switch (aDBFColumn.db_typ)