Kaydet (Commit) 91731a86 authored tarafından Takeshi Abe's avatar Takeshi Abe Kaydeden (comit) Caolán McNamara

tdf#119890 Lookup XDG_(DOCUMENTS|TEMPLATES)_DIR correctly

... for My Documents and My Templates.

It seems customary to name XDG_*_DIR in all uppercase.  This also
fixes buffer overrun IIUC, as osl_readLine() does not return the
newline delimiter.

Change-Id: If85ca7e6abe663e29d36b65a08d358d3d7d27c4b
Reviewed-on: https://gerrit.libreoffice.org/67741
Tested-by: Jenkins
Reviewed-by: 's avatarCaolán McNamara <caolanm@redhat.com>
Tested-by: 's avatarCaolán McNamara <caolanm@redhat.com>
üst 01da3c15
......@@ -129,6 +129,7 @@ void Default::setPropertyValue(OUString const &, css::uno::Any const &)
OUString xdg_user_dir_lookup (const char *type)
{
size_t nLenType = strlen(type);
char *config_home;
char *p;
bool bError = false;
......@@ -161,11 +162,10 @@ OUString xdg_user_dir_lookup (const char *type)
rtl::ByteSequence seq;
while (osl_File_E_None == osl_readLine(handle , reinterpret_cast<sal_Sequence **>(&seq)))
{
/* Remove newline at end */
int relative = 0;
int len = seq.getLength();
if(len>0 && seq[len-1] == '\n')
seq[len-1] = 0;
seq.realloc(len + 1);
seq[len] = 0;
p = reinterpret_cast<char *>(seq.getArray());
while (*p == ' ' || *p == '\t')
......@@ -173,9 +173,9 @@ OUString xdg_user_dir_lookup (const char *type)
if (strncmp (p, "XDG_", 4) != 0)
continue;
p += 4;
if (strncmp (p, type, strlen (type)) != 0)
if (strncmp (p, OString(type, nLenType).toAsciiUpperCase().getStr(), nLenType) != 0)
continue;
p += strlen (type);
p += nLenType;
if (strncmp (p, "_DIR", 4) != 0)
continue;
p += 4;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment