aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/llinventory/llsaleinfo.cpp
diff options
context:
space:
mode:
authorJacek Antonelli2008-08-15 23:44:50 -0500
committerJacek Antonelli2008-08-15 23:44:50 -0500
commit89fe5dab825a62a0e3fd8d248cbc91c65eb2a426 (patch)
treebcff14b7888d04a2fec799c59369f6095224bd08 /linden/indra/llinventory/llsaleinfo.cpp
parentSecond Life viewer sources 1.13.3.2 (diff)
downloadmeta-impy-89fe5dab825a62a0e3fd8d248cbc91c65eb2a426.zip
meta-impy-89fe5dab825a62a0e3fd8d248cbc91c65eb2a426.tar.gz
meta-impy-89fe5dab825a62a0e3fd8d248cbc91c65eb2a426.tar.bz2
meta-impy-89fe5dab825a62a0e3fd8d248cbc91c65eb2a426.tar.xz
Second Life viewer sources 1.14.0.0
Diffstat (limited to 'linden/indra/llinventory/llsaleinfo.cpp')
-rw-r--r--linden/indra/llinventory/llsaleinfo.cpp22
1 files changed, 14 insertions, 8 deletions
diff --git a/linden/indra/llinventory/llsaleinfo.cpp b/linden/indra/llinventory/llsaleinfo.cpp
index 98043d1..28801e5 100644
--- a/linden/indra/llinventory/llsaleinfo.cpp
+++ b/linden/indra/llinventory/llsaleinfo.cpp
@@ -160,9 +160,9 @@ BOOL LLSaleInfo::importFile(FILE* fp, BOOL& has_perm_mask, U32& perm_mask)
160 160
161 // *NOTE: Changing the buffer size will require changing the scanf 161 // *NOTE: Changing the buffer size will require changing the scanf
162 // calls below. 162 // calls below.
163 char buffer[MAX_STRING]; 163 char buffer[MAX_STRING]; /* Flawfinder: ignore */
164 char keyword[MAX_STRING]; 164 char keyword[MAX_STRING]; /* Flawfinder: ignore */
165 char valuestr[MAX_STRING]; 165 char valuestr[MAX_STRING]; /* Flawfinder: ignore */
166 BOOL success = TRUE; 166 BOOL success = TRUE;
167 167
168 keyword[0] = '\0'; 168 keyword[0] = '\0';
@@ -170,7 +170,10 @@ BOOL LLSaleInfo::importFile(FILE* fp, BOOL& has_perm_mask, U32& perm_mask)
170 while(success && (!feof(fp))) 170 while(success && (!feof(fp)))
171 { 171 {
172 fgets(buffer, MAX_STRING, fp); 172 fgets(buffer, MAX_STRING, fp);
173 sscanf(buffer, " %254s %254s", keyword, valuestr); 173 sscanf( /* Flawfinder: ignore */
174 buffer,
175 " %254s %254s",
176 keyword, valuestr);
174 if(!keyword) 177 if(!keyword)
175 { 178 {
176 continue; 179 continue;
@@ -213,9 +216,9 @@ BOOL LLSaleInfo::importLegacyStream(std::istream& input_stream, BOOL& has_perm_m
213 216
214 // *NOTE: Changing the buffer size will require changing the scanf 217 // *NOTE: Changing the buffer size will require changing the scanf
215 // calls below. 218 // calls below.
216 char buffer[MAX_STRING]; 219 char buffer[MAX_STRING]; /* Flawfinder: ignore */
217 char keyword[MAX_STRING]; 220 char keyword[MAX_STRING]; /* Flawfinder: ignore */
218 char valuestr[MAX_STRING]; 221 char valuestr[MAX_STRING]; /* Flawfinder: ignore */
219 BOOL success = TRUE; 222 BOOL success = TRUE;
220 223
221 keyword[0] = '\0'; 224 keyword[0] = '\0';
@@ -223,7 +226,10 @@ BOOL LLSaleInfo::importLegacyStream(std::istream& input_stream, BOOL& has_perm_m
223 while(success && input_stream.good()) 226 while(success && input_stream.good())
224 { 227 {
225 input_stream.getline(buffer, MAX_STRING); 228 input_stream.getline(buffer, MAX_STRING);
226 sscanf(buffer, " %254s %254s", keyword, valuestr); 229 sscanf( /* Flawfinder: ignore */
230 buffer,
231 " %254s %254s",
232 keyword, valuestr);
227 if(!keyword) 233 if(!keyword)
228 { 234 {
229 continue; 235 continue;