From: Adam Dickmeiss <adam@indexdata.dk>
Date: Tue, 29 Nov 2005 09:17:37 +0000 (+0000)
Subject: Fix null pointer reference - occurred ir query charset was defined
X-Git-Tag: YAZPROXY.1.1.0.2~41
X-Git-Url: http://sru.miketaylor.org.uk/cgi-bin?a=commitdiff_plain;h=d9997f1b704904dc68a1c6ccf7f66f0009c59a21;p=yazproxy-moved-to-github.git

Fix null pointer reference - occurred ir query charset was defined
---

diff --git a/src/yaz-proxy.cpp b/src/yaz-proxy.cpp
index f296d79..4c17618 100644
--- a/src/yaz-proxy.cpp
+++ b/src/yaz-proxy.cpp
@@ -1,4 +1,4 @@
-/* $Id: yaz-proxy.cpp,v 1.39 2005-11-25 19:37:28 adam Exp $
+/* $Id: yaz-proxy.cpp,v 1.40 2005-11-29 09:17:37 adam Exp $
    Copyright (c) 1998-2005, Index Data.
 
 This file is part of the yaz-proxy.
@@ -2019,9 +2019,10 @@ void Yaz_Proxy::handle_charset_lang_negotiation(Z_APDU *apdu)
                 {
                     ODR_MASK_SET(initResponse->options,
                                  Z_Options_negotiationModel);
-                    ODR_MASK_SET(m_initRequest_options,
-                                 Z_Options_negotiationModel);
-
+                    if (m_initRequest_options)
+                        ODR_MASK_SET(m_initRequest_options,
+                                     Z_Options_negotiationModel);
+                    
                     oi->which = Z_OtherInfo_externallyDefinedInfo;    
                     oi->information.externallyDefinedInfo =
                         yaz_set_response_charneg(