From 42b784ac1a0c71e7d494db68ff700101461f840f Mon Sep 17 00:00:00 2001 From: diego Date: Fri, 25 Jun 2004 16:49:53 +0000 Subject: string handling security fixes patch by Nicholas Kain, Alexander Strasser reviewed by Pontscho, Alex, Rich git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12647 b3059339-0415-0410-9bf9-f77b7e298cf2 --- osdep/Makefile | 3 ++- osdep/strl.c | 47 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 49 insertions(+), 1 deletion(-) create mode 100644 osdep/strl.c (limited to 'osdep') diff --git a/osdep/Makefile b/osdep/Makefile index d0f99220f1..9c39fddd3a 100644 --- a/osdep/Makefile +++ b/osdep/Makefile @@ -3,7 +3,8 @@ include ../config.mak LIBNAME = libosdep.a -SRCS= shmem.c strsep.c vsscanf.c scandir.c gettimeofday.c fseeko.c # timer.c +SRCS= shmem.c strsep.c strl.c vsscanf.c scandir.c gettimeofday.c fseeko.c \ + # timer.c ifeq ($(TARGET_ARCH_X86),yes) ifeq ($(TARGET_OS),Linux) diff --git a/osdep/strl.c b/osdep/strl.c new file mode 100644 index 0000000000..22e4cb56c3 --- /dev/null +++ b/osdep/strl.c @@ -0,0 +1,47 @@ +/* strl(cat|cpy) implementation for systems that do not have it in libc */ +/* strl.c - strlcpy/strlcat implementation + * Time-stamp: <2004-03-14 njk> + * (C) 2003-2004 Nicholas J. Kain + */ + +#include "../config.h" + +#ifndef HAVE_STRLCPY +unsigned int strlcpy (char *dest, char *src, unsigned int size) +{ + register unsigned int i; + + for (i=0; size > 0 && src[i] != '\0'; ++i, size--) + dest[i] = src[i]; + + dest[i] = '\0'; + + return i; +} +#endif + +#ifndef HAVE_STRLCAT +unsigned int strlcat (char *dest, char *src, unsigned int size) +{ +#if 0 + register unsigned int i, j; + + for(i=0; size > 0 && dest[i] != '\0'; size--, i++); + for(j=0; size > 0 && src[j] != '\0'; size--, i++, j++) + dest[i] = src[j]; + + dest[i] = '\0'; + return i; +#else + register char *d = dest, *s = src; + + for (; size > 0 && *d != '\0'; size--, d++); + for (; size > 0 && *s != '\0'; size--, d++, s++) + *d = *s; + + *d = '\0'; + return (d - dest) + (s - src); +#endif +} +#endif + -- cgit v1.2.3