Skip to content
Snippets Groups Projects
Commit 28c0b58c authored by Yorhel's avatar Yorhel
Browse files

Clip directory sizes to make sure they are positive

I realized that I used addparentstats() with negative values when
removing stuff, so it had to be done this way (without rewriting
everything). It's a simple solution, anyway.
parent ad84603b
No related branches found
No related tags found
No related merge requests found
......@@ -186,8 +186,8 @@ static void freedir_hlnk(struct dir *d) {
if(pt==par)
i=0;
if(i) {
par->size -= d->size;
par->asize -= d->asize;
par->size = adds64(par->size, -d->size);
par->asize = adds64(par->size, -d->asize);
}
}
......
......@@ -81,11 +81,14 @@ char *getpath(struct dir *);
/* returns the root element of the given dir struct */
struct dir *getroot(struct dir *);
/* Add two positive signed 64-bit integers. Returns INT64_MAX if the result
* would overflow.
/* Add two signed 64-bit integers. Returns INT64_MAX if the result would
* overflow, or 0 if it would be negative. At least one of the integers must be
* positive.
* I use uint64_t's to detect the overflow, as (a + b < 0) relies on undefined
* behaviour, and (INT64_MAX - b >= a) didn't work for some reason. */
#define adds64(a, b) ((uint64_t)(a) + (uint64_t)(b) > (uint64_t)INT64_MAX ? INT64_MAX : (a)+(b))
#define adds64(a, b) ((a) > 0 && (b) > 0\
? ((uint64_t)(a) + (uint64_t)(b) > (uint64_t)INT64_MAX ? INT64_MAX : (a)+(b))\
: (a)+(b) < 0 ? 0 : (a)+(b))
/* Adds a value to the size, asize and items fields of *d and its parents */
void addparentstats(struct dir *, int64_t, int64_t, int);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment