strbuf: instate cleanup rule in case of non-memory errors

Make all strbuf functions that can fail free() their memory on error if
they have allocated it.  They don't shrink buffers that have been grown,
though.

This allows for easier error handling, as callers only need to call
strbuf_release() if A) the command succeeded or B) if they would have had
to do so anyway because they added something to the strbuf themselves.

Bonus hunk: document strbuf_readlink.

Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/Documentation/technical/api-strbuf.txt b/Documentation/technical/api-strbuf.txt
index a8ee2fe6a1504b943ff9c3c51807bf0f839182b1..9a4e3ea92c44b01694c4373f97b6c56c67952fbb 100644 (file)
--- a/Documentation/technical/api-strbuf.txt
+++ b/Documentation/technical/api-strbuf.txt
@@ -133,8 +133,10 @@ Functions
 
 * Adding data to the buffer
 
 
 * Adding data to the buffer
 

-NOTE: All of these functions in this section will grow the buffer as
-      necessary.
+NOTE: All of the functions in this section will grow the buffer as necessary.
+If they fail for some reason other than memory shortage and the buffer hadn't
+been allocated before (i.e. the `struct strbuf` was set to `STRBUF_INIT`),
+then they will free() it.

 
 `strbuf_addch`::
 
 
 `strbuf_addch`::
 


@@ -235,6 +237,11 @@ same behaviour as well.
        Read the contents of a file, specified by its path. The third argument
        can be used to give a hint about the file size, to avoid reallocs.
 
        Read the contents of a file, specified by its path. The third argument
        can be used to give a hint about the file size, to avoid reallocs.
 

+`strbuf_readlink`::
+
+       Read the target of a symbolic link, specified by its path.  The third
+       argument can be used to give a hint about the size, to avoid reallocs.
+

 `strbuf_getline`::
 
        Read a line from a FILE* pointer. The second argument specifies the line
 `strbuf_getline`::
 
        Read a line from a FILE* pointer. The second argument specifies the line

diff --git a/strbuf.c b/strbuf.c
index bdf49544d47b97475800b104ed9efe8f846db265..6ed06840b856a91f6d215c9a862e064f521384f0 100644 (file)
--- a/strbuf.c
+++ b/strbuf.c
@@ -256,18 +256,21 @@ size_t strbuf_expand_dict_cb(struct strbuf *sb, const char *placeholder,
 size_t strbuf_fread(struct strbuf *sb, size_t size, FILE *f)
 {
        size_t res;
 size_t strbuf_fread(struct strbuf *sb, size_t size, FILE *f)
 {
        size_t res;

+       size_t oldalloc = sb->alloc;

 
        strbuf_grow(sb, size);
        res = fread(sb->buf + sb->len, 1, size, f);
 
        strbuf_grow(sb, size);
        res = fread(sb->buf + sb->len, 1, size, f);

-       if (res > 0) {
+       if (res > 0)

                strbuf_setlen(sb, sb->len + res);
                strbuf_setlen(sb, sb->len + res);

-       }
+       else if (res < 0 && oldalloc == 0)
+               strbuf_release(sb);

        return res;
 }
 
 ssize_t strbuf_read(struct strbuf *sb, int fd, size_t hint)
 {
        size_t oldlen = sb->len;
        return res;
 }
 
 ssize_t strbuf_read(struct strbuf *sb, int fd, size_t hint)
 {
        size_t oldlen = sb->len;

+       size_t oldalloc = sb->alloc;

 
        strbuf_grow(sb, hint ? hint : 8192);
        for (;;) {
 
        strbuf_grow(sb, hint ? hint : 8192);
        for (;;) {


@@ -275,7 +278,10 @@ ssize_t strbuf_read(struct strbuf *sb, int fd, size_t hint)
 
                cnt = xread(fd, sb->buf + sb->len, sb->alloc - sb->len - 1);
                if (cnt < 0) {
 
                cnt = xread(fd, sb->buf + sb->len, sb->alloc - sb->len - 1);
                if (cnt < 0) {

-                       strbuf_setlen(sb, oldlen);
+                       if (oldalloc == 0)
+                               strbuf_release(sb);
+                       else
+                               strbuf_setlen(sb, oldlen);

                        return -1;
                }
                if (!cnt)
                        return -1;
                }
                if (!cnt)


@@ -292,6 +298,8 @@ ssize_t strbuf_read(struct strbuf *sb, int fd, size_t hint)
 
 int strbuf_readlink(struct strbuf *sb, const char *path, size_t hint)
 {
 
 int strbuf_readlink(struct strbuf *sb, const char *path, size_t hint)
 {

+       size_t oldalloc = sb->alloc;
+

        if (hint < 32)
                hint = 32;
 
        if (hint < 32)
                hint = 32;
 


@@ -311,7 +319,8 @@ int strbuf_readlink(struct strbuf *sb, const char *path, size_t hint)
                /* .. the buffer was too small - try again */
                hint *= 2;
        }
                /* .. the buffer was too small - try again */
                hint *= 2;
        }

-       strbuf_release(sb);
+       if (oldalloc == 0)
+               strbuf_release(sb);

        return -1;
 }
 
        return -1;
 }