Fix: add stricter checks on packet boundaries

[babeltrace.git] / formats / ctf / types / string.c

diff --git a/formats/ctf/types/string.c b/formats/ctf/types/string.c
index 3b54a2df680ea5acffbba3c6f932aff1f2da096c..3dd1414a0e078882160c7de6d28226d7a27b0973 100644 (file)
--- a/formats/ctf/types/string.c
+++ b/formats/ctf/types/string.c
@@ -16,6 +16,14 @@
  *
  * The above copyright notice and this permission notice shall be included in
  * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
  */
 
 #include <babeltrace/babeltrace-internal.h>
@@ -23,7 +31,7 @@
 #include <limits.h>            /* C99 limits */
 #include <string.h>
 
-int ctf_string_read(struct stream_pos *ppos, struct definition *definition)
+int ctf_string_read(struct bt_stream_pos *ppos, struct bt_definition *definition)
 {
        struct definition_string *string_definition =
                container_of(definition, struct definition_string, p);
@@ -34,7 +42,8 @@ int ctf_string_read(struct stream_pos *ppos, struct definition *definition)
        ssize_t max_len;
        char *srcaddr;
 
-       ctf_align_pos(pos, string_declaration->p.alignment);
+       if (!ctf_align_pos(pos, string_declaration->p.alignment))
+               return -EFAULT;
 
        srcaddr = ctf_get_pos_addr(pos);
        if (pos->offset == EOF)
@@ -56,12 +65,13 @@ int ctf_string_read(struct stream_pos *ppos, struct definition *definition)
        printf_debug("CTF string read %s\n", srcaddr);
        memcpy(string_definition->value, srcaddr, len);
        string_definition->len = len;
-       ctf_move_pos(pos, len * CHAR_BIT);
+       if (!ctf_move_pos(pos, len * CHAR_BIT))
+               return -EFAULT;
        return 0;
 }
 
-int ctf_string_write(struct stream_pos *ppos,
-                     struct definition *definition)
+int ctf_string_write(struct bt_stream_pos *ppos,
+                     struct bt_definition *definition)
 {
        struct definition_string *string_definition =
                container_of(definition, struct definition_string, p);
@@ -71,7 +81,8 @@ int ctf_string_write(struct stream_pos *ppos,
        size_t len;
        char *destaddr;
 
-       ctf_align_pos(pos, string_declaration->p.alignment);
+       if (!ctf_align_pos(pos, string_declaration->p.alignment))
+               return -EFAULT;
        assert(string_definition->value != NULL);
        len = string_definition->len;
 
@@ -83,6 +94,7 @@ int ctf_string_write(struct stream_pos *ppos,
        destaddr = ctf_get_pos_addr(pos);
        memcpy(destaddr, string_definition->value, len);
 end:
-       ctf_move_pos(pos, len * CHAR_BIT);
+       if (!ctf_move_pos(pos, len * CHAR_BIT))
+               return -EFAULT;
        return 0;
 }