ObjFW  Check-in [9c24db3c6d]

Overview
Comment:Disallow \u0000 in JSON and fix ObjFW.h.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA3-256: 9c24db3c6d12aa1062f06fff27ba9851d5f6a874fb443060ae8626745f4a0e96
User & Date: js on 2013-02-23 18:00:44
Other Links: manifest | tags
Context
2013-02-24
10:41
Update to BinaryPack1pre2. check-in: c4df7d61b6 user: js tags: trunk
2013-02-23
18:00
Disallow \u0000 in JSON and fix ObjFW.h. check-in: 9c24db3c6d user: js tags: trunk
10:03
Update to BinaryPack1pre1. check-in: 19f5a60438 user: js tags: trunk
Changes

Modified src/OFString+JSONValue.m from [534d095364] to [16be464aa0].

133
134
135
136
137
138
139



140
141
142
143
144
145
146
			ret |= c + 10 - 'a';
		else if (c >= 'A' && c <= 'F')
			ret |= c + 10 - 'A';
		else
			return 0xFFFF;
	}




	return ret;
}

static inline OFString*
parseString(const char *restrict *pointer, const char *stop,
    size_t *restrict line)
{







>
>
>







133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
			ret |= c + 10 - 'a';
		else if (c >= 'A' && c <= 'F')
			ret |= c + 10 - 'A';
		else
			return 0xFFFF;
	}

	if (ret == 0)
		return 0xFFFF;

	return ret;
}

static inline OFString*
parseString(const char *restrict *pointer, const char *stop,
    size_t *restrict line)
{

Modified src/ObjFW.h from [46c8ffd626] to [409806974f].

129
130
131
132
133
134
135

136
137
138
139
140
141
142
# import "OFThreadStartFailedException.h"
# import "OFThreadStillRunningException.h"
#endif
#import "OFTruncatedDataException.h"
#import "OFUnboundNamespaceException.h"
#import "OFUnlockFailedException.h"
#import "OFUnsupportedProtocolException.h"

#import "OFWriteFailedException.h"

#import "macros.h"

#ifdef OF_HAVE_PLUGINS
# import "OFPlugin.h"
#endif







>







129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
# import "OFThreadStartFailedException.h"
# import "OFThreadStillRunningException.h"
#endif
#import "OFTruncatedDataException.h"
#import "OFUnboundNamespaceException.h"
#import "OFUnlockFailedException.h"
#import "OFUnsupportedProtocolException.h"
#import "OFUnsupportedVersionException.h"
#import "OFWriteFailedException.h"

#import "macros.h"

#ifdef OF_HAVE_PLUGINS
# import "OFPlugin.h"
#endif