Fixes and leaks

include/EST_TMatrix.h

@@ -171,7 +171,7 @@ class EST_TMatrix : public EST_TVector<T>
   /**@name access
     * Basic access methods for matrices.
     */
-  //@{
+  ///@{
 
   /// return number of rows
   ssize_t num_rows() const {return this->p_num_rows;}
@@ -201,7 +201,7 @@ class EST_TMatrix : public EST_TVector<T>
   /// non-const element access operator
   T &operator () (ssize_t row, ssize_t col) { return a(row,col); }
 
-  //@}
+  ///@}
 
   bool have_rows_before(ssize_t n) const;
   bool have_columns_before(ssize_t n) const;
@@ -230,7 +230,7 @@ class EST_TMatrix : public EST_TVector<T>
     * memory with the original, so altering values them alters
     * the original. 
     */
-  //@{
+  ///@{
 
   /// Make the vector `rv` a window onto row `r`
   void row(EST_TVector<T> &rv, ssize_t r, ssize_t start_c=0, int len=-1);
@@ -240,12 +240,12 @@ class EST_TMatrix : public EST_TVector<T>
   void sub_matrix(EST_TMatrix<T> &sm,
 		  ssize_t r=0, ptrdiff_t numr=EST_ALL, 
 		  ssize_t c=0, ptrdiff_t numc=EST_ALL);
-  //@}
+  ///@}
 
   /**@name Copy in and out
     * Copy data between buffers and the matrix.
     */
-  //@{
+  ///@{
     /** Copy row `r` of matrix to `buf`. `buf`
         should be pre-malloced to the correct size.
         */
@@ -296,11 +296,11 @@ class EST_TMatrix : public EST_TVector<T>
   void set_memory(T *buffer, ptrdiff_t offset, ssize_t rows, ssize_t columns, 
 		  int free_when_destroyed=0);
 
-  //@}
+  ///@}
 
   /**@name Matrix file input / output
     */
-  //@{
+  ///@{
   /// load Matrix from file - Not currently implemented.
   EST_read_status  load(const class EST_String &filename);
   /// save Matrix to file `filename`
@@ -311,11 +311,12 @@ class EST_TMatrix : public EST_TVector<T>
     {ssize_t i, j; 
         for (i = 0; i < a.num_rows(); ++i) {
             for (j = 0; j < a.num_columns(); ++j) 
-                st << a.a_no_check(i, j) << " "; st << std::endl;
+                st << a.a_no_check(i, j) << " ";
+            st << std::endl;
         }
         return st;
     }
-  //@}
+  ///@}
 
 };
 

main/bcat_main.cc

@@ -70,17 +70,21 @@ int main(int argc, char *argv[])
 
     FILE *dest;
 
-    if ((dest=fopen(out_file, "wb")) == NULL)
+    if ((dest=fopen(out_file, "wb")) == NULL) {
       EST_sys_error("Can't create '%s'", (const char *)out_file);
+      return -1;
+    }
 
     EST_Litem *item;
 
     for(item=files.head(); item; item = item->next())
       {
 	FILE *src;
 
-	if ((src=fopen(files(item), "rb"))==NULL)
+	if ((src=fopen(files(item), "rb"))==NULL) {
 	  EST_sys_error("can't read '%s'", (const char *)files(item));
+      return -1;
+  }
 
 	unsigned int n;
 	char buf[BUFFER_SIZE];

main/pda_main.cc

@@ -48,7 +48,7 @@ void set_parameters(EST_Features &a_list, EST_Option &al);
 void option_override(EST_Features &op, EST_Option al, 
 		     const EST_String &option, const EST_String &arg);
 
-static int save_pm(EST_String filename, EST_Track fz);
+static int save_pm(EST_String filename, const EST_Track& fz);
 
 
 
@@ -175,7 +175,7 @@ void set_parameters(EST_Features &op, EST_Option &al)
 */
 
 
-static int save_pm(EST_String filename, EST_Track fz)
+static int save_pm(EST_String filename,const EST_Track& fz)
 {
     ostream *outf;
     float position, period;

main/wfst_train_main.cc

@@ -67,7 +67,6 @@ static int wfst_train_main(int argc, char **argv)
     EST_Option al;
     EST_StrList files;
     EST_String wfstfile;
-    FILE *ofd;
 
     parse_command_line
 	(argc, argv,
@@ -79,15 +78,6 @@ static int wfst_train_main(int argc, char **argv)
 	 "-heap <int> {210000}\n"+
 	 "                    Set size of Lisp heap, needed for large rulesets\n",
 	 files, al);
-
-    if (al.present("-o"))
-    {
-	if ((ofd=fopen(al.val("-o"),"w")) == NULL)
-	    EST_error("can't open output file for writing \"%s\"",
-		      (const char *)al.val("-o"));
-    }
-    else
-	ofd = stdout;
 
     if (al.present("-wfst"))
 	wfstfile = al.val("-wfst");

rxp/stdio16.c

@@ -364,23 +364,32 @@ CharacterEncoding GetFileEncoding(FILE16 *file)
 
 int Fprintf(FILE16 *file, const char *format, ...)
 {
+    int nchars;
     va_list args;
     va_start(args, format);
-    return Vfprintf(file, format, args);
+    nchars = Vfprintf(file, format, args);
+    va_end(args);
+    return nchars;
 }
 
 int Printf(const char *format, ...)
 {
+    int nchars;
     va_list args;
     va_start(args, format);
-    return Vfprintf(Stdout, format, args);
+    nchars = Vfprintf(Stdout, format, args);
+    va_end(args);
+    return nchars;
 }
 
 int Sprintf(void *buf, CharacterEncoding enc, const char *format, ...)
 {
+    int nchars;
     va_list args;
     va_start(args, format);
-    return Vsprintf(buf, enc, format, args);
+    nchars = Vsprintf(buf, enc, format, args);
+    va_end(args);
+    return nchars;
 }
 
 int Vprintf(const char *format, va_list args)
@@ -422,6 +431,7 @@ int Vfprintf(FILE16 *file, const char *format, va_list args)
     int L;
     #endif
     int nchars = 0;
+    memset(buf, 0, BufferSize*sizeof(char8));
 
     while((c = *format++))
     {

rxp/url.c

@@ -367,7 +367,7 @@ char *url_merge(const char *url, const char *base,
 FILE16 *url_open(const char *url, const char *base, const char *type,
 		 char **merged_url)
 {
-    char *scheme, *host, *path, *m_url;
+    char *scheme =NULL, *host, *path, *m_url;
     int port;
     unsigned int i;
     FILE16 *f;
@@ -377,8 +377,9 @@ FILE16 *url_open(const char *url, const char *base, const char *type,
 
     /* Determine the merged URL */
 
-    if(!(m_url = url_merge(url, base, &scheme, &host, &port, &path)))
+    if(!(m_url = url_merge(url, base, &scheme, &host, &port, &path))) {
 	return 0;
+    }
 
 #ifdef HAVE_LIBZ
     len = strlen(m_url);
@@ -547,6 +548,7 @@ static FILE16 *http_open(const char *url,
     {
 	LT_ERROR1(LEFILE, "Error: system call connect failed: %s\n",
 		     Strerror());
+    close(s);
 	return 0;
     }
 

rxp/xmlparser.c

@@ -1835,7 +1835,7 @@ static int process_xml_decl(Parser p)
     Char *Value, *cp;
     char8 *value;
     CharacterEncoding enc = CE_unknown;
-    Char c;
+    int c;
 
     s->entity->ml_decl = ML_xml;
 
@@ -2913,15 +2913,20 @@ static int parse_entity_decl(Parser p, Entity ent, int line, int chpos)
     require(skip_dtd_whitespace(p, p->external_pe_depth > 0));
     require(parse_name(p, "for name in entity declaration"));
     CopyName(name);
-
-    require(expect_dtd_whitespace(p, "after name in entity declaration"));
+    if (expect_dtd_whitespace(p, "after name in entity declaration") <0) {
+        Free(name);
+        return -1;
+    }
 
     if(looking_at(p, "'") || looking_at(p, "\""))
     {
 	Char *value;
 
 	unget(p->source);
-	require(parse_string(p, "for value in entity declaration", LT_entity));
+	 if(parse_string(p, "for value in entity declaration", LT_entity) <0) {
+         Free(name);
+         return -1;
+     }
 	value = p->pbuf;
 	Consume(p->pbuf);
 
@@ -2933,16 +2938,26 @@ static int parse_entity_decl(Parser p, Entity ent, int line, int chpos)
 	char8 *publicid, *systemid;
 	NotationDefinition notation = 0;
 
-	require(parse_external_id(p, 1, &publicid, &systemid, 1, 1));
+	if (parse_external_id(p, 1, &publicid, &systemid, 1, 1) < 0) {
+        Free(name);
+        return -1;
+    }
 
-	require((t = skip_dtd_whitespace(p, p->external_pe_depth > 0)));
+	if ((t = skip_dtd_whitespace(p, p->external_pe_depth > 0)) < 0) {
+        Free(name);
+        return -1;
+    }
 	if(looking_at(p, "NDATA"))
 	{
 	    if(t == 0)
 		return error(p, "Whitespace missing before NDATA");
 	    if(pe)
 		return error(p, "NDATA not allowed for parameter entity");
-	    require(expect_dtd_whitespace(p, "after NDATA"));
+        if (expect_dtd_whitespace(p, "after NDATA") <0) {
+            Free(name);
+            Free(systemid);
+            return -1;
+        }
 	    require(parse_name(p, "for notation name in entity declaration"));
 	    maybe_uppercase_name(p);
 	    notation = FindNotationN(p->dtd, p->name, p->namelen);
@@ -2990,12 +3005,25 @@ static int parse_notation_decl(Parser p)
     CopyName(name);
     maybe_uppercase(p, name);
 
-    require(expect_dtd_whitespace(p, "after name in notation declaration"));
+    if (expect_dtd_whitespace(p, "after name in notation declaration") < 0) {
+        Free(name);
+        return -1;
+    }
 
-    require(parse_external_id(p, 1, &publicid, &systemid, 1, 0));
-
-    require(skip_dtd_whitespace(p, p->external_pe_depth > 0));
-    require(expect(p, '>', "at end of notation declaration"));
+    if (parse_external_id(p, 1, &publicid, &systemid, 1, 0) < 0) {
+        Free(name);
+        return -1;
+    }
+
+    if (skip_dtd_whitespace(p, p->external_pe_depth > 0) < 0) {
+        Free(name);
+        return -1;
+    }
+
+    if (expect(p, '>', "at end of notation declaration") < 0) {
+        Free(name);
+        return -1;
+    }
 
     if((def = FindNotation(p->dtd, name)))
     {
@@ -3139,7 +3167,7 @@ static int error(Parser p, const char8 *format, ...)
     verror(&p->xbit, format, args);
 
     p->state = PS_error;
-
+    va_end(args);
     return -1;
 }
 
@@ -3157,5 +3185,6 @@ static void warn(Parser p, const char8 *format, ...)
 	p->warning_callback(&bit, p->callback_arg);
     else
 	ParserPerror(p, &bit);
+    va_end(args);
 }