X-Git-Url: http://git.indexdata.com/?p=simpleserver-moved-to-github.git;a=blobdiff_plain;f=SimpleServer.xs;h=d8675e77d8397fa0ca2155d8dc60512f5c220144;hp=b153429b653bc82eb1506eb8bf617b6cb410bae4;hb=d4f91dc53b5680d033b5b5895430fc8fb8e38cce;hpb=4c9f8d722f9c20fb9344b4939202043e725c191e

diff --git a/SimpleServer.xs b/SimpleServer.xs
index b153429..d8675e7 100644
--- a/SimpleServer.xs
+++ b/SimpleServer.xs
@@ -1,5 +1,5 @@
 /*
- * $Id: SimpleServer.xs,v 1.52 2006-07-26 01:08:44 mike Exp $ 
+ * $Id: SimpleServer.xs,v 1.54 2006-12-01 10:44:58 sondberg Exp $ 
  * ----------------------------------------------------------------------
  * 
  * Copyright (c) 2000-2004, Index Data.
@@ -35,6 +35,7 @@
 #include <yaz/backend.h>
 #include <yaz/log.h>
 #include <yaz/wrbuf.h>
+#include <yaz/querytowrbuf.h>
 #include <stdio.h>
 #ifdef WIN32
 #else
@@ -843,7 +844,7 @@ int bend_fetch(void *handle, bend_fetch_rr *rr)
 	SV *sur_flag;
 	SV *point;
 	SV *rep_form;
-	SV *schema;
+	SV *schema = 0;
 	char *ptr;
 	char *ODR_record;
 	char *ODR_basename;
@@ -926,7 +927,7 @@ int bend_fetch(void *handle, bend_fetch_rr *rr)
 		else
 		{
 			rr->errcode = 26;
-			return;
+			return 0;
 		}
 	}
 
@@ -966,8 +967,10 @@ int bend_fetch(void *handle, bend_fetch_rr *rr)
 	if (temp != 0) {
 		schema = newSVsv(*temp);
 		ptr = SvPV(schema, length);
-		rr->schema = (char *)odr_malloc(rr->stream, length + 1);
-		strcpy(rr->schema, ptr);
+		if (length > 0) {
+			rr->schema = (char *)odr_malloc(rr->stream, length + 1);
+			strcpy(rr->schema, ptr);
+		}
 	}
 
 	temp = hv_fetch(href, "HANDLE", 6, 1);
@@ -1026,7 +1029,9 @@ int bend_fetch(void *handle, bend_fetch_rr *rr)
 	sv_free(err_code),
 	sv_free(sur_flag);
 	sv_free(rep_form);
-	sv_free(schema);
+
+	if (schema)
+		sv_free(schema);
 
 	PUTBACK;
 	FREETMPS;
@@ -1108,7 +1113,7 @@ int bend_present(void *handle, bend_present_rr *rr)
 		else
 		{
 			rr->errcode = 26;
-			return;
+			return 0;
 		}
 	}