Merge pull request #1396 from ivanimanishi/ustringFix

johnhaddon · web-flow · commit f62076e4f0b6 · 2023-11-17T09:24:15.000Z
OpenImageIOAlgo : Properly handle empty metadata values
diff --git a/Changes b/Changes
@@ -1,7 +1,10 @@
 10.5.x.x (relative to 10.5.4.0)
 ========
 
+Fixes
+-----
 
+- OpenImageIOAlgo : Properly handle empty metadata values
 
 10.5.4.0 (relative to 10.5.3.0)
 ========
diff --git a/src/IECoreImage/OpenImageIOAlgo.cpp b/src/IECoreImage/OpenImageIOAlgo.cpp
@@ -584,7 +584,7 @@ IECore::DataPtr data( const OIIO::ParamValue &value )
 			{
 				if ( type.arraylen == 0 )
 				{
-					return new StringData( static_cast<const ustring *>( value.data() )->c_str() );
+					return new StringData( static_cast<const ustring *>( value.data() )->string() );
 				}
 				else
 				{

Original file line number	Diff line number	Diff line change
`@@ -584,7 +584,7 @@ IECore::DataPtr data( const OIIO::ParamValue &value )`
`584`	`584`	`{`
`585`	`585`	`if ( type.arraylen == 0 )`
`586`	`586`	`{`
`587`		`- return new StringData( static_cast<const ustring *>( value.data() )->c_str() );`
	`587`	`+ return new StringData( static_cast<const ustring *>( value.data() )->string() );`
`588`	`588`	`}`
`589`	`589`	`else`
`590`	`590`	`{`