Update of /cvsroot/monetdb/pathfinder/modules/pftijah
In directory 
sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv22371/modules/pftijah

Modified Files:
      Tag: M5XQ
        nexi.c 
Log Message:
propagated changes of Wednesday Dec 09 2009
from the XQFT branch to the M5XQ branch

  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
  2009/12/09 - sjoerd: modules/pftijah/nexi.c,1.80.12.1
  propagated changes of Wednesday Dec 09 2009
  from the development trunk to the XQFT branch
  
    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
    2009/12/09 - sjoerd: modules/pftijah/nexi.c,1.81
    propagated changes of Monday Dec 07 2009 - Wednesday Dec 09 2009
    from the Nov2009 branch to the development trunk
  
      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
      2009/12/07 - sjoerd: modules/pftijah/nexi.c,1.80.8.1
      Removed unneeded cast.
      Fix memory leak found by Coverity.
      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
      2009/12/07 - sjoerd: modules/pftijah/nexi.c,1.80.8.2
      Typo.
      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~


Index: nexi.c
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/modules/pftijah/nexi.c,v
retrieving revision 1.80
retrieving revision 1.80.2.1
diff -u -d -r1.80 -r1.80.2.1
--- nexi.c      2 Feb 2009 12:44:27 -0000       1.80
+++ nexi.c      9 Dec 2009 14:25:46 -0000       1.80.2.1
@@ -496,9 +496,9 @@
        } else if (strcmp(optName, "returnNumber") == 0) {
            // ignore, is handled by milprint_summer
         } else if (strcmp(optName, "term-proximity") == 0) {
-                qenv_prox_val = (char*)strdup(optVal);
+                qenv_prox_val = strdup(optVal);
         } else if (strcmp(optName, "feedback-docs") == 0) {
-                qenv_fb_val = (char*)strdup(optVal);
+                qenv_fb_val = strdup(optVal);
         } else if (strcmp(optName, "newversion") == 0) {
         } else {
             stream_printf(GDKout,"TijahOptions: should handle: 
%s=%s\n",optName,optVal);
@@ -511,6 +511,10 @@
     BAT* fb = 
pftu_lookup_bat(pftu_batname1("tj_%s_fragments",(char*)parserCtx->collection,0));
     if ( ! fb ) {
            stream_printf(GDKerr,"Error: cannot find fragments bat for 
collection \"%s\".\n",parserCtx->collection);
+          if (qenv_prox_val)
+                  free(qenv_prox_val);
+          if (qenv_fb_val)
+                  free(qenv_fb_val);
            return 0;
     }
     if ( BATcount(fb) > 1 ) {


------------------------------------------------------------------------------
Return on Information:
Google Enterprise Search pays you back
Get the facts.
http://p.sf.net/sfu/google-dev2dev
_______________________________________________
Monetdb-pf-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-pf-checkins

Reply via email to