sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-11 17:58:16 +03:00
Code

s4:ldb fix escape parsing

Browse Source 
sscanf can return also on short reads, in this case an invalid escape
sequence like '\1k' would be accepted, returning 1 as value and swallowing the
'k'. Use an auxiliar function to validate and convert hex escapes.
This commit is contained in:
Simo Sorce 2010-03-07 20:20:45 -05:00
parent 9f53820de7
commit c05d13d3c2
1 changed files with 24 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
source4/lib/ldb/common/ldb_parse.c
View File

@ -43,6 +43,26 @@
#include "ldb_private.h"
#include "system/locale.h"
static int ldb_parse_hex2char(const char *x)
{
if (isxdigit(x[0]) && isxdigit(x[1])) {
const char h1 = x[0], h2 = x[1];
int c;
if (h1 >= 'a') c = h1 - (int)'a' + 10;
else if (h1 >= 'A') c = h1 - (int)'A' + 10;
else if (h1 >= '0') c = h1 - (int)'0';
c = c << 4;
if (h2 >= 'a') c += h2 - (int)'a' + 10;
else if (h1 >= 'A') c += h2 - (int)'A' + 10;
else if (h1 >= '0') c += h2 - (int)'0';
return c;
}
return -1;
}
/*
a filter is defined by:
<filter> ::= '(' <filtercomp> ')'
@ -71,8 +91,10 @@ struct ldb_val ldb_binary_decode(void *mem_ctx, const char *str)
for (i=j=0;i<slen;i++) {
if (str[i] == '\\') {
unsigned c;
if (sscanf(&str[i+1], "%02X", &c) != 1) {
int c;
c = ldb_parse_hex2char(&str[i+1]);
if (c == -1) {
talloc_free(ret.data);
memset(&ret, 0, sizeof(ret));
return ret;