ObjXMPP  Check-in [7545a302b7]

Overview
Comment:Use strlen instead of strnlen, for compatibility with some systems
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA3-256: 7545a302b7aaf7417f8836d01e0ae0980de093d6a49482c129e8b121de970e48
User & Date: florob@babelmonkeys.de on 2012-01-25 17:06:36
Other Links: manifest | tags
Context
2012-01-25
19:27
Add missing files check-in: 42b670b25a user: florob@babelmonkeys.de tags: trunk
17:06
Use strlen instead of strnlen, for compatibility with some systems check-in: 7545a302b7 user: florob@babelmonkeys.de tags: trunk
16:20
Perform length checking on JID parts (0 < part < 1024) check-in: 3b429b0df5 user: florob@babelmonkeys.de tags: trunk
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Modified src/XMPPJID.m from [431d7306de] to [212aa64a08].

︙︙
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122

		[old release];
		node = nil;
		return;
	}

	if (((rc = stringprep_profile([node_ UTF8String], &nodepart,
	    "Nodeprep", 0)) != STRINGPREP_OK) || (nodepart[0] == '\0') ||
	    (strnlen(nodepart, 1024) > 1023))
		@throw [XMPPStringPrepFailedException
		    exceptionWithClass: isa
			    connection: nil
			       profile: @"Nodeprep"
				string: node_];

	@try {








|








108
109
110
111
112
113
114
115
116
117
118
119
120
121
122

		[old release];
		node = nil;
		return;
	}

	if (((rc = stringprep_profile([node_ UTF8String], &nodepart,
	    "Nodeprep", 0)) != STRINGPREP_OK) || (nodepart[0] == '\0') ||
	    (strlen(nodepart) > 1023))
		@throw [XMPPStringPrepFailedException
		    exceptionWithClass: isa
			    connection: nil
			       profile: @"Nodeprep"
				string: node_];

	@try {
︙︙
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151

{
	OFString *old = domain;
	char *srv;
	Stringprep_rc rc;

	if (((rc = stringprep_profile([domain_ UTF8String], &srv,
	    "Nameprep", 0)) != STRINGPREP_OK) || (srv[0] == '\0') ||
	    (strnlen(srv, 1024) > 1023))
		@throw [XMPPStringPrepFailedException
		    exceptionWithClass: isa
			    connection: nil
			       profile: @"Nameprep"
				string: domain_];

	@try {








|








137
138
139
140
141
142
143
144
145
146
147
148
149
150
151

{
	OFString *old = domain;
	char *srv;
	Stringprep_rc rc;

	if (((rc = stringprep_profile([domain_ UTF8String], &srv,
	    "Nameprep", 0)) != STRINGPREP_OK) || (srv[0] == '\0') ||
	    (strlen(srv) > 1023))
		@throw [XMPPStringPrepFailedException
		    exceptionWithClass: isa
			    connection: nil
			       profile: @"Nameprep"
				string: domain_];

	@try {
︙︙
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186

		[old release];
		resource = nil;
		return;
	}

	if (((rc = stringprep_profile([resource_ UTF8String], &res,
	    "Resourceprep", 0)) != STRINGPREP_OK) || (res[0] == '\0') ||
	    (strnlen(res, 1024) > 1023))
		@throw [XMPPStringPrepFailedException
		    exceptionWithClass: isa
			    connection: nil
			       profile: @"Resourceprep"
				string: resource_];

	@try {








|








172
173
174
175
176
177
178
179
180
181
182
183
184
185
186

		[old release];
		resource = nil;
		return;
	}

	if (((rc = stringprep_profile([resource_ UTF8String], &res,
	    "Resourceprep", 0)) != STRINGPREP_OK) || (res[0] == '\0') ||
	    (strlen(res) > 1023))
		@throw [XMPPStringPrepFailedException
		    exceptionWithClass: isa
			    connection: nil
			       profile: @"Resourceprep"
				string: resource_];

	@try {
︙︙