From: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Date: Fri, 29 Nov 2013 06:19:33 +0000 (+0100)
Subject: Merge branch 'master' into bindings/python
X-Git-Tag: v1.2.0-rc1~39
X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=commitdiff_plain;h=024e61817685a20caceb4e3ef3bdc019a7af6b6e

Merge branch 'master' into bindings/python

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
---

024e61817685a20caceb4e3ef3bdc019a7af6b6e
diff --cc formats/ctf/types/array.c
index 04801d4f,b1e8d6c5..979f7a3d
--- a/formats/ctf/types/array.c
+++ b/formats/ctf/types/array.c
@@@ -56,6 -57,9 +57,11 @@@ int ctf_array_read(struct bt_stream_po
  				g_string_insert_len(array_definition->string,
  					0, (char *) ctf_get_pos_addr(pos),
  					array_declaration->len);
 -				if (!ctf_move_pos(pos, array_declaration->len * CHAR_BIT))
 -					return -EFAULT;
 -				return 0;
++				/*
++				 * We want to populate both the string
++				 * and the underlying values, so carry
++				 * on calling bt_array_rw().
++				 */
  			}
  		}
  	}