Attachment 300408 Details for Bug 440592 – close the plugin source file's fd before instantiating the plugin

[patch] close the plugin source file's fd before instantiating the plugin

jabbim-dont-leak-open-fds-to-child-processes.patch (text/plain), 1.18 KB, created by Michal Schmidt on 2008-04-04 11:03:54 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Michal Schmidt

Created: 2008-04-04 11:03:54 UTC

Size: 1.18 KB

patch

obsolete

>Index: jabbim.py
>===================================================================
>--- jabbim.py	(revision 2559)
>+++ jabbim.py	(working copy)
>@@ -2680,8 +2680,10 @@
> 				path = '%s/%s.py' % (dir, plugin_name)
> 
> 				try:
>-					f=open(utils.path(path))
>-					plug = load_source(plugin_name, path, f).Plugin(False, self.homeDir, dir)
>+					f = open(utils.path(path))
>+					module = load_source(plugin_name, path, f)
>+					f.close()
>+					plug = module.Plugin(False, self.homeDir, dir)
> 					version = float(plug.version)
> 				except Exception, ex:
> 					log.msg(path+': BAD PLUGIN!')
>@@ -2738,11 +2740,13 @@
> 		try:
> 			if not self.plugins[plugin]['module']:
> 				#plug =  # load plugin module
>-				self.plugins[plugin]['module']=load_source(plugin, path, f).Plugin(self, self.homeDir, dir)
>+				module = load_source(plugin, path, f)
>+				f.close()
>+				self.plugins[plugin]['module']=module.Plugin(self, self.homeDir, dir)
> 				self.runPluginCommand(self.plugins[plugin]['module'].buildMainWindowMenu,[]) # build menu for plugin
> 			else:
> 				print "plugin already loaded"
>-			f.close()
>+				f.close()
> 		except Exception, ex:
> 					#log.msg(unicode(plugin)+u': '+unicode(ex))
> 					traceback.print_exc()

Actions: View | Diff

Attachments on bug 440592: 300408