Changeset 76b5a95c in mainline for uspace/app/sbi/src/imode.c

Timestamp:

2011-03-23T20:53:30Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

71af5a4

Parents:

5716e9a (diff), ab10b842 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes.

File:

• uspace/app/sbi/src/imode.c (modified) (3 diffs)

uspace/app/sbi/src/imode.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2010 Jiri Svoboda
+ * Copyright (c) 2011 Jiri Svoboda
  * All rights reserved.
  *
@@ -178 +178 @@
                         /* Convert expression result to value item. */
                         run_cvt_value_item(&run, rexpr, &rexpr_vi);
+                        rdata_item_destroy(rexpr);
+
+                        /* Check for unhandled exceptions. */
+                        run_exc_check_unhandled(&run);
+                } else {
+                        rexpr_vi = NULL;
+                }
+
+                /*
+                 * rexpr_vi can be NULL if either repxr was null or
+                 * if the conversion to value item raised an exception.
+                 */
+                if (rexpr_vi != NULL) {
                         assert(rexpr_vi->ic == ic_value);
 
@@ -184 +197 @@
                         rdata_value_print(rexpr_vi->u.value);
                         printf("\n");
+
+                        rdata_item_destroy(rexpr_vi);
                 }
         }
+
+        run_proc_ar_destroy(&run, proc_ar);
 
         /* Remove block visit record from the stack, */