common

Timestamp:

Jul 10, 2023 10:03:38 PM (19 months ago)

Author:

vboxsync

Message:

Forward ported r158257 from 6.1: IPRT: Fix incorrect unused bit count value in RTAsn1BitString_InitWithData that triggered an assertion in RTAsn1BitString_EncodeWrite. Didn't see if before because only user was for an empty string (cBits == 0) so the assertion code path wasn't taken. bugref:10479 ticketref:21621

Location:

trunk

Files:

: 3 edited

. (modified) (1 prop)
src/VBox (modified) (1 prop)
src/VBox/Runtime/common/asn1/asn1-ut-bitstring.cpp (modified) (1 diff)

Legend:

: Unmodified
: Added
: Removed

trunk

Property svn:mergeinfo

old	new
10	10	/branches/VBox-5.2:119536,120083,120099,120213,120221,120239,123597-123598,123600-123601,123755,124260,124263,124271,124273,124277-124279,124284-124286,124288-124290,125768,125779-125780,125812
11	11	/branches/VBox-6.0:130474-130475,130477,130479,131352
12		/branches/VBox-6.1:139660,139797,141521,141567-141568,141588-141590,141592-141595,141652,141920,142071
	12	/branches/VBox-6.1:139660,139797,141521,141567-141568,141588-141590,141592-141595,141652,141920,142071,158257
13	13	/branches/VBox-7.0:156229,156768
14	14	/branches/aeichner/vbox-chromium-cleanup:129816,129818-129851,129853-129861,129871-129872,129876,129880,129882,130013-130015,130036,130094-130095

trunk/src/VBox

Property svn:mergeinfo

old	new
10	10	/branches/VBox-5.2/src/VBox:119536,120083,120099,120213,120221,120239,123597-123598,123600-123601,123755,124263,124273,124277-124279,124284-124286,124288-124290,125768,125779-125780,125812,127158-127159,127162-127167,127180
11	11	/branches/VBox-6.0/src/VBox:130474-130475,130477,130479,131352
12		/branches/VBox-6.1/src/VBox:141521,141567-141568,141588-141590,141592-141595,141652,141920
	12	/branches/VBox-6.1/src/VBox:141521,141567-141568,141588-141590,141592-141595,141652,141920,158257
13	13	/branches/VBox-7.0/src/VBox:156229,156768
14	14	/branches/aeichner/vbox-chromium-cleanup/src/VBox:129818-129851,129853-129861,129871-129872,129876,129880,129882,130013-130015,130094-130095

trunk/src/VBox/Runtime/common/asn1/asn1-ut-bitstring.cpp

r98103	r100489
368	368	uint8_t pbDst = (uint8_t )pThis->Asn1Core.uData.pu8;
369	369	pThis->uBits.pv = pbDst + 1;
370		pbDst = ~~8 - (cSrcBits & 7)~~; / unused bits */
	370	pbDst = (cSrcBits & 7) != 0 ? 8 - (cSrcBits & 7) : 0; / unused bits */
371	371	memcpy(pbDst + 1, pvSrc, cbToCopy);
372	372	}

Note: See TracChangeset for help on using the changeset viewer.

Changeset 100489 in vbox for trunk/src/VBox/Runtime/common

Legend:

trunk

trunk/src/VBox

trunk/src/VBox/Runtime/common/asn1/asn1-ut-bitstring.cpp

Download in other formats: