diff options
| author | Aaron Brashears <aaronb@lindenlab.com> | 2007-02-02 17:28:58 +0000 |
|---|---|---|
| committer | Aaron Brashears <aaronb@lindenlab.com> | 2007-02-02 17:28:58 +0000 |
| commit | 305c74d5163c5e344a675d39ca2394a9e45bd2c2 (patch) | |
| tree | 42836c4a6010b2b015156024d3cfb6bf64a48ad6 /indra/llrender | |
| parent | 54d89549df38bb61881583a3eb8d3645c107d79f (diff) | |
Result of svn merge -r57264:57370 svn+ssh://svn/svn/linden/branches/adroit.r40-68 into release.
Diffstat (limited to 'indra/llrender')
| -rw-r--r-- | indra/llrender/llfontgl.cpp | 2 | ||||
| -rw-r--r-- | indra/llrender/llgldbg.cpp | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/indra/llrender/llfontgl.cpp b/indra/llrender/llfontgl.cpp index a52582a3aa..05163c0782 100644 --- a/indra/llrender/llfontgl.cpp +++ b/indra/llrender/llfontgl.cpp @@ -136,7 +136,7 @@ LLString LLFontGL::getFontPathSystem() // Try to figure out where the system's font files are stored. char *system_root = NULL; #if LL_WINDOWS - system_root = getenv("SystemRoot"); + system_root = getenv("SystemRoot"); /* Flawfinder: ignore */ if (!system_root) { llwarns << "SystemRoot not found, attempting to load fonts from default path." << llendl; diff --git a/indra/llrender/llgldbg.cpp b/indra/llrender/llgldbg.cpp index 146560f43d..d19ca2c309 100644 --- a/indra/llrender/llgldbg.cpp +++ b/indra/llrender/llgldbg.cpp @@ -70,8 +70,8 @@ char *fv4(F32 *f) //------------------------------------------------------------------------ char *fv3(F32 *f) { - static char str[128]; - sprintf(str, "%8.3f, %8.3f, %8.3f", f[0], f[1], f[2]); + static char str[128]; /* Flawfinder: ignore */ + snprintf(str, sizeof(str), "%8.3f, %8.3f, %8.3f", f[0], f[1], f[2]); /* Flawfinder: ignore */ return str; } @@ -80,8 +80,8 @@ char *fv3(F32 *f) //------------------------------------------------------------------------ char *fv1(F32 *f) { - static char str[128]; - sprintf(str, "%8.3f", f[0]); + static char str[128]; /* Flawfinder: ignore */ + snprintf(str, sizeof(str), "%8.3f", f[0]); /* Flawfinder: ignore */ return str; } |