Mercurial > sdl-ios-xcode
diff src/SDL_error.c @ 1379:c0a74f199ecf
Use only safe string functions
| author | Sam Lantinga <slouken@libsdl.org> |
|---|---|
| date | Sun, 19 Feb 2006 23:46:34 +0000 |
| parents | 19418e4422cb |
| children | d910939febfa |
line wrap: on
line diff
--- a/src/SDL_error.c Sun Feb 19 23:38:57 2006 +0000 +++ b/src/SDL_error.c Sun Feb 19 23:46:34 2006 +0000 @@ -59,8 +59,7 @@ /* Copy in the key, mark error as valid */ error = SDL_GetErrBuf(); error->error = 1; - SDL_strncpy((char *)error->key, fmt, sizeof(error->key)); - error->key[sizeof(error->key)-1] = '\0'; + SDL_strlcpy((char *)error->key, fmt, sizeof(error->key)); va_start(ap, fmt); error->argc = 0; @@ -94,8 +93,7 @@ char *str = va_arg(ap, char *); if (str == NULL) str = "(null)"; - SDL_strncpy((char *)error->args[index].buf, str, ERR_MAX_STRLEN); - error->args[index].buf[ERR_MAX_STRLEN-1] = 0; + SDL_strlcpy((char *)error->args[index].buf, str, ERR_MAX_STRLEN); error->argc++; } break; @@ -251,8 +249,7 @@ /* Allocate the UNICODE buffer */ errstr16 = (Uint16 *)SDL_malloc(maxlen * (sizeof *errstr16)); if ( ! errstr16 ) { - SDL_strncpy((char *)errstr, "Out of memory", maxlen); - errstr[maxlen-1] = '\0'; + SDL_strlcpy((char *)errstr, "Out of memory", maxlen); return(errstr); }