You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by as...@apache.org on 2016/02/02 21:47:43 UTC

[1/3] qpid-proton git commit: PROTON-1124: Fix missing error handling discovered by Coverity

Repository: qpid-proton
Updated Branches:
  refs/heads/master acbaa502b -> 822745298


PROTON-1124: Fix missing error handling discovered by Coverity


Project: http://git-wip-us.apache.org/repos/asf/qpid-proton/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-proton/commit/d8537ee7
Tree: http://git-wip-us.apache.org/repos/asf/qpid-proton/tree/d8537ee7
Diff: http://git-wip-us.apache.org/repos/asf/qpid-proton/diff/d8537ee7

Branch: refs/heads/master
Commit: d8537ee7dbc3f0b17f94cd8b2c2fcf629e70437c
Parents: acbaa50
Author: Andrew Stitcher <as...@apache.org>
Authored: Mon Feb 1 17:28:49 2016 -0500
Committer: Andrew Stitcher <as...@apache.org>
Committed: Tue Feb 2 15:40:00 2016 -0500

----------------------------------------------------------------------
 proton-c/src/message/message.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/d8537ee7/proton-c/src/message/message.c
----------------------------------------------------------------------
diff --git a/proton-c/src/message/message.c b/proton-c/src/message/message.c
index b24a994..cb163d1 100644
--- a/proton-c/src/message/message.c
+++ b/proton-c/src/message/message.c
@@ -665,8 +665,10 @@ int pn_message_decode(pn_message_t *msg, const char *bytes, size_t size)
 
     switch (desc) {
     case HEADER:
-      pn_data_scan(msg->data, "D.[oBIoI]", &msg->durable, &msg->priority,
+      err = pn_data_scan(msg->data, "D.[oBIoI]", &msg->durable, &msg->priority,
                    &msg->ttl, &msg->first_acquirer, &msg->delivery_count);
+      if (err) return pn_error_format(msg->error, err, "data error: %s",
+                                      pn_error_text(pn_data_error(msg->data)));
       break;
     case PROPERTIES:
       {


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org


[2/3] qpid-proton git commit: PROTON-1124: Removed dead code pointed out by Coverity

Posted by as...@apache.org.
PROTON-1124: Removed dead code pointed out by Coverity


Project: http://git-wip-us.apache.org/repos/asf/qpid-proton/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-proton/commit/3b8be927
Tree: http://git-wip-us.apache.org/repos/asf/qpid-proton/tree/3b8be927
Diff: http://git-wip-us.apache.org/repos/asf/qpid-proton/diff/3b8be927

Branch: refs/heads/master
Commit: 3b8be927b41c350ff5b10da4cea036dda0d236cb
Parents: d8537ee
Author: Andrew Stitcher <as...@apache.org>
Authored: Mon Feb 1 17:33:40 2016 -0500
Committer: Andrew Stitcher <as...@apache.org>
Committed: Tue Feb 2 15:40:07 2016 -0500

----------------------------------------------------------------------
 proton-c/src/scanner.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/3b8be927/proton-c/src/scanner.c
----------------------------------------------------------------------
diff --git a/proton-c/src/scanner.c b/proton-c/src/scanner.c
index 84d8e3f..9a058e9 100644
--- a/proton-c/src/scanner.c
+++ b/proton-c/src/scanner.c
@@ -227,7 +227,7 @@ static int pni_scanner_alpha(pn_scanner_t *scanner, const char *str)
   }
 
   pni_scanner_emit(scanner, type, str, n);
-  return type == PN_TOK_ERR ? pn_scanner_err(scanner, PN_ERR, "unrecognized keyword") : 0;
+  return 0;
 }
 
 static int pni_scanner_symbol(pn_scanner_t *scanner, const char *str)


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org


[3/3] qpid-proton git commit: PROTON-1043: Fix error in boolean flag check [discovered both by aconway and Coverity)

Posted by as...@apache.org.
PROTON-1043: Fix error in boolean flag check
[discovered both by aconway and Coverity)


Project: http://git-wip-us.apache.org/repos/asf/qpid-proton/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-proton/commit/82274529
Tree: http://git-wip-us.apache.org/repos/asf/qpid-proton/tree/82274529
Diff: http://git-wip-us.apache.org/repos/asf/qpid-proton/diff/82274529

Branch: refs/heads/master
Commit: 8227452984349b3ab5e69489c7d40b6b4ffbf4f5
Parents: 3b8be92
Author: Andrew Stitcher <as...@apache.org>
Authored: Mon Feb 1 17:41:07 2016 -0500
Committer: Andrew Stitcher <as...@apache.org>
Committed: Tue Feb 2 15:40:13 2016 -0500

----------------------------------------------------------------------
 proton-c/src/messenger/messenger.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/82274529/proton-c/src/messenger/messenger.c
----------------------------------------------------------------------
diff --git a/proton-c/src/messenger/messenger.c b/proton-c/src/messenger/messenger.c
index b08e00a..cd6585b 100644
--- a/proton-c/src/messenger/messenger.c
+++ b/proton-c/src/messenger/messenger.c
@@ -1495,7 +1495,7 @@ int pn_messenger_start(pn_messenger_t *messenger)
   // returned. Currently no attempt is made to check the name part of the
   // address, as the intent here is to fail fast if the addressed host
   // is invalid or unavailable.
-  if (messenger->flags | PN_FLAGS_CHECK_ROUTES) {
+  if (messenger->flags & PN_FLAGS_CHECK_ROUTES) {
     pn_list_t *substitutions = pn_list(PN_WEAKREF, 0);
     pn_transform_get_substitutions(messenger->routes, substitutions);
     for (size_t i = 0; i < pn_list_size(substitutions) && error == 0; i++) {


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org