diff options
author | Jacek Antonelli | 2008-08-15 23:44:48 -0500 |
---|---|---|
committer | Jacek Antonelli | 2008-08-15 23:44:48 -0500 |
commit | 9b4f54c826ffa4f94efa866068c9d6ecdfb4b424 (patch) | |
tree | 2f8ae193ab487088962e628f1ee9dee2f5901f01 /linden/indra/llmath/llvolume.cpp | |
parent | Second Life viewer sources 1.13.2.12 (diff) | |
download | meta-impy-9b4f54c826ffa4f94efa866068c9d6ecdfb4b424.zip meta-impy-9b4f54c826ffa4f94efa866068c9d6ecdfb4b424.tar.gz meta-impy-9b4f54c826ffa4f94efa866068c9d6ecdfb4b424.tar.bz2 meta-impy-9b4f54c826ffa4f94efa866068c9d6ecdfb4b424.tar.xz |
Second Life viewer sources 1.13.2.15
Diffstat (limited to 'linden/indra/llmath/llvolume.cpp')
-rw-r--r-- | linden/indra/llmath/llvolume.cpp | 24 |
1 files changed, 18 insertions, 6 deletions
diff --git a/linden/indra/llmath/llvolume.cpp b/linden/indra/llmath/llvolume.cpp index 14d4cdf..c527e85 100644 --- a/linden/indra/llmath/llvolume.cpp +++ b/linden/indra/llmath/llvolume.cpp | |||
@@ -725,6 +725,8 @@ BOOL LLProfileParams::importFile(FILE *fp) | |||
725 | { | 725 | { |
726 | const S32 BUFSIZE = 16384; | 726 | const S32 BUFSIZE = 16384; |
727 | char buffer[BUFSIZE]; | 727 | char buffer[BUFSIZE]; |
728 | // *NOTE: changing the size or type of these buffers will require | ||
729 | // changing the sscanf below. | ||
728 | char keyword[256]; | 730 | char keyword[256]; |
729 | char valuestr[256]; | 731 | char valuestr[256]; |
730 | keyword[0] = 0; | 732 | keyword[0] = 0; |
@@ -735,7 +737,7 @@ BOOL LLProfileParams::importFile(FILE *fp) | |||
735 | while (!feof(fp)) | 737 | while (!feof(fp)) |
736 | { | 738 | { |
737 | fgets(buffer, BUFSIZE, fp); | 739 | fgets(buffer, BUFSIZE, fp); |
738 | sscanf(buffer, " %s %s", keyword, valuestr); | 740 | sscanf(buffer, " %255s %255s", keyword, valuestr); |
739 | if (!keyword) | 741 | if (!keyword) |
740 | { | 742 | { |
741 | continue; | 743 | continue; |
@@ -795,6 +797,8 @@ BOOL LLProfileParams::importLegacyStream(std::istream& input_stream) | |||
795 | { | 797 | { |
796 | const S32 BUFSIZE = 16384; | 798 | const S32 BUFSIZE = 16384; |
797 | char buffer[BUFSIZE]; | 799 | char buffer[BUFSIZE]; |
800 | // *NOTE: changing the size or type of these buffers will require | ||
801 | // changing the sscanf below. | ||
798 | char keyword[256]; | 802 | char keyword[256]; |
799 | char valuestr[256]; | 803 | char valuestr[256]; |
800 | keyword[0] = 0; | 804 | keyword[0] = 0; |
@@ -805,7 +809,7 @@ BOOL LLProfileParams::importLegacyStream(std::istream& input_stream) | |||
805 | while (input_stream.good()) | 809 | while (input_stream.good()) |
806 | { | 810 | { |
807 | input_stream.getline(buffer, BUFSIZE); | 811 | input_stream.getline(buffer, BUFSIZE); |
808 | sscanf(buffer, " %s %s", keyword, valuestr); | 812 | sscanf(buffer, " %255s %255s", keyword, valuestr); |
809 | if (!keyword) | 813 | if (!keyword) |
810 | { | 814 | { |
811 | continue; | 815 | continue; |
@@ -1215,6 +1219,8 @@ BOOL LLPathParams::importFile(FILE *fp) | |||
1215 | { | 1219 | { |
1216 | const S32 BUFSIZE = 16384; | 1220 | const S32 BUFSIZE = 16384; |
1217 | char buffer[BUFSIZE]; | 1221 | char buffer[BUFSIZE]; |
1222 | // *NOTE: changing the size or type of these buffers will require | ||
1223 | // changing the sscanf below. | ||
1218 | char keyword[256]; | 1224 | char keyword[256]; |
1219 | char valuestr[256]; | 1225 | char valuestr[256]; |
1220 | keyword[0] = 0; | 1226 | keyword[0] = 0; |
@@ -1227,7 +1233,7 @@ BOOL LLPathParams::importFile(FILE *fp) | |||
1227 | while (!feof(fp)) | 1233 | while (!feof(fp)) |
1228 | { | 1234 | { |
1229 | fgets(buffer, BUFSIZE, fp); | 1235 | fgets(buffer, BUFSIZE, fp); |
1230 | sscanf(buffer, " %s %s", keyword, valuestr); | 1236 | sscanf(buffer, " %255s %255s", keyword, valuestr); |
1231 | if (!keyword) | 1237 | if (!keyword) |
1232 | { | 1238 | { |
1233 | continue; | 1239 | continue; |
@@ -1354,6 +1360,8 @@ BOOL LLPathParams::importLegacyStream(std::istream& input_stream) | |||
1354 | { | 1360 | { |
1355 | const S32 BUFSIZE = 16384; | 1361 | const S32 BUFSIZE = 16384; |
1356 | char buffer[BUFSIZE]; | 1362 | char buffer[BUFSIZE]; |
1363 | // *NOTE: changing the size or type of these buffers will require | ||
1364 | // changing the sscanf below. | ||
1357 | char keyword[256]; | 1365 | char keyword[256]; |
1358 | char valuestr[256]; | 1366 | char valuestr[256]; |
1359 | keyword[0] = 0; | 1367 | keyword[0] = 0; |
@@ -1366,7 +1374,7 @@ BOOL LLPathParams::importLegacyStream(std::istream& input_stream) | |||
1366 | while (input_stream.good()) | 1374 | while (input_stream.good()) |
1367 | { | 1375 | { |
1368 | input_stream.getline(buffer, BUFSIZE); | 1376 | input_stream.getline(buffer, BUFSIZE); |
1369 | sscanf(buffer, " %s %s", keyword, valuestr); | 1377 | sscanf(buffer, " %255s %255s", keyword, valuestr); |
1370 | if (!keyword) | 1378 | if (!keyword) |
1371 | { | 1379 | { |
1372 | continue; | 1380 | continue; |
@@ -3340,13 +3348,15 @@ BOOL LLVolumeParams::importFile(FILE *fp) | |||
3340 | //llinfos << "importing volume" << llendl; | 3348 | //llinfos << "importing volume" << llendl; |
3341 | const S32 BUFSIZE = 16384; | 3349 | const S32 BUFSIZE = 16384; |
3342 | char buffer[BUFSIZE]; | 3350 | char buffer[BUFSIZE]; |
3351 | // *NOTE: changing the size or type of this buffer will require | ||
3352 | // changing the sscanf below. | ||
3343 | char keyword[256]; | 3353 | char keyword[256]; |
3344 | keyword[0] = 0; | 3354 | keyword[0] = 0; |
3345 | 3355 | ||
3346 | while (!feof(fp)) | 3356 | while (!feof(fp)) |
3347 | { | 3357 | { |
3348 | fgets(buffer, BUFSIZE, fp); | 3358 | fgets(buffer, BUFSIZE, fp); |
3349 | sscanf(buffer, " %s", keyword); | 3359 | sscanf(buffer, " %255s", keyword); |
3350 | if (!keyword) | 3360 | if (!keyword) |
3351 | { | 3361 | { |
3352 | continue; | 3362 | continue; |
@@ -3391,6 +3401,8 @@ BOOL LLVolumeParams::importLegacyStream(std::istream& input_stream) | |||
3391 | { | 3401 | { |
3392 | //llinfos << "importing volume" << llendl; | 3402 | //llinfos << "importing volume" << llendl; |
3393 | const S32 BUFSIZE = 16384; | 3403 | const S32 BUFSIZE = 16384; |
3404 | // *NOTE: changing the size or type of this buffer will require | ||
3405 | // changing the sscanf below. | ||
3394 | char buffer[BUFSIZE]; | 3406 | char buffer[BUFSIZE]; |
3395 | char keyword[256]; | 3407 | char keyword[256]; |
3396 | keyword[0] = 0; | 3408 | keyword[0] = 0; |
@@ -3398,7 +3410,7 @@ BOOL LLVolumeParams::importLegacyStream(std::istream& input_stream) | |||
3398 | while (input_stream.good()) | 3410 | while (input_stream.good()) |
3399 | { | 3411 | { |
3400 | input_stream.getline(buffer, BUFSIZE); | 3412 | input_stream.getline(buffer, BUFSIZE); |
3401 | sscanf(buffer, " %s", keyword); | 3413 | sscanf(buffer, " %255s", keyword); |
3402 | if (!keyword) | 3414 | if (!keyword) |
3403 | { | 3415 | { |
3404 | continue; | 3416 | continue; |