Changeset 81761

Timestamp:

08/04/11 11:08:54 (4 years ago)

Author:

cal@…

Message:

rev-upgrade: Move definition of machista::get_arch_name above typemap free()ing the return value, which would cause a crash

Location:

branches/gsoc11-rev-upgrade/base/src/machista1.0

Files:

• machista.i (modified) (2 diffs)
• machista_wrap.c (modified) (3 diffs)

branches/gsoc11-rev-upgrade/base/src/machista1.0/machista.i

@@ -141 +141 @@
 
 /**
+ * map macho_get_arch_name()
+ * The memory for the returned char * comes from NXGetArchInfoFromCpuType(),
+ * which is documentet in arch(3), without ever mentioning any memory issues. I
+ * assume it's static memory, that should not be free()'d.
+ */
+%rename(get_arch_name) macho_get_arch_name;
+const char *macho_get_arch_name(cpu_type_t);
+
+/**
  * map macho_format_dylib_version()
  * Since this function internally allocates the result and returns an allocated
@@ -152 +161 @@
 char *macho_format_dylib_version(uint32_t);
 
-/**
- * map macho_get_arch_name()
- * The memory for the returned char * comes from NXGetArchInfoFromCpuType(),
- * which is documentet in arch(3), without ever mentioning any memory issues. I
- * assume it's static memory, that should not be free()'d.
- */
-%rename(get_arch_name) macho_get_arch_name;
-const char *macho_get_arch_name(cpu_type_t);
-

branches/gsoc11-rev-upgrade/base/src/machista1.0/machista_wrap.c

@@ -2270 +2270 @@
 
 SWIGINTERN int
+_wrap_get_arch_name(ClientData clientData SWIGUNUSED, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[]) {
+  cpu_type_t arg1 ;
+  int val1 ;
+  int ecode1 = 0 ;
+  char *result = 0 ;
+  
+  if (SWIG_GetArgs(interp, objc, objv,"o:machista::get_arch_name cpu_type_t ",(void *)0) == TCL_ERROR) SWIG_fail;
+  ecode1 = SWIG_AsVal_int SWIG_TCL_CALL_ARGS_2(objv[1], &val1);
+  if (!SWIG_IsOK(ecode1)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "get_arch_name" "', argument " "1"" of type '" "cpu_type_t""'");
+  } 
+  arg1 = (cpu_type_t)(val1);
+  result = (char *)macho_get_arch_name(arg1);
+  Tcl_SetObjResult(interp,SWIG_FromCharPtr((const char *)result));
+  return TCL_OK;
+fail:
+  return TCL_ERROR;
+}
+
+
+SWIGINTERN int
 _wrap_format_dylib_version(ClientData clientData SWIGUNUSED, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[]) {
   uint32_t arg1 ;
@@ -2283 +2304 @@
   arg1 = (uint32_t)(val1);
   result = (char *)macho_format_dylib_version(arg1);
-  Tcl_SetObjResult(interp,SWIG_FromCharPtr((const char *)result));
-  {
-    free(result);
-  }
-  return TCL_OK;
-fail:
-  return TCL_ERROR;
-}
-
-
-SWIGINTERN int
-_wrap_get_arch_name(ClientData clientData SWIGUNUSED, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[]) {
-  cpu_type_t arg1 ;
-  int val1 ;
-  int ecode1 = 0 ;
-  char *result = 0 ;
-  
-  if (SWIG_GetArgs(interp, objc, objv,"o:machista::get_arch_name cpu_type_t ",(void *)0) == TCL_ERROR) SWIG_fail;
-  ecode1 = SWIG_AsVal_int SWIG_TCL_CALL_ARGS_2(objv[1], &val1);
-  if (!SWIG_IsOK(ecode1)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode1), "in method '" "get_arch_name" "', argument " "1"" of type '" "cpu_type_t""'");
-  } 
-  arg1 = (cpu_type_t)(val1);
-  result = (char *)macho_get_arch_name(arg1);
   Tcl_SetObjResult(interp,SWIG_FromCharPtr((const char *)result));
   {
@@ -2340 +2337 @@
     { SWIG_prefix "parse_file", (swig_wrapper_func) _wrap_parse_file, NULL},
     { SWIG_prefix "strerror", (swig_wrapper_func) _wrap_strerror, NULL},
+    { SWIG_prefix "get_arch_name", (swig_wrapper_func) _wrap_get_arch_name, NULL},
     { SWIG_prefix "format_dylib_version", (swig_wrapper_func) _wrap_format_dylib_version, NULL},
-    { SWIG_prefix "get_arch_name", (swig_wrapper_func) _wrap_get_arch_name, NULL},
     {0, 0, 0}
 };