mirror of
https://github.com/sheumann/hush.git
synced 2025-01-03 00:31:16 +00:00
Allow hex escape sequences
This commit is contained in:
parent
4f807a84c5
commit
380919905c
@ -22,35 +22,42 @@
|
|||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
#include <string.h>
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include <limits.h>
|
#include <limits.h>
|
||||||
|
#include <ctype.h>
|
||||||
#include "libbb.h"
|
#include "libbb.h"
|
||||||
|
|
||||||
|
#define isodigit(c) ((c) >= '0' && (c) <= '7')
|
||||||
|
#define hextobin(c) ((c)>='a'&&(c)<='f' ? (c)-'a'+10 : (c)>='A'&&(c)<='F' ? (c)-'A'+10 : (c)-'0')
|
||||||
|
#define octtobin(c) ((c) - '0')
|
||||||
char bb_process_escape_sequence(const char **ptr)
|
char bb_process_escape_sequence(const char **ptr)
|
||||||
{
|
{
|
||||||
|
const char *p, *q;
|
||||||
|
unsigned int num_digits, r, n, hexescape;
|
||||||
static const char charmap[] = {
|
static const char charmap[] = {
|
||||||
'a', 'b', 'f', 'n', 'r', 't', 'v', '\\', 0,
|
'a', 'b', 'f', 'n', 'r', 't', 'v', '\\', 0,
|
||||||
'\a', '\b', '\f', '\n', '\r', '\t', '\v', '\\', '\\' };
|
'\a', '\b', '\f', '\n', '\r', '\t', '\v', '\\', '\\' };
|
||||||
|
|
||||||
const char *p;
|
n = r = hexescape = num_digits = 0;
|
||||||
const char *q;
|
|
||||||
unsigned int num_digits;
|
|
||||||
unsigned int r;
|
|
||||||
unsigned int n;
|
|
||||||
|
|
||||||
n = 0;
|
|
||||||
q = *ptr;
|
q = *ptr;
|
||||||
|
|
||||||
num_digits = 0;
|
if (*q == 'x') {
|
||||||
|
hexescape++;
|
||||||
|
++q;
|
||||||
|
}
|
||||||
|
|
||||||
do {
|
do {
|
||||||
if (((unsigned int)(*q - '0')) <= 7) {
|
if (hexescape && isxdigit(*q)) {
|
||||||
r = n * 8 + (*q - '0');
|
r = n * 16 + hextobin(*q);
|
||||||
if (r <= UCHAR_MAX) {
|
} else if (isodigit(*q)) {
|
||||||
n = r;
|
r = n * 8 + octtobin(*q);
|
||||||
++q;
|
}
|
||||||
if (++num_digits < 3) {
|
if (r <= UCHAR_MAX) {
|
||||||
continue;
|
n = r;
|
||||||
}
|
++q;
|
||||||
|
if (++num_digits < 3) {
|
||||||
|
continue;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
Loading…
Reference in New Issue
Block a user