Changeset 20819

Timestamp:

Nov 24, 2008, 10:43:38 AM (17 years ago)

Author:

eugene

Message:

handle errors in dbCheckStack

Location:

trunk/Ohana/src/opihi/dvo

Files:

• avextract.c (modified) (1 diff)
• mextract.c (modified) (1 diff)
• mmextract.c (modified) (1 diff)

trunk/Ohana/src/opihi/dvo/avextract.c

@@ -65 +65 @@
   // parse stack elements into fields and scalars as needed
   Nreturn = Nfields; 
-  dbCheckStack (stack, Nstack, DVO_TABLE_AVERAGE, &fields, &Nfields);
+  if (!dbCheckStack (stack, Nstack, DVO_TABLE_AVERAGE, &fields, &Nfields)) goto escape;
   // XXX handle errors
 

trunk/Ohana/src/opihi/dvo/mextract.c

@@ -70 +70 @@
   // parse stack elements into fields and scalars as needed
   Nreturn = Nfields; 
-  dbCheckStack (stack, Nstack, DVO_TABLE_MEASURE, &fields, &Nfields);
+  if (!dbCheckStack (stack, Nstack, DVO_TABLE_MEASURE, &fields, &Nfields)) goto escape;
   // XXX handle errors
 

trunk/Ohana/src/opihi/dvo/mmextract.c

@@ -120 +120 @@
   Nreturn = 2*Nfields; // we are returning fieldi_1, fieldi_2 for the selected fields
 
-  dbCheckStack (stack1, Nstack1, DVO_TABLE_MEASURE, &fields, &Nfields);
-  dbCheckStack (stack2, Nstack2, DVO_TABLE_MEASURE, &fields, &Nfields);
+  if (!dbCheckStack (stack1, Nstack1, DVO_TABLE_MEASURE, &fields, &Nfields)) goto escape;
+  if (!dbCheckStack (stack2, Nstack2, DVO_TABLE_MEASURE, &fields, &Nfields)) goto escape;
   // XXX handle errors