[Midnightbsd-cvs] src [11628] trunk/contrib/expat/lib: fix some merge issues

[laffer1 at midnightbsd.org]

Revision: 11628
          http://svnweb.midnightbsd.org/src/?rev=11628
Author:   laffer1
Date:     2018-07-08 12:53:43 -0400 (Sun, 08 Jul 2018)
Log Message:
-----------
fix some merge issues

Modified Paths:
--------------
    trunk/contrib/expat/lib/xmlparse.c

Removed Paths:
-------------
    trunk/contrib/expat/lib/winconfig.h

Deleted: trunk/contrib/expat/lib/winconfig.h
===================================================================
--- trunk/contrib/expat/lib/winconfig.h	2018-07-08 16:52:51 UTC (rev 11627)
+++ trunk/contrib/expat/lib/winconfig.h	2018-07-08 16:53:43 UTC (rev 11628)
@@ -1,30 +0,0 @@
-/*================================================================
-** Copyright 2000, Clark Cooper
-** All rights reserved.
-**
-** This is free software. You are permitted to copy, distribute, or modify
-** it under the terms of the MIT/X license (contained in the COPYING file
-** with this distribution.)
-*/
-
-#ifndef WINCONFIG_H
-#define WINCONFIG_H
-
-#define WIN32_LEAN_AND_MEAN
-#include <windows.h>
-#undef WIN32_LEAN_AND_MEAN
-
-#include <memory.h>
-#include <string.h>
-
-#define XML_NS 1
-#define XML_DTD 1
-#define XML_CONTEXT_BYTES 1024
-
-/* we will assume all Windows platforms are little endian */
-#define BYTEORDER 1234
-
-/* Windows has memmove() available. */
-#define HAVE_MEMMOVE
-
-#endif /* ndef WINCONFIG_H */

Modified: trunk/contrib/expat/lib/xmlparse.c
===================================================================
--- trunk/contrib/expat/lib/xmlparse.c	2018-07-08 16:52:51 UTC (rev 11627)
+++ trunk/contrib/expat/lib/xmlparse.c	2018-07-08 16:53:43 UTC (rev 11628)
@@ -1727,12 +1727,6 @@
   }
 
   if (len > bufferLim - bufferEnd) {
-/* BEGIN MOZILLA CHANGE (sanity check neededSize) */
-    if (neededSize < 0) {
-      errorCode = XML_ERROR_NO_MEMORY;
-      return NULL;
-    }
-/* END MOZILLA CHANGE */
 #ifdef XML_CONTEXT_BYTES
     int keep;
 #endif  /* defined XML_CONTEXT_BYTES */