sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-03-30 06:50:24 +03:00
Code

libsmb: Use hex_byte() in urldecode_talloc()

Browse Source 
Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
This commit is contained in:
Volker Lendecke 2021-01-04 14:16:32 +01:00 committed by Jeremy Allison
parent 6aa672a41c
commit d0eaa14325
1 changed files with 15 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
source3/libsmb/libsmb_path.c
View File

@ -27,19 +27,6 @@
#include "libsmb_internal.h"
/* Used by urldecode_talloc() */
static int
hex2int( unsigned int _char )
{
if ( _char >= 'A' && _char <='F')
return _char - 'A' + 10;
if ( _char >= 'a' && _char <='f')
return _char - 'a' + 10;
if ( _char >= '0' && _char <='9')
return _char - '0';
return -1;
}
/*
* smbc_urldecode()
* and urldecode_talloc() (internal fn.)
@ -70,13 +57,10 @@ urldecode_talloc(TALLOC_CTX *ctx, char **pp_dest, const char *src)
unsigned char character = src[i++];
if (character == '%') {
int a = i+1 < old_length ? hex2int(src[i]) : -1;
int b = i+1 < old_length ? hex2int(src[i+1]) : -1;
/* Replace valid sequence */
if (a != -1 && b != -1) {
/* Replace valid %xx sequence with %dd */
character = (a * 16) + b;
uint8_t v;
bool ok = hex_byte(&src[i], &v);
if (ok) {
character = v;
if (character == '\0') {
break; /* Stop at %00 */
}
@ -98,20 +82,17 @@ urldecode_talloc(TALLOC_CTX *ctx, char **pp_dest, const char *src)
unsigned char character = src[i++];
if (character == '%') {
int a = i+1 < old_length ? hex2int(src[i]) : -1;
int b = i+1 < old_length ? hex2int(src[i+1]) : -1;
/* Replace valid sequence */
if (a != -1 && b != -1) {
/* Replace valid %xx sequence with %dd */
character = (a * 16) + b;
if (character == '\0') {
break; /* Stop at %00 */
}
i += 2;
} else {
err_count++;
}
uint8_t v;
bool ok = hex_byte(&src[i], &v);
if (ok) {
character = v;
if (character == '\0') {
break; /* Stop at %00 */
}
i += 2;
} else {
err_count++;
}
}
*p++ = character;
}