API tools faq
paste
Advertisement
Guest User

Untitled

a guest
Dec 2nd, 2012
85
0
Never
Add comment
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 15.11 KB | None | 0 0
raw download clone embed print report
  1. Index: tools/splitshp.cc
  2. ===================================================================
  3. --- tools/splitshp.cc (revision 7169)
  4. +++ tools/splitshp.cc (working copy)
  5. @@ -20,6 +20,7 @@
  6. # include <config.h>
  7. #endif
  8.  
  9. +#include <cassert>
  10. #include <iostream>
  11. #include <cstdlib>
  12.  
  13. @@ -129,6 +130,7 @@
  14. uint8 *data;
  15. char *framename;
  16. int i;
  17. + size_t err;
  18.  
  19. shpfile = fopen (filename, "rb");
  20. if (!shpfile) {
  21. @@ -150,7 +152,8 @@
  22. framename = framefilename(filename, i);
  23. cout << "writing " << framename << "..." << endl;
  24. framefile = fopen(framename, "wb");
  25. - fread(data, 1, 64, shpfile);
  26. + err = fread(data, 1, 64, shpfile);
  27. + assert (err == 64);
  28. fwrite(data, 1, 64, framefile);
  29. fclose(framefile);
  30. delete[] framename;
  31. @@ -183,7 +186,8 @@
  32. write4(framefile, 8);
  33.  
  34. data = new uint8[datalen];
  35. - fread(data, 1, datalen, shpfile);
  36. + err = fread(data, 1, datalen, shpfile);
  37. + assert (err == datalen);
  38. fwrite(data, 1, datalen, framefile);
  39. fclose(framefile);
  40. delete[] framename;
  41. @@ -203,6 +207,7 @@
  42. int file_size, shape_size, hdr_size, frame_size;
  43. int total_size;
  44. uint8 *data;
  45. + size_t err;
  46.  
  47. shpfile = fopen(shapefile, "wb");
  48.  
  49. @@ -231,7 +236,8 @@
  50.  
  51. data = new uint8[64];
  52.  
  53. - fread(data, 1, 64, framefile);
  54. + err = fread(data, 1, 64, framefile);
  55. + assert (err == 64);
  56. fwrite(data, 1, 64, shpfile);
  57. fclose(framefile);
  58.  
  59. @@ -253,7 +259,8 @@
  60.  
  61. data = new uint8[frame_size];
  62. fseek(framefile, hdr_size, SEEK_SET);
  63. - fread(data, 1, frame_size, framefile);
  64. + err = fread(data, 1, frame_size, framefile);
  65. + assert (err == frame_size);
  66. fclose(framefile);
  67.  
  68. fseek(shpfile, 4 + (i*4), SEEK_SET);
  69. Index: tools/expack.cc
  70. ===================================================================
  71. --- tools/expack.cc (revision 7169)
  72. +++ tools/expack.cc (working copy)
  73. @@ -51,7 +51,6 @@
  74. using std::size_t;
  75. using std::strrchr;
  76. using std::strncpy;
  77. -using std::strncat;
  78. using std::strlen;
  79. using std::vector;
  80. using std::string;
  81. @@ -269,7 +268,7 @@
  82. hname[0] = 0;
  83.  
  84. if(argc>2) {
  85. - strncpy(fname, argv[2], 1024);
  86. + strncpy(fname, argv[2], sizeof (fname));
  87. if((argv[1][0]=='-')&&(strlen(argv[1])==2)) {
  88. switch(argv[1][1]) {
  89. case 'i':
  90. @@ -295,23 +294,20 @@
  91. }
  92.  
  93. // Read the output file name
  94. - getline(respfile, temp, 1024);
  95. - strncpy(fname, path_prefix, 1024);
  96. - strncat(fname, temp, 1024);
  97. + getline(respfile, temp, sizeof (temp));
  98. + snprintf(fname, sizeof (fname), "%s%s", path_prefix, temp);
  99.  
  100. // Header file name
  101. - strncpy (hprefix, temp, 1024);
  102. + strncpy (hprefix, temp, sizeof (hprefix));
  103. make_header_name(hprefix);
  104. - strncpy (hname, path_prefix, 1024);
  105. - strncat (hname, hprefix, 1024);
  106. - strncat (hname, ".h", 1024);
  107. + snprintf (hname, sizeof (hname), "%s%s.h", path_prefix, hprefix);
  108. strip_path (hprefix);
  109. make_uppercase (hprefix);
  110.  
  111. unsigned int shnum = 0;
  112. int linenum = 2;
  113. while(respfile.good()) {
  114. - getline(respfile, temp, 1024);
  115. + getline(respfile, temp, sizeof (temp));
  116. if(strlen(temp)>0) {
  117. char *ptr = temp;
  118. if (*ptr == ':')
  119. @@ -329,8 +325,7 @@
  120. ptr++;
  121. }
  122. char temp2[1024];
  123. - strncpy(temp2, path_prefix,1024);
  124. - strncat(temp2, ptr, 1024);
  125. + snprintf (temp2, sizeof (temp2), "%s%s", path_prefix, ptr);
  126. if (shnum >= file_names.size())
  127. file_names.resize(shnum + 1);
  128. file_names[shnum] = temp2;
  129. @@ -431,10 +426,9 @@
  130. char hline[1024];
  131. ofstream header;
  132. if (!hname[0]) { // Need header name.
  133. - strncpy (hprefix, fname, 1024);
  134. + strncpy (hprefix, fname, sizeof (hprefix));
  135. make_header_name(hprefix);
  136. - strncat (hname, hprefix, 1024);
  137. - strncat (hname, ".h", 1024);
  138. + snprintf (hname, sizeof (hname), "%s.h", hprefix);
  139. }
  140. try {
  141. U7open(header, hname, true);
  142. @@ -472,7 +466,7 @@
  143. delete [] buf;
  144. infile.close();
  145.  
  146. - strncpy (hline, file_names[i].c_str(), 1024);
  147. + strncpy (hline, file_names[i].c_str(), sizeof (hline));
  148. strip_path(hline);
  149. make_header_name(hline);
  150. make_uppercase(hline);
  151. Index: tools/ucdump.c
  152. ===================================================================
  153. --- tools/ucdump.c (revision 7169)
  154. +++ tools/ucdump.c (working copy)
  155. @@ -81,6 +81,7 @@
  156. ( x - 933 ) / 10, ( y - 1134 ) / 10
  157. */
  158.  
  159. +#include <assert.h>
  160. #include <stdio.h>
  161. #include <stdlib.h>
  162. #include <string.h>
  163. @@ -859,11 +860,15 @@
  164. unsigned char* p;
  165. unsigned char* pp;
  166. unsigned char* tempstr;
  167. + size_t err;
  168. +
  169. /* Allocate a temporary buffer */
  170. tempstr = malloc(70 + 1);
  171. pos = ftell(f);
  172. pp = p = malloc(ds);
  173. - fread(p, 1, ds, f);
  174. + err = fread(p, 1, ds, f);
  175. + assert (err == ds);
  176. +
  177. fseek(f, pos, SEEK_SET);
  178. /* Print all strings & their offsets */
  179. while( off < ds )
  180. @@ -1092,14 +1097,20 @@
  181. unsigned char* pp;
  182. unsigned char* pdata;
  183. unsigned short* pextern;
  184. + size_t err;
  185. +
  186. pos = ftell(f);
  187. size = s - ds - sizeof(unsigned short);
  188. pp = p = malloc(size);
  189. pdata = malloc(ds);
  190. - fread(pdata, 1, ds, f);
  191. + err = fread(pdata, 1, ds, f);
  192. + assert (err == ds);
  193. +
  194. if( !mute )
  195. printf("Code segment at file offset %08lXH\n", ftell(f));
  196. - fread(p, 1, size, f);
  197. + err = fread(p, 1, size, f);
  198. + assert (err == size);
  199. +
  200. fseek(f, pos, SEEK_SET);
  201. /* Print code segment header */
  202. if( size < 3 * sizeof(unsigned short) )
  203. @@ -1160,14 +1171,22 @@
  204. {
  205. unsigned short s, ds, funcnum;
  206. long off, bodyoff;
  207. + size_t err;
  208. +
  209. /* Save start offset */
  210. off = ftell(f);
  211. /* Read function header */
  212. - fread(&funcnum, sizeof(unsigned short), 1, f);
  213. - fread(&s, sizeof(unsigned short), 1, f);
  214. + err = fread(&funcnum, sizeof(unsigned short), 1, f);
  215. + assert (err == 1);
  216. +
  217. + err = fread(&s, sizeof(unsigned short), 1, f);
  218. + assert (err == 1);
  219. +
  220. /* Save body offset */
  221. bodyoff = ftell(f);
  222. - fread(&ds, sizeof(unsigned short), 1, f);
  223. + err = fread(&ds, sizeof(unsigned short), 1, f);
  224. + assert (err == 1);
  225. +
  226. if( ( ( func == -1 ) || scan_mode ) && ( opcode == -1 ) && ( intrinsic == -1 ) )
  227. /* Only for general list & scan mode */
  228. printf("\tFunction #%d (%04XH), offset = %08lx, size = %04x, data = %04x\n", i,
  229. Index: tools/shp2pcx.cc
  230. ===================================================================
  231. --- tools/shp2pcx.cc (revision 7169)
  232. +++ tools/shp2pcx.cc (working copy)
  233. @@ -23,6 +23,7 @@
  234. #include "sdl-compat.h"
  235. #include SDL_BYTEORDERH
  236.  
  237. +#include <cassert>
  238. #include <iostream>
  239.  
  240. #ifndef ALPHA_LINUX_CXX
  241. @@ -145,6 +146,7 @@
  242. uint8 block;
  243. uint8 pix;
  244. int i, j;
  245. + size_t err;
  246.  
  247. int temp_int;
  248.  
  249. @@ -176,7 +178,8 @@
  250. frame->leftX = 0;
  251. frame->leftY = 0;
  252. frame->pixels = new uint8[64];
  253. - fread(frame->pixels, 1, 64, fp);
  254. + err = fread(frame->pixels, 1, 64, fp);
  255. + assert (err == 64);
  256. }
  257. } else {
  258. hdr_size = read4(fp);
  259. Index: tools/rip.c
  260. ===================================================================
  261. --- tools/rip.c (revision 7169)
  262. +++ tools/rip.c (working copy)
  263. @@ -1,3 +1,4 @@
  264. +#include <assert.h>
  265. #include <stdio.h>
  266. #include <stdlib.h>
  267. #include <string.h>
  268. @@ -8,6 +9,7 @@
  269. char s[10];
  270. char filename[18];
  271. char *pos;
  272. + char *err;
  273. FILE *fi=fopen("index","r"),*fi2,*fo=fopen("usecode","wb");
  274. if (fi==NULL)
  275. {
  276. @@ -20,7 +22,9 @@
  277. exit(0);
  278. }
  279. while (!feof(fi)) {
  280. - fgets(s,10,fi);
  281. + err = fgets(s,10,fi);
  282. + assert (err != NULL);
  283. +
  284. strcpy(filename, s);
  285. pos = strchr(filename, '\n');
  286. if (pos) *pos = '\0';
  287. @@ -58,6 +62,8 @@
  288. char s[10];
  289. char filename[18];
  290. FILE *fi,*fo,*fo2;
  291. + size_t err;
  292. +
  293. printf("Wody's Rip v0.005\nCopyright (c) 1999 Wody Dragon (a.k.a. Wouter Dijkslag)\n");
  294. if (argc<2||(!strcasecmp(argv[1],"put")&&argc!=3))
  295. {
  296. @@ -96,11 +102,14 @@
  297. if (fread(&fn,2,1,fi)!=1) break;
  298. if (fn == 0xFFFF) {
  299. extended = 1;
  300. - fread(&fn,2,1,fi);
  301. - fread(&fs,4,1,fi);
  302. + err = fread(&fn,2,1,fi);
  303. + assert (err == 1);
  304. + err = fread(&fs,4,1,fi);
  305. + assert (err == 1);
  306. } else {
  307. extended = 0;
  308. - fread(&temp,2,1,fi);
  309. + err = fread(&temp,2,1,fi);
  310. + assert (err == 1);
  311. fs = temp;
  312. }
  313.  
  314. @@ -146,20 +155,25 @@
  315. printf("Can't open file %s\n", filename);
  316. exit(0);
  317. }
  318. - fread(&fnc,2,1,fo);
  319. + err = fread(&fnc,2,1,fo);
  320. + assert (err == 1);
  321. +
  322. if (fnc == 0xFFFF) {
  323. if (extended == 0) {
  324. printf("Wrong header (u7) in object\n");
  325. exit(0);
  326. }
  327. - fread(&fnc,2,1,fo);
  328. - fread(&fsc,4,1,fo);
  329. + err = fread(&fnc,2,1,fo);
  330. + assert (err == 1);
  331. + err = fread(&fsc,4,1,fo);
  332. + assert (err == 1);
  333. } else {
  334. if (extended == 1) {
  335. printf("Wrong header (extended) in object\n");
  336. exit(0);
  337. }
  338. - fread(&temp,2,1,fo);
  339. + err = fread(&temp,2,1,fo);
  340. + assert (err == 1);
  341. fsc = temp;
  342. }
  343. if (fnc!=fn)
  344. Index: files/zip/zip.c
  345. ===================================================================
  346. --- files/zip/zip.c (revision 7169)
  347. +++ files/zip/zip.c (working copy)
  348. @@ -168,13 +168,15 @@
  349. ll->first_block = ll->last_block = NULL;
  350. }
  351.  
  352. +/* Currently not being used */
  353. +#if 0
  354. static void free_linkedlist(linkedlist_data* ll)
  355. {
  356. free_datablock(ll->first_block);
  357. ll->first_block = ll->last_block = NULL;
  358. }
  359. +#endif
  360.  
  361. -
  362. static int add_data_in_datablock(linkedlist_data* ll, const void* buf, uLong len)
  363. {
  364. linkedlist_datablock_internal* ldi;
  365. @@ -227,6 +229,8 @@
  366. }
  367.  
  368.  
  369. +/* Currently not being used */
  370. +#if 0
  371. static int write_datablock(FILE* fout, linkedlist_data* ll)
  372. {
  373. linkedlist_datablock_internal* ldi;
  374. @@ -240,6 +244,7 @@
  375. }
  376. return ZIP_OK;
  377. }
  378. +#endif
  379.  
  380. /****************************************************************************/
  381.  
  382. Index: audio/midi_drivers/timidity/timidity_readmidi.cpp
  383. ===================================================================
  384. --- audio/midi_drivers/timidity/timidity_readmidi.cpp (revision 7169)
  385. +++ audio/midi_drivers/timidity/timidity_readmidi.cpp (working copy)
  386. @@ -79,9 +79,11 @@
  387. {
  388. sint32 l=0;
  389. uint8 c;
  390. + size_t err;
  391. for (;;)
  392. {
  393. - fread(&c,1,1,fp);
  394. + err = fread(&c,1,1,fp);
  395. + assert (err == 1);
  396. l += (c & 0x7f);
  397. if (!(c & 0x80)) return l;
  398. l<<=7;
  399. @@ -126,6 +128,7 @@
  400. uint8 me, type, a,b,c;
  401. sint32 len;
  402. MidiEventList *event;
  403. + size_t err;
  404.  
  405. for (;;)
  406. {
  407. @@ -144,7 +147,9 @@
  408. }
  409. else if(me==0xFF) /* Meta event */
  410. {
  411. - fread(&type,1,1,fp);
  412. + err = fread(&type,1,1,fp);
  413. + assert (err == 1);
  414. +
  415. len=getvl();
  416. if (type>0 && type<16)
  417. {
  418. @@ -160,7 +165,12 @@
  419. return MAGIC_EOT;
  420.  
  421. case 0x51: /* Tempo */
  422. - fread(&a,1,1,fp); fread(&b,1,1,fp); fread(&c,1,1,fp);
  423. + err = fread(&a,1,1,fp);
  424. + assert (err == 1);
  425. + err = fread(&b,1,1,fp);
  426. + assert (err == 1);
  427. + err = fread(&c,1,1,fp);
  428. + assert (err == 1);
  429. MIDIEVENT(at, ME_TEMPO, c, a, b);
  430.  
  431. default:
  432. @@ -177,28 +187,33 @@
  433. {
  434. lastchan=a & 0x0F;
  435. laststatus=(a>>4) & 0x07;
  436. - fread(&a, 1,1, fp);
  437. + err = fread(&a, 1,1, fp);
  438. + assert (err == 1);
  439. a &= 0x7F;
  440. }
  441. switch(laststatus)
  442. {
  443. case 0: /* Note off */
  444. - fread(&b, 1,1, fp);
  445. + err = fread(&b, 1,1, fp);
  446. + assert (err == 1);
  447. b &= 0x7F;
  448. MIDIEVENT(at, ME_NOTEOFF, lastchan, a,b);
  449.  
  450. case 1: /* Note on */
  451. - fread(&b, 1,1, fp);
  452. + err = fread(&b, 1,1, fp);
  453. + assert (err == 1);
  454. b &= 0x7F;
  455. MIDIEVENT(at, ME_NOTEON, lastchan, a,b);
  456.  
  457. case 2: /* Key Pressure */
  458. - fread(&b, 1,1, fp);
  459. + err = fread(&b, 1,1, fp);
  460. + assert (err == 1);
  461. b &= 0x7F;
  462. MIDIEVENT(at, ME_KEYPRESSURE, lastchan, a, b);
  463.  
  464. case 3: /* Control change */
  465. - fread(&b, 1,1, fp);
  466. + err = fread(&b, 1,1, fp);
  467. + assert (err == 1);
  468. b &= 0x7F;
  469. {
  470. int control=255;
  471. @@ -281,7 +296,8 @@
  472. break;
  473.  
  474. case 6: /* Pitch wheel */
  475. - fread(&b, 1,1, fp);
  476. + err = fread(&b, 1,1, fp);
  477. + assert (err == 1);
  478. b &= 0x7F;
  479. MIDIEVENT(at, ME_PITCHWHEEL, lastchan, a, b);
  480.  
  481. @@ -539,6 +555,7 @@
  482. sint16 format, tracks, divisions_tmp;
  483. int i;
  484. char tmp[4];
  485. + size_t err;
  486.  
  487. fp=mfp;
  488. event_count=0;
  489. @@ -565,9 +582,12 @@
  490. return 0;
  491. }
  492.  
  493. - fread(&format, 2, 1, fp);
  494. - fread(&tracks, 2, 1, fp);
  495. - fread(&divisions_tmp, 2, 1, fp);
  496. + err = fread(&format, 2, 1, fp);
  497. + assert (err == 1);
  498. + err = fread(&tracks, 2, 1, fp);
  499. + assert (err == 1);
  500. + err = fread(&divisions_tmp, 2, 1, fp);
  501. + assert (err == 1);
  502. format=BE_SHORT(format);
  503. tracks=BE_SHORT(tracks);
  504. divisions_tmp=BE_SHORT(divisions_tmp);
  505. Index: audio/midi_drivers/UnixSeqMidiDriver.cpp
  506. ===================================================================
  507. --- audio/midi_drivers/UnixSeqMidiDriver.cpp (revision 7169)
  508. +++ audio/midi_drivers/UnixSeqMidiDriver.cpp (working copy)
  509. @@ -70,6 +70,7 @@
  510. void UnixSeqMidiDriver::send(uint32 b) {
  511. unsigned char buf[256];
  512. int position = 0;
  513. + size_t err;
  514.  
  515. switch (b & 0xF0) {
  516. case 0x80:
  517. @@ -107,7 +108,8 @@
  518. break;
  519. }
  520.  
  521. - ::write(device, buf, position);
  522. + err = ::write(device, buf, position);
  523. + assert (err == position);
  524. }
  525.  
  526. void UnixSeqMidiDriver::send_sysex(uint8 status,const uint8 *msg,uint16 length)
  527. @@ -121,6 +123,7 @@
  528. unsigned char buf [2048];
  529. int position = 0;
  530. const uint8 *chr = msg;
  531. + size_t err;
  532.  
  533. buf[position++] = SEQ_MIDIPUTC;
  534. buf[position++] = status;
  535. @@ -134,7 +137,8 @@
  536. buf[position++] = 0;
  537. }
  538.  
  539. - ::write (device, buf, position);
  540. + err = ::write (device, buf, position);
  541. + assert (err == position);
  542. }
  543.  
  544. #endif
  545. Index: gumps/Newfile_gump.cc
  546. ===================================================================
  547. --- gumps/Newfile_gump.cc (revision 7169)
  548. +++ gumps/Newfile_gump.cc (working copy)
  549. @@ -595,7 +595,7 @@
  550. else if ((details->real_day%10) == 3 && details->real_day != 13)
  551. suffix = "rd";
  552.  
  553. - snprintf (info, 320, infostring, party[0].name,
  554. + snprintf (info, sizeof (info), infostring, party[0].name,
  555. party[0].exp, party[0].health,
  556. party[0].str, party[0].dext,
  557. party[0].intel, party[0].training,
  558. @@ -606,7 +606,7 @@
  559.  
  560. if (filename)
  561. {
  562. - std::strncat (info, "\nFile: ", 320);
  563. + std::strncat (info, "\nFile: ", sizeof (info) - strlen (info));
  564.  
  565. int offset = strlen(filename);
  566.  
  567. @@ -618,7 +618,7 @@
  568. break;
  569. }
  570. }
  571. - std::strncat (info, filename+offset, 320);
  572. + std::strncat (info, filename+offset, sizeof (info) - strlen (info));
  573.  
  574. }
  575.  
  576. @@ -631,7 +631,7 @@
  577. {
  578. char info[64] = {0};
  579.  
  580. - std::strncat (info, "File: ", 64);
  581. + std::strncat (info, "File: ", sizeof (info));
  582.  
  583. int offset = strlen(filename);
  584.  
  585. @@ -643,7 +643,7 @@
  586. break;
  587. }
  588. }
  589. - std::strncat (info, filename+offset, 64);
  590. + std::strncat (info, filename+offset, sizeof (info) - strlen (info));
  591. sman->paint_text_box (4, info, x+infox, y+infoy, infow, infoh);
  592.  
  593. }
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement
Public Pastes
Advertisement
We use cookies for various purposes including analytics. By continuing to use Pastebin, you agree to our use of cookies as described in the Cookies Policy.  OK, I Understand
Not a member of Pastebin yet?
Sign Up, it unlocks many cool features!