Re: [PATCH v3 04/19] refs.c: return error string from ref_update_reject_duplicates on failure

[Ronnie Sahlberg]

Thanks.

Replaced with strbuf_addf() instead.

On Fri, Apr 25, 2014 at 3:12 PM, Jonathan Nieder jrnie...@gmail.com wrote:
 Ronnie Sahlberg wrote:

 --- a/refs.c
 +++ b/refs.c
 @@ -3393,6 +3393,7 @@ static int ref_update_compare(const void *r1, const 
 void *r2)
  }

  static int ref_update_reject_duplicates(struct ref_update **updates, int n,
 + char **err,
   enum action_on_err onerr)
  {
   int i;
 @@ -3400,6 +3401,11 @@ static int ref_update_reject_duplicates(struct 
 ref_update **updates, int n,
   if (!strcmp(updates[i - 1]-refname, updates[i]-refname)) {
   const char *str =
   Multiple updates for ref '%s' not allowed.;
 + if (err) {
 + *err = xmalloc(PATH_MAX + 41);
 + snprintf(*err, PATH_MAX + 41, str,
 +  updates[i]-refname);
 + }

 Same issues as the previous patch: it's too easy to get the buffer size
 wrong when updating the message (or, worse, when making it
 translatable).  aprintf or a strbuf should work better.

 Otherwise seems sensible.
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PATCH v3 04/19] refs.c: return error string from ref_update_reject_duplicates on failure

[Ronnie Sahlberg]

Signed-off-by: Ronnie Sahlberg sahlb...@google.com
---
 refs.c | 8 +++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/refs.c b/refs.c
index 0712912..9d9eab8 100644
--- a/refs.c
+++ b/refs.c
@@ -3393,6 +3393,7 @@ static int ref_update_compare(const void *r1, const void 
*r2)
 }
 
 static int ref_update_reject_duplicates(struct ref_update **updates, int n,
+   char **err,
enum action_on_err onerr)
 {
int i;
@@ -3400,6 +3401,11 @@ static int ref_update_reject_duplicates(struct 
ref_update **updates, int n,
if (!strcmp(updates[i - 1]-refname, updates[i]-refname)) {
const char *str =
Multiple updates for ref '%s' not allowed.;
+   if (err) {
+   *err = xmalloc(PATH_MAX + 41);
+   snprintf(*err, PATH_MAX + 41, str,
+updates[i]-refname);
+   }
switch (onerr) {
case UPDATE_REFS_MSG_ON_ERR:
error(str, updates[i]-refname); break;
@@ -3433,7 +3439,7 @@ int ref_transaction_commit(struct ref_transaction 
*transaction,
 
/* Copy, sort, and reject duplicate refs */
qsort(updates, n, sizeof(*updates), ref_update_compare);
-   ret = ref_update_reject_duplicates(updates, n, onerr);
+   ret = ref_update_reject_duplicates(updates, n, err, onerr);
if (ret)
goto cleanup;
 
-- 
1.9.1.521.g5dc89fa

--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH v3 04/19] refs.c: return error string from ref_update_reject_duplicates on failure

[Jonathan Nieder]

Ronnie Sahlberg wrote:

 --- a/refs.c
 +++ b/refs.c
 @@ -3393,6 +3393,7 @@ static int ref_update_compare(const void *r1, const 
 void *r2)
  }
  
  static int ref_update_reject_duplicates(struct ref_update **updates, int n,
 + char **err,
   enum action_on_err onerr)
  {
   int i;
 @@ -3400,6 +3401,11 @@ static int ref_update_reject_duplicates(struct 
 ref_update **updates, int n,
   if (!strcmp(updates[i - 1]-refname, updates[i]-refname)) {
   const char *str =
   Multiple updates for ref '%s' not allowed.;
 + if (err) {
 + *err = xmalloc(PATH_MAX + 41);
 + snprintf(*err, PATH_MAX + 41, str,
 +  updates[i]-refname);
 + }

Same issues as the previous patch: it's too easy to get the buffer size
wrong when updating the message (or, worse, when making it
translatable).  aprintf or a strbuf should work better.

Otherwise seems sensible.
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html