rugged 0.27.7 → 0.27.9

data/vendor/libgit2/src/sysdir.c

@@ -136,7 +136,7 @@ static int git_sysdir_guess_xdg_dirs(git_buf *out)
 		error = 0;
 	}
 
-	git_buf_dispose(&env);
+	git_buf_free(&env);
 	return error;
 #endif
 }
@@ -168,7 +168,7 @@ static void git_sysdir_global_shutdown(void)
 	size_t i;
 
 	for (i = 0; i < ARRAY_SIZE(git_sysdir__dirs); ++i)
-		git_buf_dispose(&git_sysdir__dirs[i].buf);
+		git_buf_free(&git_sysdir__dirs[i].buf);
 }
 
 int git_sysdir_global_init(void)
@@ -262,7 +262,7 @@ int git_sysdir_set(git_sysdir_t which, const char *search_path)
 		git_buf_join(&merge, GIT_PATH_LIST_SEPARATOR, merge.ptr, expand_path);
 
 	git_buf_swap(&git_sysdir__dirs[which].buf, &merge);
-	git_buf_dispose(&merge);
+	git_buf_free(&merge);
 
 done:
 	if (git_buf_oom(&git_sysdir__dirs[which].buf))
@@ -307,7 +307,7 @@ static int git_sysdir_find_in_dirlist(
 	}
 
 done:
-	git_buf_dispose(path);
+	git_buf_free(path);
 	giterr_set(GITERR_OS, "the %s file '%s' doesn't exist", label, name);
 	return GIT_ENOTFOUND;
 }

data/vendor/libgit2/src/tag.c

@@ -70,10 +70,9 @@ static int tag_parse(git_tag *tag, const char *buffer, const char *buffer_end)
 	static const char *tag_types[] = {
 		NULL, "commit\n", "tree\n", "blob\n", "tag\n"
 	};
-
-	unsigned int i;
 	size_t text_len, alloc_len;
-	char *search;
+	const char *search;
+	unsigned int i;
 
 	if (git_oid__parse(&tag->target, &buffer, buffer_end, "object ") < 0)
 		return tag_error("object field invalid");
@@ -138,8 +137,9 @@ static int tag_parse(git_tag *tag, const char *buffer, const char *buffer_end)
 	tag->message = NULL;
 	if (buffer < buffer_end) {
 		/* If we're not at the end of the header, search for it */
-		if( *buffer != '\n' ) {
-			search = strstr(buffer, "\n\n");
+		if(*buffer != '\n') {
+			search = git__memmem(buffer, buffer_end - buffer,
+					     "\n\n", 2);
 			if (search)
 				buffer = search + 1;
 			else
@@ -229,11 +229,11 @@ static int write_tag_annotation(
 	if (git_odb_write(oid, odb, tag.ptr, tag.size, GIT_OBJ_TAG) < 0)
 		goto on_error;
 
-	git_buf_dispose(&tag);
+	git_buf_free(&tag);
 	return 0;
 
 on_error:
-	git_buf_dispose(&tag);
+	git_buf_free(&tag);
 	giterr_set(GITERR_OBJECT, "failed to create tag annotation");
 	return -1;
 }
@@ -268,7 +268,7 @@ static int git_tag_create__internal(
 	/** Ensure the tag name doesn't conflict with an already existing
 	 *	reference unless overwriting has explicitly been requested **/
 	if (error == 0 && !allow_ref_overwrite) {
-		git_buf_dispose(&ref_name);
+		git_buf_free(&ref_name);
 		giterr_set(GITERR_TAG, "tag already exists");
 		return GIT_EEXISTS;
 	}
@@ -283,7 +283,7 @@ static int git_tag_create__internal(
 
 cleanup:
 	git_reference_free(new_ref);
-	git_buf_dispose(&ref_name);
+	git_buf_free(&ref_name);
 	return error;
 }
 
@@ -381,7 +381,7 @@ int git_tag_create_frombuffer(git_oid *oid, git_repository *repo, const char *bu
 	git_odb_stream_free(stream);
 
 	if (error < 0) {
-		git_buf_dispose(&ref_name);
+		git_buf_free(&ref_name);
 		return error;
 	}
 
@@ -389,7 +389,7 @@ int git_tag_create_frombuffer(git_oid *oid, git_repository *repo, const char *bu
 		&new_ref, repo, ref_name.ptr, oid, allow_ref_overwrite, NULL);
 
 	git_reference_free(new_ref);
-	git_buf_dispose(&ref_name);
+	git_buf_free(&ref_name);
 
 	return error;
 
@@ -409,7 +409,7 @@ int git_tag_delete(git_repository *repo, const char *tag_name)
 
 	error = retrieve_tag_reference(&tag_ref, &ref_name, repo, tag_name);
 
-	git_buf_dispose(&ref_name);
+	git_buf_free(&ref_name);
 
 	if (error < 0)
 		return error;

data/vendor/libgit2/src/trace.h

@@ -35,7 +35,7 @@ GIT_INLINE(void) git_trace__write_fmt(
 
 	callback(level, git_buf_cstr(&message));
 
-	git_buf_dispose(&message);
+	git_buf_free(&message);
 }
 
 #define git_trace_level()		(git_trace__data.level)

data/vendor/libgit2/src/trailer.c

@@ -36,7 +36,7 @@ static const char *next_line(const char *str)
 	if (nl) {
 		return nl + 1;
 	} else {
-		/* return pointer to the NUL terminator: */
+		// return pointer to the NUL terminator:
 		return str + strlen(str);
 	}
 }
@@ -310,12 +310,12 @@ int git_message_trailers(git_message_trailer_array *trailer_arr, const char *mes
 				}
 
 				if (isalnum(*ptr) || *ptr == '-') {
-					/* legal key character */
+					// legal key character
 					NEXT(S_KEY);
 				}
 
 				if (*ptr == ' ' || *ptr == '\t') {
-					/* optional whitespace before separator */
+					// optional whitespace before separator
 					*ptr = 0;
 					NEXT(S_KEY_WS);
 				}
@@ -325,7 +325,7 @@ int git_message_trailers(git_message_trailer_array *trailer_arr, const char *mes
 					NEXT(S_SEP_WS);
 				}
 
-				/* illegal character */
+				// illegal character
 				GOTO(S_IGNORE);
 			}
 			case S_KEY_WS: {
@@ -341,7 +341,7 @@ int git_message_trailers(git_message_trailer_array *trailer_arr, const char *mes
 					NEXT(S_SEP_WS);
 				}
 
-				/* illegal character */
+				// illegal character
 				GOTO(S_IGNORE);
 			}
 			case S_SEP_WS: {
@@ -369,7 +369,7 @@ int git_message_trailers(git_message_trailer_array *trailer_arr, const char *mes
 			}
 			case S_VALUE_NL: {
 				if (*ptr == ' ') {
-					/* continuation; */
+					// continuation;
 					NEXT(S_VALUE);
 				}
 

data/vendor/libgit2/src/transport.c

@@ -174,7 +174,7 @@ int git_transport_register(
 	return 0;
 
 on_error:
-	git_buf_dispose(&prefix);
+	git_buf_free(&prefix);
 	git__free(definition);
 	return error;
 }
@@ -210,7 +210,7 @@ int git_transport_unregister(const char *scheme)
 	error = GIT_ENOTFOUND;
 
 done:
-	git_buf_dispose(&prefix);
+	git_buf_free(&prefix);
 	return error;
 }
 

data/vendor/libgit2/src/transports/auth.c

@@ -40,7 +40,7 @@ on_error:
 	if (raw.size)
 		git__memzero(raw.ptr, raw.size);
 
-	git_buf_dispose(&raw);
+	git_buf_free(&raw);
 	return error;
 }
 

data/vendor/libgit2/src/transports/auth_negotiate.c

@@ -165,7 +165,7 @@ static int negotiate_next_token(
 done:
 	gss_release_name(&status_minor, &server);
 	gss_release_buffer(&status_minor, (gss_buffer_t) &output_token);
-	git_buf_dispose(&input_buf);
+	git_buf_free(&input_buf);
 	return error;
 }
 
@@ -180,7 +180,7 @@ static void negotiate_context_free(git_http_auth_context *c)
 		ctx->gss_context = GSS_C_NO_CONTEXT;
 	}
 
-	git_buf_dispose(&ctx->target);
+	git_buf_free(&ctx->target);
 
 	git__free(ctx->challenge);
 

data/vendor/libgit2/src/transports/git.c

@@ -87,7 +87,7 @@ static int send_command(git_proto_stream *s)
 		s->sent_command = 1;
 
 cleanup:
-	git_buf_dispose(&request);
+	git_buf_free(&request);
 	return error;
 }
 

data/vendor/libgit2/src/transports/http.c

@@ -188,6 +188,9 @@ static int apply_credentials(git_buf *buf, http_subtransport *t)
 	if (auth_context_match(&context, t, credtype_match, &cred->credtype) < 0)
 		return -1;
 
+	if (!context)
+		return 0;
+
 	return context->next_token(buf, context, cred);
 }
 
@@ -449,14 +452,14 @@ static int on_headers_complete(http_parser *parser)
 		return t->parse_error = PARSE_ERROR_GENERIC;
 
 	if (strcmp(t->content_type, git_buf_cstr(&buf))) {
-		git_buf_dispose(&buf);
+		git_buf_free(&buf);
 		giterr_set(GITERR_NET,
 			"invalid Content-Type: %s",
 			t->content_type);
 		return t->parse_error = PARSE_ERROR_GENERIC;
 	}
 
-	git_buf_dispose(&buf);
+	git_buf_free(&buf);
 
 	return 0;
 }
@@ -508,10 +511,10 @@ static void clear_parser_state(http_subtransport *t)
 	t->parse_error = 0;
 	t->parse_finished = 0;
 
-	git_buf_dispose(&t->parse_header_name);
+	git_buf_free(&t->parse_header_name);
 	git_buf_init(&t->parse_header_name, 0);
 
-	git_buf_dispose(&t->parse_header_value);
+	git_buf_free(&t->parse_header_value);
 	git_buf_init(&t->parse_header_value, 0);
 
 	git__free(t->content_type);
@@ -534,11 +537,11 @@ static int write_chunk(git_stream *io, const char *buffer, size_t len)
 		return -1;
 
 	if (git_stream_write(io, buf.ptr, buf.size, 0) < 0) {
-		git_buf_dispose(&buf);
+		git_buf_free(&buf);
 		return -1;
 	}
 
-	git_buf_dispose(&buf);
+	git_buf_free(&buf);
 
 	/* Chunk body */
 	if (len > 0 && git_stream_write(io, buffer, len, 0) < 0)
@@ -671,11 +674,11 @@ replay:
 			return -1;
 
 		if (git_stream_write(t->io, request.ptr, request.size, 0) < 0) {
-			git_buf_dispose(&request);
+			git_buf_free(&request);
 			return -1;
 		}
 
-		git_buf_dispose(&request);
+		git_buf_free(&request);
 
 		s->sent_request = 1;
 	}
@@ -792,11 +795,11 @@ static int http_stream_write_chunked(
 			return -1;
 
 		if (git_stream_write(t->io, request.ptr, request.size, 0) < 0) {
-			git_buf_dispose(&request);
+			git_buf_free(&request);
 			return -1;
 		}
 
-		git_buf_dispose(&request);
+		git_buf_free(&request);
 
 		s->sent_request = 1;
 	}
@@ -870,13 +873,13 @@ static int http_stream_write_single(
 	if (len && git_stream_write(t->io, buffer, len, 0) < 0)
 		goto on_error;
 
-	git_buf_dispose(&request);
+	git_buf_free(&request);
 	s->sent_request = 1;
 
 	return 0;
 
 on_error:
-	git_buf_dispose(&request);
+	git_buf_free(&request);
 	return -1;
 }
 

data/vendor/libgit2/src/transports/local.c

@@ -228,14 +228,14 @@ static int local_connect(
 
 	/* 'url' may be a url or path; convert to a path */
 	if ((error = git_path_from_url_or_path(&buf, url)) < 0) {
-		git_buf_dispose(&buf);
+		git_buf_free(&buf);
 		return error;
 	}
 	path = git_buf_cstr(&buf);
 
 	error = git_repository_open(&repo, path);
 
-	git_buf_dispose(&buf);
+	git_buf_free(&buf);
 
 	if (error < 0)
 		return -1;
@@ -354,14 +354,14 @@ static int local_push(
 
 	/* 'push->remote->url' may be a url or path; convert to a path */
 	if ((error = git_path_from_url_or_path(&buf, push->remote->url)) < 0) {
-		git_buf_dispose(&buf);
+		git_buf_free(&buf);
 		return error;
 	}
 	path = git_buf_cstr(&buf);
 
 	error = git_repository_open(&remote_repo, path);
 
-	git_buf_dispose(&buf);
+	git_buf_free(&buf);
 
 	if (error < 0)
 		return error;
@@ -383,7 +383,7 @@ static int local_push(
 		goto on_error;
 
 	error = git_packbuilder_write(push->pb, odb_path.ptr, 0, transfer_to_push_transfer, (void *) cbs);
-	git_buf_dispose(&odb_path);
+	git_buf_free(&odb_path);
 
 	if (error < 0)
 		goto on_error;
@@ -502,7 +502,7 @@ static int local_counting(int stage, unsigned int current, unsigned int total, v
 		return -1;
 
 	error = t->progress_cb(git_buf_cstr(&progress_info), git_buf_len(&progress_info), t->message_cb_payload);
-	git_buf_dispose(&progress_info);
+	git_buf_free(&progress_info);
 
 	return error;
 }
@@ -627,7 +627,7 @@ static int local_download_pack(
 
 cleanup:
 	if (writepack) writepack->free(writepack);
-	git_buf_dispose(&progress_info);
+	git_buf_free(&progress_info);
 	git_packbuilder_free(pack);
 	git_revwalk_free(walk);
 	return error;

data/vendor/libgit2/src/transports/smart.c

@@ -45,9 +45,13 @@ GIT_INLINE(int) git_smart__reset_stream(transport_smart *t, bool close_subtransp
 		t->current_stream = NULL;
 	}
 
-	if (close_subtransport &&
-		t->wrapped->close(t->wrapped) < 0)
-		return -1;
+	if (close_subtransport) {
+		git__free(t->url);
+		t->url = NULL;
+
+		if (t->wrapped->close(t->wrapped) < 0)
+			return -1;
+	}
 
 	return 0;
 }
@@ -82,7 +86,7 @@ static bool is_malformed_http_header(const char *http_header)
 	const char *c;
 	int name_len;
 
-	/* Disallow \r and \n */
+	// Disallow \r and \n
 	c = strchr(http_header, '\r');
 	if (c)
 		return true;
@@ -90,7 +94,7 @@ static bool is_malformed_http_header(const char *http_header)
 	if (c)
 		return true;
 
-	/* Require a header name followed by : */
+	// Require a header name followed by :
 	name_len = http_header_name_length(http_header);
 	if (name_len < 1)
 		return true;
@@ -112,7 +116,7 @@ static bool is_forbidden_custom_header(const char *custom_header)
 	unsigned long i;
 	int name_len = http_header_name_length(custom_header);
 
-	/* Disallow headers that we set */
+	// Disallow headers that we set
 	for (i = 0; i < ARRAY_SIZE(forbidden_custom_headers); i++)
 		if (strncmp(forbidden_custom_headers[i], custom_header, name_len) == 0)
 			return true;
@@ -167,13 +171,11 @@ int git_smart__update_heads(transport_smart *t, git_vector *symrefs)
 			git_vector_foreach(symrefs, j, spec) {
 				git_buf_clear(&buf);
 				if (git_refspec_src_matches(spec, ref->head.name) &&
-				    !(error = git_refspec_transform(&buf, spec, ref->head.name))) {
-					git__free(ref->head.symref_target);
+				    !(error = git_refspec_transform(&buf, spec, ref->head.name)))
 					ref->head.symref_target = git_buf_detach(&buf);
-				}
 			}
 
-			git_buf_dispose(&buf);
+			git_buf_free(&buf);
 
 			if (error < 0)
 				return error;
@@ -192,7 +194,7 @@ static void free_symrefs(git_vector *symrefs)
 	size_t i;
 
 	git_vector_foreach(symrefs, i, spec) {
-		git_refspec__dispose(spec);
+		git_refspec__free(spec);
 		git__free(spec);
 	}
 
@@ -268,21 +270,14 @@ static int git_smart__connect(
 	/* We now have loaded the refs. */
 	t->have_refs = 1;
 
-	pkt = (git_pkt *)git_vector_get(&t->refs, 0);
-	if (pkt && GIT_PKT_REF != pkt->type) {
-		giterr_set(GITERR_NET, "invalid response");
-		return -1;
-	}
-	first = (git_pkt_ref *)pkt;
+	first = (git_pkt_ref *)git_vector_get(&t->refs, 0);
 
 	if ((error = git_vector_init(&symrefs, 1, NULL)) < 0)
 		return error;
 
 	/* Detect capabilities */
-	if (git_smart__detect_caps(first, &t->caps, &symrefs) < 0) {
-		free_symrefs(&symrefs);
+	if (git_smart__detect_caps(first, &t->caps, &symrefs) < 0)
 		return -1;
-	}
 
 	/* If the only ref in the list is capabilities^{} with OID_ZERO, remove it */
 	if (1 == t->refs.length && !strcmp(first->head.name, "capabilities^{}") &&