[Forensics-changes] [yara] 21/415: Bug fix: handle error when creating temp file
Hilko Bengen
bengen at moszumanska.debian.org
Thu Apr 3 05:42:39 UTC 2014
This is an automated email from the git hooks/post-receive script.
bengen pushed a commit to branch debian
in repository yara.
commit 885e92ea2caa905c73d086e3557234fb679b9103
Author: Victor M. Alvarez <plusvic at gmail.com>
Date: Fri Mar 6 22:39:26 2009 +0000
Bug fix: handle error when creating temp file
---
libyara/libyara.tmproj | 154 ++++++++++++++++++++++++++++++++++------------
yara-python/yara-python.c | 15 +++--
2 files changed, 125 insertions(+), 44 deletions(-)
diff --git a/libyara/libyara.tmproj b/libyara/libyara.tmproj
index 734d4f2..bdcfc9f 100644
--- a/libyara/libyara.tmproj
+++ b/libyara/libyara.tmproj
@@ -3,7 +3,7 @@
<plist version="1.0">
<dict>
<key>currentDocument</key>
- <string>error.c</string>
+ <string>../yara.c</string>
<key>documents</key>
<array>
<dict>
@@ -13,19 +13,19 @@
<key>filename</key>
<string>scan.c</string>
<key>lastUsed</key>
- <date>2009-03-06T12:08:32Z</date>
+ <date>2009-03-06T13:22:41Z</date>
</dict>
<dict>
<key>filename</key>
<string>pefile.c</string>
<key>lastUsed</key>
- <date>2009-02-17T13:21:19Z</date>
+ <date>2009-03-06T13:29:59Z</date>
</dict>
<dict>
<key>filename</key>
<string>filemap.c</string>
<key>lastUsed</key>
- <date>2009-03-02T22:23:16Z</date>
+ <date>2009-03-06T13:30:09Z</date>
</dict>
<dict>
<key>filename</key>
@@ -37,9 +37,7 @@
<key>filename</key>
<string>error.c</string>
<key>lastUsed</key>
- <date>2009-03-06T12:08:55Z</date>
- <key>selected</key>
- <true/>
+ <date>2009-03-06T12:27:05Z</date>
</dict>
<dict>
<key>filename</key>
@@ -51,25 +49,33 @@
<key>filename</key>
<string>ast.c</string>
<key>lastUsed</key>
- <date>2009-03-02T22:40:27Z</date>
+ <date>2009-03-06T13:28:12Z</date>
</dict>
<dict>
<key>filename</key>
<string>lex.l</string>
<key>lastUsed</key>
- <date>2009-03-02T20:06:26Z</date>
+ <date>2009-03-06T13:29:07Z</date>
</dict>
<dict>
<key>filename</key>
<string>grammar.y</string>
<key>lastUsed</key>
- <date>2009-03-02T21:26:10Z</date>
+ <date>2009-03-06T13:28:56Z</date>
</dict>
<dict>
<key>filename</key>
<string>../yara.c</string>
<key>lastUsed</key>
- <date>2009-03-02T21:57:12Z</date>
+ <date>2009-03-06T14:07:26Z</date>
+ <key>selected</key>
+ <true/>
+ </dict>
+ <dict>
+ <key>filename</key>
+ <string>mem.c</string>
+ <key>lastUsed</key>
+ <date>2009-03-06T14:07:26Z</date>
</dict>
</array>
<key>expanded</key>
@@ -84,7 +90,7 @@
<key>filename</key>
<string>yara.h</string>
<key>lastUsed</key>
- <date>2009-03-02T20:33:50Z</date>
+ <date>2009-03-06T13:22:32Z</date>
</dict>
<dict>
<key>filename</key>
@@ -108,7 +114,7 @@
<key>filename</key>
<string>filemap.h</string>
<key>lastUsed</key>
- <date>2009-02-12T15:37:43Z</date>
+ <date>2009-03-06T13:22:30Z</date>
</dict>
<dict>
<key>filename</key>
@@ -120,19 +126,19 @@
<key>filename</key>
<string>error.h</string>
<key>lastUsed</key>
- <date>2009-03-06T12:08:55Z</date>
+ <date>2009-03-06T12:26:51Z</date>
</dict>
<dict>
<key>filename</key>
<string>compile.h</string>
<key>lastUsed</key>
- <date>2009-03-02T21:31:17Z</date>
+ <date>2009-03-06T13:06:58Z</date>
</dict>
<dict>
<key>filename</key>
<string>ast.h</string>
<key>lastUsed</key>
- <date>2009-03-02T22:05:03Z</date>
+ <date>2009-03-06T13:29:58Z</date>
</dict>
<dict>
<key>filename</key>
@@ -140,6 +146,12 @@
<key>lastUsed</key>
<date>2009-03-02T19:37:11Z</date>
</dict>
+ <dict>
+ <key>filename</key>
+ <string>mem.h</string>
+ <key>lastUsed</key>
+ <date>2009-03-06T13:25:19Z</date>
+ </dict>
</array>
<key>expanded</key>
<true/>
@@ -156,28 +168,28 @@
<key>caret</key>
<dict>
<key>column</key>
- <integer>0</integer>
+ <integer>10</integer>
<key>line</key>
- <integer>0</integer>
+ <integer>379</integer>
</dict>
<key>firstVisibleColumn</key>
<integer>0</integer>
<key>firstVisibleLine</key>
- <integer>191</integer>
+ <integer>364</integer>
</dict>
<key>ast.c</key>
<dict>
<key>caret</key>
<dict>
<key>column</key>
- <integer>0</integer>
+ <integer>20</integer>
<key>line</key>
- <integer>0</integer>
+ <integer>810</integer>
</dict>
<key>firstVisibleColumn</key>
<integer>0</integer>
<key>firstVisibleLine</key>
- <integer>504</integer>
+ <integer>790</integer>
</dict>
<key>ast.h</key>
<dict>
@@ -193,7 +205,7 @@
<key>firstVisibleColumn</key>
<integer>0</integer>
<key>firstVisibleLine</key>
- <integer>109</integer>
+ <integer>8</integer>
<key>selectFrom</key>
<dict>
<key>column</key>
@@ -228,9 +240,9 @@
<key>caret</key>
<dict>
<key>column</key>
- <integer>0</integer>
+ <integer>28</integer>
<key>line</key>
- <integer>0</integer>
+ <integer>21</integer>
</dict>
<key>firstVisibleColumn</key>
<integer>0</integer>
@@ -256,9 +268,9 @@
<key>caret</key>
<dict>
<key>column</key>
- <integer>40</integer>
+ <integer>0</integer>
<key>line</key>
- <integer>29</integer>
+ <integer>33</integer>
</dict>
<key>firstVisibleColumn</key>
<integer>0</integer>
@@ -300,12 +312,28 @@
<key>column</key>
<integer>0</integer>
<key>line</key>
- <integer>0</integer>
+ <integer>28</integer>
</dict>
+ <key>columnSelection</key>
+ <false/>
<key>firstVisibleColumn</key>
<integer>0</integer>
<key>firstVisibleLine</key>
- <integer>87</integer>
+ <integer>7</integer>
+ <key>selectFrom</key>
+ <dict>
+ <key>column</key>
+ <integer>12</integer>
+ <key>line</key>
+ <integer>28</integer>
+ </dict>
+ <key>selectTo</key>
+ <dict>
+ <key>column</key>
+ <integer>0</integer>
+ <key>line</key>
+ <integer>28</integer>
+ </dict>
</dict>
<key>filemap.h</key>
<dict>
@@ -340,14 +368,14 @@
<key>caret</key>
<dict>
<key>column</key>
- <integer>0</integer>
+ <integer>23</integer>
<key>line</key>
- <integer>0</integer>
+ <integer>433</integer>
</dict>
<key>firstVisibleColumn</key>
<integer>0</integer>
<key>firstVisibleLine</key>
- <integer>655</integer>
+ <integer>387</integer>
</dict>
<key>lex.l</key>
<dict>
@@ -356,12 +384,56 @@
<key>column</key>
<integer>0</integer>
<key>line</key>
+ <integer>6</integer>
+ </dict>
+ <key>columnSelection</key>
+ <false/>
+ <key>firstVisibleColumn</key>
+ <integer>0</integer>
+ <key>firstVisibleLine</key>
+ <integer>0</integer>
+ <key>selectFrom</key>
+ <dict>
+ <key>column</key>
+ <integer>19</integer>
+ <key>line</key>
+ <integer>6</integer>
+ </dict>
+ <key>selectTo</key>
+ <dict>
+ <key>column</key>
<integer>0</integer>
+ <key>line</key>
+ <integer>6</integer>
+ </dict>
+ </dict>
+ <key>mem.c</key>
+ <dict>
+ <key>caret</key>
+ <dict>
+ <key>column</key>
+ <integer>19</integer>
+ <key>line</key>
+ <integer>49</integer>
+ </dict>
+ <key>firstVisibleColumn</key>
+ <integer>0</integer>
+ <key>firstVisibleLine</key>
+ <integer>21</integer>
+ </dict>
+ <key>mem.h</key>
+ <dict>
+ <key>caret</key>
+ <dict>
+ <key>column</key>
+ <integer>6</integer>
+ <key>line</key>
+ <integer>16</integer>
</dict>
<key>firstVisibleColumn</key>
<integer>0</integer>
<key>firstVisibleLine</key>
- <integer>106</integer>
+ <integer>0</integer>
</dict>
<key>pefile.c</key>
<dict>
@@ -396,14 +468,14 @@
<key>caret</key>
<dict>
<key>column</key>
- <integer>0</integer>
+ <integer>16</integer>
<key>line</key>
- <integer>0</integer>
+ <integer>26</integer>
</dict>
<key>firstVisibleColumn</key>
<integer>0</integer>
<key>firstVisibleLine</key>
- <integer>825</integer>
+ <integer>0</integer>
</dict>
<key>sizedstr.h</key>
<dict>
@@ -424,14 +496,14 @@
<key>caret</key>
<dict>
<key>column</key>
- <integer>0</integer>
+ <integer>31</integer>
<key>line</key>
- <integer>196</integer>
+ <integer>187</integer>
</dict>
<key>firstVisibleColumn</key>
<integer>0</integer>
<key>firstVisibleLine</key>
- <integer>68</integer>
+ <integer>157</integer>
</dict>
</dict>
<key>openDocuments</key>
@@ -450,12 +522,14 @@
<string>grammar.y</string>
<string>lex.l</string>
<string>scan.c</string>
+ <string>mem.h</string>
+ <string>mem.c</string>
<string>ast.c</string>
<string>ast.h</string>
</array>
<key>showFileHierarchyDrawer</key>
<true/>
<key>windowFrame</key>
- <string>{{233, 24}, {1047, 754}}</string>
+ <string>{{208, 23}, {1047, 754}}</string>
</dict>
</plist>
diff --git a/yara-python/yara-python.c b/yara-python/yara-python.c
index a93ffbf..655b1ef 100644
--- a/yara-python/yara-python.c
+++ b/yara-python/yara-python.c
@@ -455,12 +455,19 @@ static PyObject * yara_compile(PyObject *self, PyObject *args, PyObject *keyword
{
fh = tmpfile();
- fprintf(fh, "%s", source);
- fseek(fh, 0, SEEK_SET);
+ if (fh != NULL)
+ {
+ fprintf(fh, "%s", source);
+ fseek(fh, 0, SEEK_SET);
- result = Rules_NEW(fh);
+ result = Rules_NEW(fh);
- fclose(fh);
+ fclose(fh);
+ }
+ else
+ {
+ result = PyErr_SetFromErrno(YaraError);
+ }
}
else if (py_file != NULL)
{
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/forensics/yara.git
More information about the forensics-changes
mailing list