You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by dn...@apache.org on 2015/05/06 14:39:18 UTC
[1/3] qpid-proton git commit: NO-JIRA: define pn_io_inspect as NULL
Repository: qpid-proton
Updated Branches:
refs/heads/master 81c211078 -> 136e33a4b
NO-JIRA: define pn_io_inspect as NULL
Project: http://git-wip-us.apache.org/repos/asf/qpid-proton/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-proton/commit/28a0ad94
Tree: http://git-wip-us.apache.org/repos/asf/qpid-proton/tree/28a0ad94
Diff: http://git-wip-us.apache.org/repos/asf/qpid-proton/diff/28a0ad94
Branch: refs/heads/master
Commit: 28a0ad94723c0f09c2f5689d388f3b2000799ef0
Parents: dddfde2
Author: Dominic Evans <do...@uk.ibm.com>
Authored: Wed Apr 29 19:04:32 2015 +0100
Committer: Dominic Evans <do...@uk.ibm.com>
Committed: Wed May 6 13:36:11 2015 +0100
----------------------------------------------------------------------
proton-c/src/posix/io.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/28a0ad94/proton-c/src/posix/io.c
----------------------------------------------------------------------
diff --git a/proton-c/src/posix/io.c b/proton-c/src/posix/io.c
index 4a7e883..fe0bf73 100644
--- a/proton-c/src/posix/io.c
+++ b/proton-c/src/posix/io.c
@@ -64,7 +64,7 @@ void pn_io_finalize(void *obj)
#define pn_io_hashcode NULL
#define pn_io_compare NULL
-#define pn_io_inspect
+#define pn_io_inspect NULL
pn_io_t *pn_io(void)
{
---------------------------------------------------------------------
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: NO-JIRA: prevent out-of-bounds memory
access
Posted by dn...@apache.org.
NO-JIRA: prevent out-of-bounds memory access
Project: http://git-wip-us.apache.org/repos/asf/qpid-proton/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-proton/commit/dddfde20
Tree: http://git-wip-us.apache.org/repos/asf/qpid-proton/tree/dddfde20
Diff: http://git-wip-us.apache.org/repos/asf/qpid-proton/diff/dddfde20
Branch: refs/heads/master
Commit: dddfde20dcf7cb2631c04eea2aea42b5a5f180f1
Parents: 81c2110
Author: Dominic Evans <do...@uk.ibm.com>
Authored: Wed Apr 29 17:09:29 2015 +0100
Committer: Dominic Evans <do...@uk.ibm.com>
Committed: Wed May 6 13:36:11 2015 +0100
----------------------------------------------------------------------
proton-c/src/codec/codec.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/dddfde20/proton-c/src/codec/codec.c
----------------------------------------------------------------------
diff --git a/proton-c/src/codec/codec.c b/proton-c/src/codec/codec.c
index 25d3701..29580e2 100644
--- a/proton-c/src/codec/codec.c
+++ b/proton-c/src/codec/codec.c
@@ -477,6 +477,7 @@ int pn_data_intern_node(pn_data_t *data, pni_node_t *node)
int pn_data_vfill(pn_data_t *data, const char *fmt, va_list ap)
{
int err = 0;
+ const char *begin = fmt;
while (*fmt) {
char code = *(fmt++);
if (!code) return 0;
@@ -578,7 +579,7 @@ int pn_data_vfill(pn_data_t *data, const char *fmt, va_list ap)
}
break;
case '[':
- if (*(fmt - 2) != 'T') {
+ if (fmt < (begin + 2) || *(fmt - 2) != 'T') {
err = pn_data_put_list(data);
if (err) return err;
pn_data_enter(data);
---------------------------------------------------------------------
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: NO-JIRA: struct initialisation warning
fixes
Posted by dn...@apache.org.
NO-JIRA: struct initialisation warning fixes
Closes #26
Project: http://git-wip-us.apache.org/repos/asf/qpid-proton/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-proton/commit/136e33a4
Tree: http://git-wip-us.apache.org/repos/asf/qpid-proton/tree/136e33a4
Diff: http://git-wip-us.apache.org/repos/asf/qpid-proton/diff/136e33a4
Branch: refs/heads/master
Commit: 136e33a4b16f0fca700abc26cab61ad6114cb83f
Parents: 28a0ad9
Author: Dominic Evans <do...@uk.ibm.com>
Authored: Wed Apr 29 19:06:46 2015 +0100
Committer: Dominic Evans <do...@uk.ibm.com>
Committed: Wed May 6 13:38:53 2015 +0100
----------------------------------------------------------------------
proton-c/src/codec/codec.c | 2 +-
proton-c/src/scanner.c | 2 +-
proton-c/src/transport/transport.c | 3 ++-
3 files changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/136e33a4/proton-c/src/codec/codec.c
----------------------------------------------------------------------
diff --git a/proton-c/src/codec/codec.c b/proton-c/src/codec/codec.c
index 29580e2..e8750fe 100644
--- a/proton-c/src/codec/codec.c
+++ b/proton-c/src/codec/codec.c
@@ -1934,7 +1934,7 @@ pn_atom_t pn_data_get_atom(pn_data_t *data)
if (node) {
return *((pn_atom_t *) &node->atom);
} else {
- pn_atom_t t = {PN_NULL};
+ pn_atom_t t = {PN_NULL, {0,}};
return t;
}
}
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/136e33a4/proton-c/src/scanner.c
----------------------------------------------------------------------
diff --git a/proton-c/src/scanner.c b/proton-c/src/scanner.c
index b35bb3a..ef54db4 100644
--- a/proton-c/src/scanner.c
+++ b/proton-c/src/scanner.c
@@ -94,7 +94,7 @@ pn_token_t pn_scanner_token(pn_scanner_t *scanner)
if (scanner) {
return scanner->token;
} else {
- pn_token_t tok = {PN_TOK_ERR};
+ pn_token_t tok = {PN_TOK_ERR, 0, (size_t)0};
return tok;
}
}
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/136e33a4/proton-c/src/transport/transport.c
----------------------------------------------------------------------
diff --git a/proton-c/src/transport/transport.c b/proton-c/src/transport/transport.c
index 6868135..f6c3c19 100644
--- a/proton-c/src/transport/transport.c
+++ b/proton-c/src/transport/transport.c
@@ -843,7 +843,8 @@ int pn_post_frame(pn_transport_t *transport, uint8_t type, uint16_t ch, const ch
return PN_ERR;
}
- pn_frame_t frame = {type};
+ pn_frame_t frame = {0,};
+ frame.type = type;
frame.channel = ch;
frame.payload = buf.start;
frame.size = wr;
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org