Commit 8bb6b81

committed

Update uriparser to commit 8c06d

1 parent 50ddf6a commit 8bb6b81Copy full SHA for 8bb6b81

File tree

+14

-1

lines changed

+14

-1

lines changed

Lines changed: 8 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -334,6 +334,10 @@ URI_PUBLIC int URI_FUNC(ParseSingleUriExMm)(URI_TYPE(Uri) * uri,`
`334`	`334`	`* itself is not freed, only its members.`
`335`	`335`	`* Uses default libc-based memory manager.`
`336`	`336`	`*`
	`337`	`+ * @remarks`
	`338`	`+ * Calling on an all-zeros structure (e.g. through <c>memset</c> or <c>calloc</c>) is safe.<br/>`
	`339`	`+ * Calling on an uninitialized structure is <em>not</em> safe.`
	`340`	`+ *`
`337`	`341`	`* @param uri <b>INOUT</b>: %URI structure whose members should be freed`
`338`	`342`	`*`
`339`	`343`	`* @see uriFreeUriMembersMmA`
`@@ -348,6 +352,10 @@ URI_PUBLIC void URI_FUNC(FreeUriMembers)(URI_TYPE(Uri) * uri);`
`348`	`352`	`* of the %URI structure. Note that the structure`
`349`	`353`	`* itself is not freed, only its members.`
`350`	`354`	`*`
	`355`	`+ * @remarks`
	`356`	`+ * Calling on an all-zeros structure (e.g. through <c>memset</c> or <c>calloc</c>) is safe.<br/>`
	`357`	`+ * Calling on an uninitialized structure is <em>not</em> safe.`
	`358`	`+ *`
`351`	`359`	`* @param uri <b>INOUT</b>: %URI structure whose members should be freed`
`352`	`360`	`* @param memory <b>IN</b>: Memory manager to use, NULL for default libc`
`353`	`361`	`* @return 0 on success, error code otherwise`

Lines changed: 6 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -111,6 +111,8 @@ int URI_FUNC(CopyUriMm)(URI_TYPE(Uri) * destUri,`
`111`	`111`
`112`	`112`	`URI_CHECK_MEMORY_MANAGER(memory); /* may return */`
`113`	`113`
	`114`	`+ URI_FUNC(ResetUri)(destUri);`
	`115`	`+`
`114`	`116`	`if (URI_FUNC(CopyRangeAsNeeded)(&destUri->scheme, &sourceUri->scheme, URI_FALSE, memory) == URI_FALSE) {`
`115`	`117`	`return URI_ERROR_MALLOC;`
`116`	`118`	`}`
`@@ -153,7 +155,10 @@ int URI_FUNC(CopyUriMm)(URI_TYPE(Uri) * destUri,`
`153`	`155`	`(destUri->hostData.ip6) = (sourceUri->hostData.ip6);`
`154`	`156`	`}`
`155`	`157`
`156`		`- if (URI_FUNC(CopyRangeAsNeeded)(&destUri->hostData.ipFuture, &sourceUri->hostData.ipFuture, URI_FALSE, memory) == URI_FALSE) {`
	`158`	`+ if (sourceUri->hostData.ipFuture.first != NULL && sourceUri->hostText.first == sourceUri->hostData.ipFuture.first) {`
	`159`	`+ destUri->hostData.ipFuture.first = destUri->hostText.first;`
	`160`	`+ destUri->hostData.ipFuture.afterLast = destUri->hostText.afterLast;`
	`161`	`+ } else if (URI_FUNC(CopyRangeAsNeeded)(&destUri->hostData.ipFuture, &sourceUri->hostData.ipFuture, URI_FALSE, memory) == URI_FALSE) {`
`157`	`162`	`URI_FUNC(PreventLeakageAfterCopy)(destUri, doneMask, memory);`
`158`	`163`	`return URI_ERROR_MALLOC;`
`159`	`164`	`}`

Comments

(0)