NorwayFun
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

safe strncpy. 

SVN revision: 55651
This commit is contained in:
Carsten Haitzler 2010-12-20 06:42:03 +00:00
parent 53a768b573
commit c1a90b065a
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
legacy/elementary/src/lib/elm_util.c
View File

@ -4,6 +4,13 @@
#include <Elementary.h>
#include "elm_priv.h"
static char *
_str_ncpy(char *dest, const char *src, size_t count)
{
if ((!dest) || (!src)) return NULL;
return strncpy(dest, src, count);
}
static char *
_str_append(char *str, const char *txt, int *len, int *alloc)
{
@ -51,7 +58,7 @@ _elm_util_mkup_to_text(const char *mkup)
ttag = malloc(tag_end - tag_start);
if (ttag)
{
strncpy(ttag, tag_start + 1, tag_end - tag_start - 1);
_str_ncpy(ttag, tag_start + 1, tag_end - tag_start - 1);
ttag[tag_end - tag_start - 1] = 0;
if (!strcmp(ttag, "br"))
str = _str_append(str, "\n", &str_len, &str_alloc);
@ -75,7 +82,7 @@ _elm_util_mkup_to_text(const char *mkup)
if (ts)
{
const char *esc;
strncpy(ts, esc_start, esc_end - esc_start);
_str_ncpy(ts, esc_start, esc_end - esc_start);
ts[esc_end - esc_start] = 0;
esc = evas_textblock_escape_string_get(ts);
if (esc)
@ -89,7 +96,7 @@ _elm_util_mkup_to_text(const char *mkup)
ts = malloc(p - s + 1);
if (ts)
{
strncpy(ts, s, p - s);
_str_ncpy(ts, s, p - s);
ts[p - s] = 0;
str = _str_append(str, ts, &str_len, &str_alloc);
free(ts);
@ -106,7 +113,7 @@ _elm_util_mkup_to_text(const char *mkup)
ts = malloc(p - s + 1);
if (ts)
{
strncpy(ts, s, p - s);
_str_ncpy(ts, s, p - s);
ts[p - s] = 0;
str = _str_append(str, ts, &str_len, &str_alloc);
free(ts);
@ -131,7 +138,7 @@ _elm_util_mkup_to_text(const char *mkup)
ts = malloc(p - s + 1);
if (ts)
{
strncpy(ts, s, p - s);
_str_ncpy(ts, s, p - s);
ts[p - s] = 0;
str = _str_append(str, ts, &str_len, &str_alloc);
free(ts);
@ -181,7 +188,7 @@ _elm_util_text_to_mkup(const char *text)
{
char tstr[16];
strncpy(tstr, text + pos, pos2 - pos);
_str_ncpy(tstr, text + pos, pos2 - pos);
tstr[pos2 - pos] = 0;
str = _str_append(str, tstr, &str_len, &str_alloc);
}