Loading...
--- xnu/xnu-517/libkern/c++/OSUnserializeXML.cpp
+++ xnu/xnu-792/libkern/c++/OSUnserializeXML.cpp
@@ -3,22 +3,19 @@
*
* @APPLE_LICENSE_HEADER_START@
*
- * Copyright (c) 1999-2003 Apple Computer, Inc. All Rights Reserved.
+ * The contents of this file constitute Original Code as defined in and
+ * are subject to the Apple Public Source License Version 1.1 (the
+ * "License"). You may not use this file except in compliance with the
+ * License. Please obtain a copy of the License at
+ * http://www.apple.com/publicsource and read it before using this file.
*
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
- *
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * This Original Code and all software distributed under the License are
+ * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
* EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
* INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
+ * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT. Please see the
+ * License for the specific language governing rights and limitations
+ * under the License.
*
* @APPLE_LICENSE_HEADER_END@
*/
@@ -1413,9 +1410,8 @@
{
unsigned long long n = 0;
int base = 10;
+ bool negate = false;
int c = currentChar();
-
- if (!isDigit (c)) return 0;
if (c == '0') {
c = nextChar();
@@ -1425,9 +1421,16 @@
}
}
if (base == 10) {
+ if (c == '-') {
+ negate = true;
+ c = nextChar();
+ }
while(isDigit(c)) {
n = (n * base + c - '0');
c = nextChar();
+ }
+ if (negate) {
+ n = (unsigned long long)((long long)n * (long long)-1);
}
} else {
while(isHexDigit(c)) {