Second Life viewer sources 1.14.0.0

1 files changed, 17 insertions, 17 deletions

diff --git a/linden/indra/llxml/llxmlnode.cpp b/linden/indra/llxml/llxmlnode.cpp
index 6366519..50a08be 100644
--- a/linden/indra/llxml/llxmlnode.cpp
+++ b/linden/indra/llxml/llxmlnode.cpp
@@ -561,7 +561,7 @@ bool LLXMLNode::parseFile(
         LLXMLNode* defaults_tree)
 {
         // Read file
-        FILE* fp = LLFile::fopen(filename.c_str(), "rb");
+        FILE* fp = LLFile::fopen(filename.c_str(), "rb");               /* Flawfinder: ignore */
         if (fp == NULL)
         {
                 node = new LLXMLNode();
@@ -1865,12 +1865,12 @@ U32 LLXMLNode::getUUIDValue(U32 expected_length, LLUUID *array)
                 LLUUID uuid_value;
                 value_string = skipWhitespace(value_string);
 
-                if (strlen(value_string) < (UUID_STR_LENGTH-1))
+                if (strlen(value_string) < (UUID_STR_LENGTH-1))         /* Flawfinder: ignore */
                 {
                         break;
                 }
-                char uuid_string[UUID_STR_LENGTH];
-                memcpy(uuid_string, value_string, (UUID_STR_LENGTH-1));
+                char uuid_string[UUID_STR_LENGTH];              /* Flawfinder: ignore */
+                memcpy(uuid_string, value_string, (UUID_STR_LENGTH-1));         /* Flawfinder: ignore */
                 uuid_string[(UUID_STR_LENGTH-1)] = 0;
 
                 if (!LLUUID::parseUUID(uuid_string, &uuid_value))
@@ -2155,18 +2155,18 @@ void LLXMLNode::setFloatValue(U32 length, const F32 *array, Encoding encoding, U
         LLString new_value;
         if (encoding == ENCODING_DEFAULT || encoding == ENCODING_DECIMAL)
         {
-                char format_string[10];
+                char format_string[10];         /* Flawfinder: ignore */
                 if (precision > 0)
                 {
                         if (precision > 25)
                         {
                                 precision = 25;
                         }
-                        sprintf(format_string, "%%.%dg", precision);
+                        snprintf(format_string, sizeof(format_string), "%%.%dg", precision);            /* Flawfinder: ignore */
                 }
                 else
                 {
-                        sprintf(format_string, "%%g");
+                        snprintf(format_string, sizeof(format_string), "%%g");          /* Flawfinder: ignore */
                 }
 
                 for (U32 pos=0; pos<length; ++pos)
@@ -2206,18 +2206,18 @@ void LLXMLNode::setDoubleValue(U32 length, const F64 *array, Encoding encoding,
         LLString new_value;
         if (encoding == ENCODING_DEFAULT || encoding == ENCODING_DECIMAL)
         {
-                char format_string[10];
+                char format_string[10];         /* Flawfinder: ignore */
                 if (precision > 0)
                 {
                         if (precision > 25)
                         {
                                 precision = 25;
                         }
-                        sprintf(format_string, "%%.%dg", precision);
+                        snprintf(format_string, sizeof(format_string), "%%.%dg", precision);            /* Flawfinder: ignore */
                 }
                 else
                 {
-                        sprintf(format_string, "%%g");
+                        snprintf(format_string, sizeof(format_string), "%%g");          /* Flawfinder: ignore */
                 }
                 for (U32 pos=0; pos<length; ++pos)
                 {
@@ -2294,7 +2294,7 @@ void LLXMLNode::setUUIDValue(U32 length, const LLUUID *array)
         LLString new_value;
         for (U32 pos=0; pos<length; ++pos)
         {
-                new_value.append(array[pos].getString());
+                new_value.append(array[pos].asString());
                 if (pos < length-1) new_value.append(" ");
         }
 
@@ -2491,7 +2491,7 @@ LLXMLNode *get_rand_node(LLXMLNode *node)
 void LLXMLNode::createUnitTest(S32 max_num_children)
 {
         // Random ID
-        char rand_id[20];
+        char rand_id[20];               /* Flawfinder: ignore */
         U32 rand_id_len = get_rand(10)+5;
         U32 pos = 0;
         for (; pos<rand_id_len; ++pos)
@@ -2520,7 +2520,7 @@ void LLXMLNode::createUnitTest(S32 max_num_children)
         for (U32 child_num=0; child_num<num_children; ++child_num)
         {
                 // Random Name
-                char child_name[20];
+                char child_name[20];            /* Flawfinder: ignore */
                 U32 child_name_len = get_rand(10)+5;
                 pos = 0;
                 for (; pos<child_name_len; ++pos)
@@ -2532,7 +2532,7 @@ void LLXMLNode::createUnitTest(S32 max_num_children)
                 LLXMLNode *new_child = createChild(child_name, FALSE);
 
                 // Random ID
-                char child_id[20];
+                char child_id[20];              /* Flawfinder: ignore */
                 U32 child_id_len = get_rand(10)+5;
                 pos = 0;
                 for (; pos<child_id_len; ++pos)
@@ -2653,7 +2653,7 @@ void LLXMLNode::createUnitTest(S32 max_num_children)
                                 {
                                         random_node_array[value] = get_rand_node(root);
                                         const char *node_name = random_node_array[value]->mName->mString;
-                                        for (U32 pos=0; pos<strlen(node_name); ++pos)
+                                        for (U32 pos=0; pos<strlen(node_name); ++pos)           /* Flawfinder: ignore */
                                         {
                                                 U32 hash_contrib = U32(node_name[pos]) << ((pos % 4) * 8);
                                                 noderef_checksum ^= hash_contrib;
@@ -2825,7 +2825,7 @@ BOOL LLXMLNode::performUnitTest(LLString &error_buffer)
                                 for (U32 pos=0; pos<node->mLength; ++pos)
                                 {
                                         const char *node_name = node_array[pos]->mName->mString;
-                                        for (U32 pos2=0; pos2<strlen(node_name); ++pos2)
+                                        for (U32 pos2=0; pos2<strlen(node_name); ++pos2)                /* Flawfinder: ignore */
                                         {
                                                 U32 hash_contrib = U32(node_name[pos2]) << ((pos2 % 4) * 8);
                                                 noderef_checksum ^= hash_contrib;
@@ -2896,7 +2896,7 @@ BOOL LLXMLNode::performUnitTest(LLString &error_buffer)
                 }
                 if (node_uuid_checksum != uuid_checksum)
                 {
-                        error_buffer.append(llformat("ERROR Node %s: UUID checksum mismatch: read %s / calc %s.\n", mName->mString, node_uuid_checksum.getString().c_str(), uuid_checksum.getString().c_str()));
+                        error_buffer.append(llformat("ERROR Node %s: UUID checksum mismatch: read %s / calc %s.\n", mName->mString, node_uuid_checksum.asString().c_str(), uuid_checksum.asString().c_str()));
                         return FALSE;
                 }
         }