zawz/ztd
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

filedat: Fixed quoting discard causing errors on copy

Browse source
This commit is contained in:
zawz 2019-08-16 14:16:25 +02:00
parent 06b868375b
commit bc2a0439fa
1 changed files with 17 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
src/filedat.cpp
View file

@ -220,36 +220,36 @@ static std::string _getname(const char* in, const int in_size, int* start, int*
} }
if(in[i] == '\"') //"" val if(in[i] == '\"') //"" val
{ {
i++;
*start=i; //value starts *start=i; //value starts
j=0; //size j=1; //size
while(i+j < in_size && in[i+j]!='\"') while(i+j < in_size && in[i+j]!='\"')
{ {
if(in[i]+j=='\\') if(in[i+j]=='\\')
j++; j++;
j++; j++;
} }
if(i+j >= in_size) // no closing " if(i+j >= in_size) // no closing "
throw ztd::format_error("Double quote does not close", "", std::string(in, in_size), i-1); throw ztd::format_error("Double quote does not close", "", std::string(in, in_size), i-1);
j++;
*val_size=j; *val_size=j;
*end=i+j+1; *end=i+j;
return name; return name;
} }
if(in[i] == '\'') //"" val if(in[i] == '\'') //"" val
{ {
i++;
*start=i; //value starts *start=i; //value starts
j=0; //size j=1; //size
while(i+j < in_size && in[i+j]!='\'') while(i+j < in_size && in[i+j]!='\'')
{ {
if(in[i]+j=='\\') if(in[i+j]=='\\')
j++; j++;
j++; j++;
} }
if(i+j >= in_size) // no closing ' if(i+j >= in_size) // no closing '
throw ztd::format_error("Single quote does not close", "", std::string(in, in_size), i-1); throw ztd::format_error("Single quote does not close", "", std::string(in, in_size), i-1);
j++;
*val_size=j; *val_size=j;
*end=i+j+1; *end=i+j;
return name; return name;
} }
if(in[i] == '{') if(in[i] == '{')
@ -353,33 +353,33 @@ static std::string _getlist(const char* in, const int in_size, int* start, int*
int j=0; int j=0;
if(in[i] == '\"') //"" val if(in[i] == '\"') //"" val
{ {
i++; j=1; //size
j=0; //size
while(i+j < in_size && in[i+j]!='\"') while(i+j < in_size && in[i+j]!='\"')
{ {
if(in[i]+j=='\\') if(in[i+j]=='\\')
j++; j++;
j++; j++;
} }
if(i+j >= in_size) // no closing " if(i+j >= in_size) // no closing "
throw ztd::format_error("Double quote does not close", "", std::string(in, in_size), i-1); throw ztd::format_error("Double quote does not close", "", std::string(in, in_size), i-1);
j++;
ret = std::string(in+i, j); ret = std::string(in+i, j);
*end=i+j+1; *end=i+j;
} }
else if(in[i] == '\'') //"" val else if(in[i] == '\'') //"" val
{ {
i++; j=1; //size
j=0; //size
while(i+j < in_size && in[i+j]!='\'') while(i+j < in_size && in[i+j]!='\'')
{ {
if(in[i]+j=='\\') if(in[i+j]=='\\')
j++; j++;
j++; j++;
} }
if(i+j >= in_size) // no closing ' if(i+j >= in_size) // no closing '
throw ztd::format_error("Single quote does not close", "", std::string(in, in_size), i-1); throw ztd::format_error("Single quote does not close", "", std::string(in, in_size), i-1);
j++;
ret = std::string(in+i, j); ret = std::string(in+i, j);
*end=i+j+1; *end=i+j;
} }
else if(in[i] == '{') else if(in[i] == '{')
{ {
@ -656,6 +656,7 @@ std::string ztd::chunkdat::strval(unsigned int alignment, std::string const& ali
if(this->type()==ztd::chunk_abstract::string) if(this->type()==ztd::chunk_abstract::string)
{ {
ztd::chunk_string* vp = dynamic_cast<chunk_string*>(m_achunk); ztd::chunk_string* vp = dynamic_cast<chunk_string*>(m_achunk);
return vp->val; return vp->val;
} }
else if(this->type()==ztd::chunk_abstract::map) else if(this->type()==ztd::chunk_abstract::map)