thr3ads.net - wxruby development - [Wxruby-development] [1125] trunk/wxruby2/swig/shared/control_with_items.i: Avoid MSW crashes when unexpected object is returned by SWIG tracking [Jul 2007]

If this information is useful, please help other people find it:
Share via:

nobody at rubyforge.org

2007-Jul-20 18:41 UTC

[Wxruby-development] [1125] trunk/wxruby2/swig/shared/control_with_items.i: Avoid MSW crashes when unexpected object is returned by SWIG tracking

<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type"
content="text/html; charset=utf-8" /><style
type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:'':'';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { font-family:
verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;
font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding:
6px; }
#msg ul, pre { overflow: auto; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid;
padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family:
verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch
.binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<title>[1125] trunk/wxruby2/swig/shared/control_with_items.i: Avoid MSW
crashes when unexpected object is returned by SWIG tracking</title>
</head>
<body>

<div id="msg">
<dl>
<dt>Revision</dt> <dd>1125</dd>
<dt>Author</dt> <dd>brokentoy</dd>
<dt>Date</dt> <dd>2007-07-20 14:41:10 -0400 (Fri, 20 Jul
2007)</dd>
</dl>

<h3>Log Message</h3>
<pre>Avoid MSW crashes when unexpected object is returned by SWIG
tracking</pre>

<h3>Modified Paths</h3>
<ul>
<li><a
href="#trunkwxruby2swigsharedcontrol_with_itemsi">trunk/wxruby2/swig/shared/control_with_items.i</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwxruby2swigsharedcontrol_with_itemsi"></a>
<div class="modfile"><h4>Modified:
trunk/wxruby2/swig/shared/control_with_items.i (1124 => 1125)</h4>
<pre class="diff"><span>
<span class="info">---
trunk/wxruby2/swig/shared/control_with_items.i&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp2007-07-20
18:15:11 UTC (rev 1124)
+++
trunk/wxruby2/swig/shared/control_with_items.i&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp2007-07-20
18:41:10 UTC (rev 1125)
</span><span class="lines">@@ -10,6 +10,8 @@
</span><span class="cx"> %ignore *::SetClientObject(int 
n, wxClientData * data);
</span><span class="cx"> 
</span><span class="cx"> %{
</span><ins>+  extern swig_class cWxControlWithItems;
+
</ins><span class="cx">   // Returns a ruby object stored
as client data
</span><span class="cx">   static VALUE
wxControlWithItems_get_client_data(wxControlWithItems *ptr, int n) {
</span><span class="cx">
&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbspVALUE
returnVal = (VALUE) ptr->GetClientData(n);
</span><span class="lines">@@ -24,8 +26,12 @@
</span><span class="cx">
&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbspVALUE
rb_obj = SWIG_RubyInstanceFor(ptr);
</span><span class="cx">
&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbspif (
rb_iv_get(rb_obj, "@__wx_destroyed__" ) == Qtrue )
</span><span class="cx">
&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp 
return;
</span><del>-&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbspfflush(stdout);
-&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp
</del><ins>+
+&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp// On
Windows, sometimes the wrong object is associated with the
+&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp// ptr,
so we check whether it is the right one to avoid crashes
+&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbspif ( !
rb_obj_is_kind_of(rb_obj, cWxControlWithItems.klass) )
+&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp 
return;
+
</ins><span class="cx">
&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbspwxControlWithItems*
wx_cwi = (wxControlWithItems*) ptr;
</span><span class="cx">
&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbspint
count = wx_cwi->GetCount();
</span><span class="cx">
&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbspif (
count == 0 )
</span></span></pre>
</div>
</div>

</body>
</html>

Seemingly Similar Threads

Search for more possibly parallel threads

wxruby development - Jul 2007 - [1125] trunk/wxruby2/swig/shared/control_with_items.i: Avoid MSW crashes when unexpected object is returned by SWIG tracking

[Wxruby-development] [1125] trunk/wxruby2/swig/shared/control_with_items.i: Avoid MSW crashes when unexpected object is returned by SWIG tracking

Seemingly Similar Threads

Wisdom of the Ancients