commit 48d0ed6753beba44f3aa579be29278eecdca10ad
author Selim Gurun <sgurun@google.com> Thu Apr 05 18:27:27 2012 -0700
committer Selim Gurun <sgurun@google.com> Thu Apr 05 18:34:57 2012 -0700
tree 349e15eb98bca83890309dc6bbefea07f04986df
parent df143a5041f03a22808b59c76698770b74692815

Suppress a boundary check warning

Bug: 6296965

When we enable boundary check in gcc 4.6, we get a compiler error in libxml
code. The xml code seems likely safe, however, to suppress the warning
we need to strengthen the check. We will report the issue to upstream
xml for best action.

Change-Id: Ib9670a994d741102a287a9efe079147047abd936

xpath.c

diff --git a/xpath.c b/xpath.c
index d9d902c..8900313 100644
--- a/xpath.c
+++ b/xpath.c
@@ -2806,7 +2806,7 @@
 
 	    /* Finally copy result back to caller */
 	    size = strlen(work) + 1;
-	    if (size > buffersize) {
+	    if (size > buffersize && buffersize <= (int)sizeof(work)) {
 		work[buffersize - 1] = 0;
 		size = buffersize;
 	    }