utf8: release strbuf on error return in strbuf_utf8_replace()

diff --git a/pathspec.c b/pathspec.c
index 1e5df2316e6624f6e9dd9b6aaa25a874b5409525..e2a23ebc9668b066d337391e96139af49907edfa 100644 (file)
--- a/pathspec.c
+++ b/pathspec.c
@@ -1,4 +1,6 @@
+#define NO_THE_INDEX_COMPATIBILITY_MACROS
 #include "cache.h"
+#include "config.h"
 #include "dir.h"
 #include "pathspec.h"
 #include "attr.h"
@@ -17,6 +19,7 @@
  * to use find_pathspecs_matching_against_index() instead.
  */
 void add_pathspec_matches_against_index(const struct pathspec *pathspec,
+                                       const struct index_state *istate,
                                        char *seen)
 {
        int num_unmatched = 0, i;
@@ -32,8 +35,8 @@ void add_pathspec_matches_against_index(const struct pathspec *pathspec,
                        num_unmatched++;
        if (!num_unmatched)
                return;
-       for (i = 0; i < active_nr; i++) {
-               const struct cache_entry *ce = active_cache[i];
+       for (i = 0; i < istate->cache_nr; i++) {
+               const struct cache_entry *ce = istate->cache[i];
                ce_path_match(ce, pathspec, seen);
        }
 }
@@ -46,10 +49,11 @@ void add_pathspec_matches_against_index(const struct pathspec *pathspec,
  * nature of the "closest" (i.e. most specific) matches which each of the
  * given pathspecs achieves against all items in the index.
  */
-char *find_pathspecs_matching_against_index(const struct pathspec *pathspec)
+char *find_pathspecs_matching_against_index(const struct pathspec *pathspec,
+                                           const struct index_state *istate)
 {
        char *seen = xcalloc(pathspec->nr, 1);
-       add_pathspec_matches_against_index(pathspec, seen);
+       add_pathspec_matches_against_index(pathspec, istate, seen);
        return seen;
 }
 
@@ -602,7 +606,7 @@ void parse_pathspec(struct pathspec *pathspec,
 
        /*
         * If everything is an exclude pattern, add one positive pattern
-        * that matches everyting. We allocated an extra one for this.
+        * that matches everything. We allocated an extra one for this.
         */
        if (nr_exclude == n) {
                int plen = (!(flags & PATHSPEC_PREFER_CWD)) ? 0 : prefixlen;
@@ -659,7 +663,6 @@ void clear_pathspec(struct pathspec *pathspec)
                        attr_check_free(pathspec->items[i].attr_check);
        }
 
-       free(pathspec->items);
-       pathspec->items = NULL;
+       FREE_AND_NULL(pathspec->items);
        pathspec->nr = 0;
 }