Merge branch 'pharo-10' into fix/speedRegression

pharo-project · Oct 19, 2023 · b59d8f6 · b59d8f6
2 parents 6d49a27 + 0334d2b
commit b59d8f6
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -477,7 +477,7 @@ try{
 
 		builders[platform] = {
 			node(platform){
-				timeout(30){
+				timeout(40){
 					runBuild(platform, "CoInterpreter")
 				}
 				// If we are not in the main branch we want to run the tests as fast as possible
@@ -490,13 +490,13 @@ try{
 					}
 				}
 
-				timeout(30){
+				timeout(40){
 					runBuild(platform, "StackVM")
 				}
-				timeout(30){
+				timeout(40){
 					runBuild("${platform}-ComposedFormat", "CoInterpreter", true, " -DIMAGE_FORMAT=ComposedFormat ")
 				}
-				timeout(30){
+				timeout(40){
 					// Only build the Stock replacement version in the main branch
 					if(isMainBranch()){
 						runBuild(platform, "CoInterpreter", false)

diff --git a/extracted/plugins/FileAttributesPlugin/src/unix/faSupport.c b/extracted/plugins/FileAttributesPlugin/src/unix/faSupport.c
@@ -478,8 +478,10 @@ char		targetFile[FA_PATH_MAX];
 		if (S_ISLNK(statBuf.st_mode)) {
 			/* This is a symbolic link, provide the target filename */
 			status = readlink(faGetPlatPath(aFaPath), targetFile, FA_PATH_MAX);
-			if (status >= 0)
-				targetOop = pathNameToOop(targetFile); } }
+			if (status >= 0) {
+				targetFile[status] = 0;
+				targetOop = pathNameToOop(targetFile); } } }
+
 	else {
 		status = stat(faGetPlatPath(aFaPath), &statBuf);
 		if (status)