Fossil SCM
Always close opendir() objects if and only if successfully opened. Ticket [6f8614716702180a0]
Commit
f73ed21d3b6e58b54066d5312bacd0c936dc4b77
Parent
7c8519003de911f…
3 files changed
+2
-2
+1
+1
-1
+2
-2
| --- src/add.c | ||
| +++ src/add.c | ||
| @@ -188,12 +188,12 @@ | ||
| 188 | 188 | }else if( file_isfile(zPath) ){ |
| 189 | 189 | db_multi_exec("INSERT INTO sfile VALUES(%Q)", zPath); |
| 190 | 190 | } |
| 191 | 191 | blob_resize(&path, origSize); |
| 192 | 192 | } |
| 193 | + closedir(d); | |
| 193 | 194 | } |
| 194 | - closedir(d); | |
| 195 | 195 | blob_reset(&path); |
| 196 | 196 | } |
| 197 | 197 | |
| 198 | 198 | /* |
| 199 | 199 | ** Add all content of a directory. |
| @@ -321,12 +321,12 @@ | ||
| 321 | 321 | } |
| 322 | 322 | blob_reset(&pathname); |
| 323 | 323 | } |
| 324 | 324 | blob_resize(&path, origSize); |
| 325 | 325 | } |
| 326 | + closedir(d); | |
| 326 | 327 | } |
| 327 | - closedir(d); | |
| 328 | 328 | blob_reset(&path); |
| 329 | 329 | } |
| 330 | 330 | |
| 331 | 331 | /* |
| 332 | 332 | ** COMMAND: rm |
| 333 | 333 |
| --- src/add.c | |
| +++ src/add.c | |
| @@ -188,12 +188,12 @@ | |
| 188 | }else if( file_isfile(zPath) ){ |
| 189 | db_multi_exec("INSERT INTO sfile VALUES(%Q)", zPath); |
| 190 | } |
| 191 | blob_resize(&path, origSize); |
| 192 | } |
| 193 | } |
| 194 | closedir(d); |
| 195 | blob_reset(&path); |
| 196 | } |
| 197 | |
| 198 | /* |
| 199 | ** Add all content of a directory. |
| @@ -321,12 +321,12 @@ | |
| 321 | } |
| 322 | blob_reset(&pathname); |
| 323 | } |
| 324 | blob_resize(&path, origSize); |
| 325 | } |
| 326 | } |
| 327 | closedir(d); |
| 328 | blob_reset(&path); |
| 329 | } |
| 330 | |
| 331 | /* |
| 332 | ** COMMAND: rm |
| 333 |
| --- src/add.c | |
| +++ src/add.c | |
| @@ -188,12 +188,12 @@ | |
| 188 | }else if( file_isfile(zPath) ){ |
| 189 | db_multi_exec("INSERT INTO sfile VALUES(%Q)", zPath); |
| 190 | } |
| 191 | blob_resize(&path, origSize); |
| 192 | } |
| 193 | closedir(d); |
| 194 | } |
| 195 | blob_reset(&path); |
| 196 | } |
| 197 | |
| 198 | /* |
| 199 | ** Add all content of a directory. |
| @@ -321,12 +321,12 @@ | |
| 321 | } |
| 322 | blob_reset(&pathname); |
| 323 | } |
| 324 | blob_resize(&path, origSize); |
| 325 | } |
| 326 | closedir(d); |
| 327 | } |
| 328 | blob_reset(&path); |
| 329 | } |
| 330 | |
| 331 | /* |
| 332 | ** COMMAND: rm |
| 333 |
+1
| --- src/rebuild.c | ||
| +++ src/rebuild.c | ||
| @@ -602,10 +602,11 @@ | ||
| 602 | 602 | blob_reset(&aContent); |
| 603 | 603 | free(zSubpath); |
| 604 | 604 | printf("\r%d", ++nFileRead); |
| 605 | 605 | fflush(stdout); |
| 606 | 606 | } |
| 607 | + closedir(d); | |
| 607 | 608 | }else { |
| 608 | 609 | fossil_panic("encountered error %d while trying to open \"%s\".", |
| 609 | 610 | errno, g.argv[3]); |
| 610 | 611 | } |
| 611 | 612 | } |
| 612 | 613 |
| --- src/rebuild.c | |
| +++ src/rebuild.c | |
| @@ -602,10 +602,11 @@ | |
| 602 | blob_reset(&aContent); |
| 603 | free(zSubpath); |
| 604 | printf("\r%d", ++nFileRead); |
| 605 | fflush(stdout); |
| 606 | } |
| 607 | }else { |
| 608 | fossil_panic("encountered error %d while trying to open \"%s\".", |
| 609 | errno, g.argv[3]); |
| 610 | } |
| 611 | } |
| 612 |
| --- src/rebuild.c | |
| +++ src/rebuild.c | |
| @@ -602,10 +602,11 @@ | |
| 602 | blob_reset(&aContent); |
| 603 | free(zSubpath); |
| 604 | printf("\r%d", ++nFileRead); |
| 605 | fflush(stdout); |
| 606 | } |
| 607 | closedir(d); |
| 608 | }else { |
| 609 | fossil_panic("encountered error %d while trying to open \"%s\".", |
| 610 | errno, g.argv[3]); |
| 611 | } |
| 612 | } |
| 613 |
+1
-1
| --- src/vfile.c | ||
| +++ src/vfile.c | ||
| @@ -310,12 +310,12 @@ | ||
| 310 | 310 | }else if( file_isfile(zPath) && !db_exists(zSql, &zPath[nPrefix+1]) ){ |
| 311 | 311 | db_multi_exec("INSERT INTO sfile VALUES(%Q)", &zPath[nPrefix+1]); |
| 312 | 312 | } |
| 313 | 313 | blob_resize(pPath, origSize); |
| 314 | 314 | } |
| 315 | + closedir(d); | |
| 315 | 316 | } |
| 316 | - closedir(d); | |
| 317 | 317 | } |
| 318 | 318 | |
| 319 | 319 | /* |
| 320 | 320 | ** Compute an aggregate MD5 checksum over the disk image of every |
| 321 | 321 | ** file in vid. The file names are part of the checksum. The resulting |
| 322 | 322 |
| --- src/vfile.c | |
| +++ src/vfile.c | |
| @@ -310,12 +310,12 @@ | |
| 310 | }else if( file_isfile(zPath) && !db_exists(zSql, &zPath[nPrefix+1]) ){ |
| 311 | db_multi_exec("INSERT INTO sfile VALUES(%Q)", &zPath[nPrefix+1]); |
| 312 | } |
| 313 | blob_resize(pPath, origSize); |
| 314 | } |
| 315 | } |
| 316 | closedir(d); |
| 317 | } |
| 318 | |
| 319 | /* |
| 320 | ** Compute an aggregate MD5 checksum over the disk image of every |
| 321 | ** file in vid. The file names are part of the checksum. The resulting |
| 322 |
| --- src/vfile.c | |
| +++ src/vfile.c | |
| @@ -310,12 +310,12 @@ | |
| 310 | }else if( file_isfile(zPath) && !db_exists(zSql, &zPath[nPrefix+1]) ){ |
| 311 | db_multi_exec("INSERT INTO sfile VALUES(%Q)", &zPath[nPrefix+1]); |
| 312 | } |
| 313 | blob_resize(pPath, origSize); |
| 314 | } |
| 315 | closedir(d); |
| 316 | } |
| 317 | } |
| 318 | |
| 319 | /* |
| 320 | ** Compute an aggregate MD5 checksum over the disk image of every |
| 321 | ** file in vid. The file names are part of the checksum. The resulting |
| 322 |