From: Adam Dickmeiss Date: Wed, 3 Dec 2014 16:34:43 +0000 (+0100) Subject: Fix yaz-marcdump segfault YAZ-801 X-Git-Tag: v5.7.1~1 X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=commitdiff_plain;h=3d6e2f0931ae87fe01e857d4573d946f6cd8e6f1;ds=sidebyside Fix yaz-marcdump segfault YAZ-801 --- diff --git a/src/marcdisp.c b/src/marcdisp.c index 85acb07..f03d70f 100644 --- a/src/marcdisp.c +++ b/src/marcdisp.c @@ -1468,7 +1468,7 @@ void yaz_marc_write_using_libxml2(yaz_marc_t mt, int enable) int yaz_marc_check_marc21_coding(const char *charset, const char *marc_buf, int sz) { - if ((!yaz_matchstr(charset, "MARC8?") || + if (charset && (!yaz_matchstr(charset, "MARC8?") || !yaz_matchstr(charset, "MARC8")) && marc_buf && sz > 25 && marc_buf[9] == 'a') return 1;