X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=data1%2Fd1_attset.c;h=fe948b0b24f6421d71a29fe0e1295aecb25b9f78;hb=761702c17906c9c71a0c42e7abaa18e578aec012;hp=17963e91d071226a2919bb006a511165661ac3b0;hpb=e7cf9381a4b902cb2b91053f80ab7899b7d5bb00;p=idzebra-moved-to-github.git

diff --git a/data1/d1_attset.c b/data1/d1_attset.c
index 17963e9..fe948b0 100644
--- a/data1/d1_attset.c
+++ b/data1/d1_attset.c
@@ -1,4 +1,4 @@
-/* $Id: d1_attset.c,v 1.10 2006-05-19 23:45:28 adam Exp $
+/* $Id: d1_attset.c,v 1.12 2006-08-23 13:56:07 adam Exp $
    Copyright (C) 1995-2006
    Index Data ApS
 
@@ -15,9 +15,9 @@ FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
 for more details.
 
 You should have received a copy of the GNU General Public License
-along with Zebra; see the file LICENSE.zebra.  If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
 */
 
 #include <stdio.h>
@@ -84,6 +84,7 @@ data1_attset *data1_read_attset(data1_handle dh, const char *file)
 	{
 	    int num;
 	    char *name;
+            char *endptr;
 	    data1_att *t;
 	    
 	    if (argc < 3)
@@ -96,7 +97,13 @@ data1_attset *data1_read_attset(data1_handle dh, const char *file)
 		yaz_log(YLOG_WARN, "%s:%d: Local attributes not supported",
                         file, lineno);
 	    }
-	    num = atoi (argv[1]);
+            num = strtol(argv[1], &endptr, 10);
+            if (*endptr != '\0')
+            {
+		yaz_log(YLOG_WARN, "%s:%d: Bad attribute integer %s",
+                        file, lineno, argv[1]);
+		continue;
+            }
 	    name = argv[2];
 	    
 	    t = *attp = (data1_att *)nmem_malloc(mem, sizeof(*t));