beco/lib11sht
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

IMPROVES-i5 partial fix on asciify() buffer size dst_size

Browse Source
This commit is contained in:
Ruben Carlo Benante
2026-05-22 20:20:34 -03:00
parent af355f2661
commit aabab06352
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
lib11sht.c
View File

@@ -17,7 +17,7 @@
/* Internal helpers — kept private to this translation unit. */ /* Internal helpers — kept private to this translation unit. */
static int uselesschar(int c); static int uselesschar(int c);
static void trim(char *s); static void trim(char *s);
static void asciify(const char *src, char *dest); static void asciify(const char *src, char *dest, size_t dest_size);
static int ulen(unsigned char c); static int ulen(unsigned char c);
static float shit11(char *s1, char *s2); static float shit11(char *s1, char *s2);
static float fmin3(float a, float b, float c); static float fmin3(float a, float b, float c);
@@ -57,8 +57,8 @@ int sequal_full(char *a, char *b, float shold, float *ratio, char *s1, char *s2)
} }
/* remove accents */ /* remove accents */
asciify(a, s1); asciify(a, s1, LEVN_SBUFF);
asciify(b, s2); asciify(b, s2, LEVN_SBUFF);
/* trim spaces (leading, trailing, and internal collapse) */ /* trim spaces (leading, trailing, and internal collapse) */
trim(s1); trim(s1);
@@ -192,7 +192,7 @@ static int ulen(unsigned char c)
} }
/* ---------------------------------------------------------------------- */ /* ---------------------------------------------------------------------- */
static void asciify(const char *src, char *dest) static void asciify(const char *src, char *dest, size_t dest_size)
{ {
int len, i, k, j, found; int len, i, k, j, found;
char ch[5]; /* UTF8 multibyte char */ char ch[5]; /* UTF8 multibyte char */
@@ -210,7 +210,7 @@ static void asciify(const char *src, char *dest)
"ª","º","Ç","ç","Ñ", "ñ","¹","²","³", "ª","º","Ç","ç","Ñ", "ñ","¹","²","³",
"\xC2\xA0"}; /* NBSP */ "\xC2\xA0"}; /* NBSP */
if(!src || !dest) if(!src || !dest || dest_size == 0)
return; return;
if(*src=='\0') if(*src=='\0')
{ {
@@ -219,7 +219,8 @@ static void asciify(const char *src, char *dest)
} }
j=i=0; j=i=0;
while(src[i]!='\0' && i < LEVN_SBUFF) /* leave room for the final NUL: writes capped at dest_size-1 */
while(src[i]!='\0' && i < LEVN_SBUFF && j < (int)dest_size - 1)
{ {
if(((unsigned char)src[i] & 0xc0) == 0x80) /* non ASCII, UTF continuation char */ if(((unsigned char)src[i] & 0xc0) == 0x80) /* non ASCII, UTF continuation char */
{ {