Bug in SimpleWBEM -- pegasus regmod

Johnny Hwang <[email protected]> Fri, 6 Nov 2015 22:28:58 +0000
Newsgroups gmane.network.open-pegasus.general
Message-ID <SN1PR07MB22248A83CDD4B8F1B5EEE81AB4280@SN1PR07MB2224.namprd07.prod.outlook.com>
--_000_SN1PR07MB22248A83CDD4B8F1B5EEE81AB4280SN1PR07MB2224namp_
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: quoted-printable

Hello,

For those using SimpleWBEM, I've discovered a bug in regmod that causes Emb=
eddedInstance arrays in schema to be downgraded to EmbeddedInstance. Fix as=
 follows:

--- a cimple/src/pegasus/regmod/main.cpp   Thu Nov 05 18:05:48 2015 -0800
+++ b/cimple/src/pegasus/regmod/main.cpp   Fri Nov 06 14:26:25 2015 -0800
@@ -1748,7 +1748,12 @@
             assert(mf->flags & CIMPLE_FLAG_REFERENCE);

             const cimple::Meta_Reference* mr =3D (cimple::Meta_Reference*)=
mf;
-            cp =3D CIMParameter(mf->name, CIMTYPE_STRING);
+/* CODE MODIFY START 2.0.24 */
+            bool is_array =3D mr->subscript !=3D 0;
+
+            cp =3D CIMParameter(mf->name, CIMTYPE_STRING, is_array);
+/* CODE MODIFY END */
+            //cp =3D CIMParameter(mf->name, CIMTYPE_STRING);
             cp.addQualifier(CIMQualifier("EmbeddedObject", Boolean(true)))=
;
         }
         else if (mf->flags & CIMPLE_FLAG_EMBEDDED_INSTANCE)
@@ -1756,7 +1761,12 @@
             assert(mf->flags & CIMPLE_FLAG_REFERENCE);

             const cimple::Meta_Reference* mr =3D (cimple::Meta_Reference*)=
mf;
-            cp =3D CIMParameter(mf->name, CIMTYPE_STRING);
+/* CODE MODIFY START 2.0.24 */
+            bool is_array =3D mr->subscript !=3D 0;
+
+            cp =3D CIMParameter(mf->name, CIMTYPE_STRING, is_array);
+/* CODE MODIFY END */
+            //cp =3D CIMParameter(mf->name, CIMTYPE_STRING);
             create_class(client, ns, mr->meta_class);
             cp.addQualifier(CIMQualifier(
                 "EmbeddedInstance", String(mr->meta_class->name)));

Hope this helps,
Johnny

--_000_SN1PR07MB22248A83CDD4B8F1B5EEE81AB4280SN1PR07MB2224namp_
Content-Type: text/html; charset="us-ascii"
Content-Transfer-Encoding: quoted-printable

<html xmlns:v=3D"urn:schemas-microsoft-com:vml" xmlns:o=3D"urn:schemas-micr=
osoft-com:office:office" xmlns:w=3D"urn:schemas-microsoft-com:office:word" =
xmlns:m=3D"http://schemas.microsoft.com/office/2004/12/omml" xmlns=3D"http:=
//www.w3.org/TR/REC-html40">
<head>
<meta http-equiv=3D"Content-Type" content=3D"text/html; charset=3Dus-ascii"=
>
<meta name=3D"Generator" content=3D"Microsoft Word 15 (filtered medium)">
<style><!--
/* Font Definitions */
@font-face
	{font-family:"Cambria Math";
	panose-1:2 4 5 3 5 4 6 3 2 4;}
@font-face
	{font-family:Calibri;
	panose-1:2 15 5 2 2 2 4 3 2 4;}
/* Style Definitions */
p.MsoNormal, li.MsoNormal, div.MsoNormal
	{margin:0in;
	margin-bottom:.0001pt;
	font-size:11.0pt;
	font-family:"Calibri",sans-serif;}
a:link, span.MsoHyperlink
	{mso-style-priority:99;
	color:#0563C1;
	text-decoration:underline;}
a:visited, span.MsoHyperlinkFollowed
	{mso-style-priority:99;
	color:#954F72;
	text-decoration:underline;}
span.EmailStyle17
	{mso-style-type:personal-compose;
	font-family:"Calibri",sans-serif;
	color:windowtext;}
.MsoChpDefault
	{mso-style-type:export-only;
	font-family:"Calibri",sans-serif;}
@page WordSection1
	{size:8.5in 11.0in;
	margin:1.0in 1.0in 1.0in 1.0in;}
div.WordSection1
	{page:WordSection1;}
--></style><!--[if gte mso 9]><xml>
<o:shapedefaults v:ext=3D"edit" spidmax=3D"1026" />
</xml><![endif]--><!--[if gte mso 9]><xml>
<o:shapelayout v:ext=3D"edit">
<o:idmap v:ext=3D"edit" data=3D"1" />
</o:shapelayout></xml><![endif]-->
</head>
<body lang=3D"EN-US" link=3D"#0563C1" vlink=3D"#954F72">
<div class=3D"WordSection1">
<p class=3D"MsoNormal">Hello,<o:p></o:p></p>
<p class=3D"MsoNormal"><o:p>&nbsp;</o:p></p>
<p class=3D"MsoNormal">For those using SimpleWBEM, I&#8217;ve discovered a =
bug in regmod that causes EmbeddedInstance arrays in schema to be downgrade=
d to EmbeddedInstance. Fix as follows:<o:p></o:p></p>
<p class=3D"MsoNormal"><o:p>&nbsp;</o:p></p>
<p class=3D"MsoNormal">--- a cimple/src/pegasus/regmod/main.cpp&nbsp;&nbsp;=
 Thu Nov 05 18:05:48 2015 -0800<o:p></o:p></p>
<p class=3D"MsoNormal">&#43;&#43;&#43; b/cimple/src/pegasus/regmod/main.cpp=
&nbsp;&nbsp; Fri Nov 06 14:26:25 2015 -0800<o:p></o:p></p>
<p class=3D"MsoNormal">@@ -1748,7 &#43;1748,12 @@<o:p></o:p></p>
<p class=3D"MsoNormal">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbs=
p;&nbsp;&nbsp;&nbsp; assert(mf-&gt;flags &amp; CIMPLE_FLAG_REFERENCE);<o:p>=
</o:p></p>
<p class=3D"MsoNormal"><o:p>&nbsp;</o:p></p>
<p class=3D"MsoNormal">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbs=
p;&nbsp;&nbsp;&nbsp; const cimple::Meta_Reference* mr =3D (cimple::Meta_Ref=
erence*)mf;<o:p></o:p></p>
<p class=3D"MsoNormal">-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nb=
sp;&nbsp;&nbsp; cp =3D CIMParameter(mf-&gt;name, CIMTYPE_STRING);<o:p></o:p=
></p>
<p class=3D"MsoNormal">&#43;/* CODE MODIFY START 2.0.24 */<o:p></o:p></p>
<p class=3D"MsoNormal">&#43;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp=
;&nbsp;&nbsp;&nbsp; bool is_array =3D mr-&gt;subscript !=3D 0;<o:p></o:p></=
p>
<p class=3D"MsoNormal">&#43;<o:p></o:p></p>
<p class=3D"MsoNormal">&#43;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp=
;&nbsp;&nbsp;&nbsp; cp =3D CIMParameter(mf-&gt;name, CIMTYPE_STRING, is_arr=
ay);<o:p></o:p></p>
<p class=3D"MsoNormal">&#43;/* CODE MODIFY END */<o:p></o:p></p>
<p class=3D"MsoNormal">&#43;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp=
; &nbsp;&nbsp;&nbsp;//cp =3D CIMParameter(mf-&gt;name, CIMTYPE_STRING);<o:p=
></o:p></p>
<p class=3D"MsoNormal">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbs=
p;&nbsp;&nbsp;&nbsp; cp.addQualifier(CIMQualifier(&quot;EmbeddedObject&quot=
;, Boolean(true)));<o:p></o:p></p>
<p class=3D"MsoNormal">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; }<o=
:p></o:p></p>
<p class=3D"MsoNormal">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; els=
e if (mf-&gt;flags &amp; CIMPLE_FLAG_EMBEDDED_INSTANCE)<o:p></o:p></p>
<p class=3D"MsoNormal">@@ -1756,7 &#43;1761,12 @@<o:p></o:p></p>
<p class=3D"MsoNormal">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbs=
p;&nbsp;&nbsp;&nbsp; assert(mf-&gt;flags &amp; CIMPLE_FLAG_REFERENCE);<o:p>=
</o:p></p>
<p class=3D"MsoNormal"><o:p>&nbsp;</o:p></p>
<p class=3D"MsoNormal">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbs=
p;&nbsp;&nbsp;&nbsp; const cimple::Meta_Reference* mr =3D (cimple::Meta_Ref=
erence*)mf;<o:p></o:p></p>
<p class=3D"MsoNormal">-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nb=
sp;&nbsp;&nbsp; cp =3D CIMParameter(mf-&gt;name, CIMTYPE_STRING);<o:p></o:p=
></p>
<p class=3D"MsoNormal">&#43;/* CODE MODIFY START 2.0.24 */<o:p></o:p></p>
<p class=3D"MsoNormal">&#43;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp=
;&nbsp;&nbsp;&nbsp; bool is_array =3D mr-&gt;subscript !=3D 0;<o:p></o:p></=
p>
<p class=3D"MsoNormal">&#43;<o:p></o:p></p>
<p class=3D"MsoNormal">&#43;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp;&nbs=
p;&nbsp;&nbsp;&nbsp;cp =3D CIMParameter(mf-&gt;name, CIMTYPE_STRING, is_arr=
ay);<o:p></o:p></p>
<p class=3D"MsoNormal">&#43;/* CODE MODIFY END */<o:p></o:p></p>
<p class=3D"MsoNormal">&#43;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp=
;&nbsp;&nbsp;&nbsp; //cp =3D CIMParameter(mf-&gt;name, CIMTYPE_STRING);<o:p=
></o:p></p>
<p class=3D"MsoNormal">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbs=
p;&nbsp;&nbsp;&nbsp; create_class(client, ns, mr-&gt;meta_class);<o:p></o:p=
></p>
<p class=3D"MsoNormal">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbs=
p;&nbsp;&nbsp;&nbsp; cp.addQualifier(CIMQualifier(<o:p></o:p></p>
<p class=3D"MsoNormal">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp;&nb=
sp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&quot;EmbeddedInstance&quot;, =
String(mr-&gt;meta_class-&gt;name)));<o:p></o:p></p>
<p class=3D"MsoNormal"><o:p>&nbsp;</o:p></p>
<p class=3D"MsoNormal">Hope this helps,<o:p></o:p></p>
<p class=3D"MsoNormal">Johnny<o:p></o:p></p>
</div>
</body>
</html>

--_000_SN1PR07MB22248A83CDD4B8F1B5EEE81AB4280SN1PR07MB2224namp_--