MonetDB: Oct2014 - Don't use a pointer after it was freed.

[Sjoerd Mullender]

Changeset: d290a7440435 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=d290a7440435
Modified Files:
        sql/backends/monet5/bam/bam_wrapper.c
Branch: Oct2014
Log Message:

Don't use a pointer after it was freed.


diffs (18 lines):

diff --git a/sql/backends/monet5/bam/bam_wrapper.c 
b/sql/backends/monet5/bam/bam_wrapper.c
--- a/sql/backends/monet5/bam/bam_wrapper.c
+++ b/sql/backends/monet5/bam/bam_wrapper.c
@@ -942,11 +942,12 @@ process_header(bam_wrapper * bw)
                                                                   
rg_fields_found[11]);
 
                                        /* if this point is reached, option 
wasn't recognized */
-                                       clear_bam_header_line(&hl);
-                                       throw(MAL, "process_header",
+                                       msg = createException(MAL, 
"process_header",
                                                  ERR_PROCESS_HEADER
                                                  "Unknown option '%s' found in 
header tag RG",
                                                  bw->file_location, 
hl.options[o].tag);
+                                       clear_bam_header_line(&hl);
+                                       return msg;
                                }
                                if (!rg_fields_found[0]) {
                                        clear_bam_header_line(&hl);
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list