From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <serpiph@nikiet.ru>
X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on sa.int.altlinux.org
X-Spam-Level: 
X-Spam-Status: No, score=-0.1 required=5.0 tests=AWL,BAYES_00,
	DNS_FROM_OPENWHOIS,MIME_BASE64_TEXT autolearn=no version=3.2.5
From: Sergei Epiphanov <serpiph@nikiet.ru>
Organization: OKSAT
To: ALT Linux Team development discussions <devel@lists.altlinux.org>
Date: Thu, 30 Dec 2010 18:34:50 +0300
User-Agent: KMail/1.13.5 (Linux/2.6.35-std-def-alt9; KDE/4.5.4; i686; ; )
References: <AANLkTikv-ghKJferOXpbNgR3eibgY79u6M071xM8+bEq@mail.gmail.com>
	<201012301741.05612.serpiph@nikiet.ru>
	<4D1C9B41.3000600@altlinux.ru>
In-Reply-To: <4D1C9B41.3000600@altlinux.ru>
MIME-Version: 1.0
Content-Type: Multipart/Mixed;
  boundary="Boundary-00=_aaKHNSAd6cKaRBz"
Message-Id: <201012301834.50268.serpiph@nikiet.ru>
X-SpamTest-Version: SMTP-Filter Version 3.0.0 [0284], KAS30/Release
X-SpamTest-Info: Not protected
X-Anti-Virus: Kaspersky Anti-Virus for Linux Mail Server 5.6.39/RELEASE,
	bases: 20101230 #4540359, check: 20101230 clean
X-Synonym: Copied by Synonym (http://www.modulo.ro/synonym) to: mailcopy
Subject: Re: [devel] libxml2 bug#24379
X-BeenThere: devel@lists.altlinux.org
X-Mailman-Version: 2.1.12
Precedence: list
Reply-To: ALT Linux Team development discussions <devel@lists.altlinux.org>
List-Id: ALT Linux Team development discussions <devel.lists.altlinux.org>
List-Unsubscribe: <https://lists.altlinux.org/mailman/options/devel>,
	<mailto:devel-request@lists.altlinux.org?subject=unsubscribe>
List-Archive: <http://lists.altlinux.org/pipermail/devel>
List-Post: <mailto:devel@lists.altlinux.org>
List-Help: <mailto:devel-request@lists.altlinux.org?subject=help>
List-Subscribe: <https://lists.altlinux.org/mailman/listinfo/devel>,
	<mailto:devel-request@lists.altlinux.org?subject=subscribe>
X-List-Received-Date: Thu, 30 Dec 2010 15:32:05 -0000
Archived-At: <http://lore.altlinux.org/devel/201012301834.50268.serpiph@nikiet.ru/>
List-Archive: <http://lore.altlinux.org/devel/>
List-Post: <mailto:devel@altlinux.org>

--Boundary-00=_aaKHNSAd6cKaRBz
Content-Type: Text/Plain;
  charset="koi8-r"
Content-Transfer-Encoding: base64

9yDTz8/C3cXOyckgz9QgMzAgxMXLwcLS0SAyMDEwIDE3OjQ2OjI1IMHX1M/SIEFsZXhleSBHbGFk
a292IM7B0MnTwcw6Cj4g7c/WxdTFIMvJztXU2CDXwdsg18HSycHO1CDXINfJxMUg0MHU3sEg1yDC
wcfVID8KCvcgwsHH1SDOxSDNz8fVIC0gyc7F1CDLz87eyczT0Swgz9PUwczB09gg1M/M2MvPINDP
3tTBLiA6LSkg+8zAINPAxMEuIPPSwdrVIArHz9fP0sA6INDPy8Eg0NnUwczT0SDPw8XOydTYINTP
zNjLzyBsaWJ4bWwyLCDOxSDCz8zFxSDUz8fPLgoKLS0gCvMg1dfB1sXOycXNLCDl0MnGwc7P1yDz
xdLHxcoK

--Boundary-00=_aaKHNSAd6cKaRBz
Content-Type: text/x-patch;
  charset="cp 1251";
  name="libxml.diff"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment;
	filename="libxml.diff"

diff -Naur libxml2-v2.7.8-7-gfec31bc.orig/error.c libxml2-v2.7.8-7-gfec31bc/error.c
--- libxml2-v2.7.8-7-gfec31bc.orig/error.c	2010-11-18 13:07:24.000000000 +0300
+++ libxml2-v2.7.8-7-gfec31bc/error.c	2010-12-30 18:32:59.416003537 +0300
@@ -461,6 +461,9 @@
 	if ((schannel == NULL) && (ctxt != NULL) && (ctxt->sax != NULL) &&
 	    (ctxt->sax->initialized == XML_SAX2_MAGIC))
 	    schannel = ctxt->sax->serror;
+
+	    if(data == NULL)
+		data = ctxt->userData;
     }
     /*
      * Check if structured error handler set
@@ -480,6 +483,9 @@
 	if ((schannel == NULL) && (ctxt != NULL) && (ctxt->sax != NULL) &&
 	    (ctxt->sax->initialized == XML_SAX2_MAGIC))
 	    schannel = ctxt->sax->serror;
+
+	    if(data == NULL)
+		data = ctxt->userData;
     }
     if (code == XML_ERR_OK)
         return;

--Boundary-00=_aaKHNSAd6cKaRBz--