TSG-21649 修复client_administrative_area字段乱码问题以及Edit Element处理多json问题
This commit is contained in:
@@ -658,6 +658,7 @@ finish:
|
||||
|
||||
size_t format_multidelete_json_type(const char * in, size_t in_sz, const struct edit_element_rule * rules, char** out)
|
||||
{
|
||||
int match=0;
|
||||
char *new_out=NULL, *pre_out=NULL;
|
||||
char * tmp = ALLOC(char, in_sz+1);
|
||||
char * token = NULL, * sub_token = NULL, * saveptr = NULL;
|
||||
@@ -685,10 +686,25 @@ size_t format_multidelete_json_type(const char * in, size_t in_sz, const struct
|
||||
memcpy(new_out+new_out_len, "\r\n", 2);
|
||||
new_out_len +=2;
|
||||
FREE(&pre_out);
|
||||
match++;
|
||||
}
|
||||
else
|
||||
{
|
||||
memcpy(new_out+new_out_len, sub_token, strlen(sub_token));
|
||||
new_out_len += strlen(sub_token);
|
||||
memcpy(new_out+new_out_len, "\r\n", 2);
|
||||
new_out_len +=2;
|
||||
}
|
||||
}
|
||||
|
||||
if(new_out)
|
||||
if(match == 0 && new_out != NULL)
|
||||
{
|
||||
free(new_out);
|
||||
new_out=NULL;
|
||||
*out = new_out;
|
||||
output_size = 0;
|
||||
}
|
||||
else if(new_out)
|
||||
{
|
||||
*out = new_out;
|
||||
output_size = strlen(new_out);
|
||||
|
||||
Reference in New Issue
Block a user